-
Notifications
You must be signed in to change notification settings - Fork 3
Adapt to Android 16 #75
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45371fc to
cf54bee
Compare
0ea880a to
e9565ab
Compare
Added Flags package causing "undefined symbols" errors, which can only be generated during AOSP build by aconfig tools. --- e: file:///home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt:21:45 Unresolved reference 'flags'.
…t` files
/home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreference.java:140: error: package ResolutionAnimator does not exist
@nullable private ResolutionAnimator.Data mResolutionData;
^
/home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreference.java:535: error: cannot find symbol
@nonnull ResolutionCompletedCallback onCompletionCallback) {
^
symbol: class ResolutionCompletedCallback
location: class BannerMessagePreference
/home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreference.java:320: error: cannot find symbol
new ResolutionAnimator(mResolutionData, holder).startResolutionAnimation();
^
symbol: class ResolutionAnimator
location: class BannerMessagePreference
/home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreference.java:539: error: package ResolutionAnimator does not exist
ResolutionAnimator.Data resolutionData =
^
/home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreference.java:540: error: package ResolutionAnimator does not exist
new ResolutionAnimator.Data(resolutionMessage, onCompletionCallback);
e: file:///home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreferenceGroup.kt:39:35 Unresolved reference 'NumberButtonPreference'. e: file:///home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreferenceGroup.kt:40:37 Unresolved reference 'SectionButtonPreference'. e: file:///home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreferenceGroup.kt:50:31 Unresolved reference 'btnContentDescription'.
e: file:///home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/ResolutionAnimator.kt:23:25 Unresolved reference 'DeviceConfig'. e: file:///home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/ResolutionAnimator.kt:173:25 Unresolved reference 'DeviceConfig'.
8f08a3b to
d795c68
Compare
/home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreference.java:47: error: package com.google.android.material.button does not exist
import com.google.android.material.button.MaterialButton;
^
d795c68 to
813f396
Compare
The SettingsTheme overrides listPreferredItemHeightSmall with a bigger value (@dimen/settingslib_expressive_space_large3=72dip vs. 48dip) when using expressive theme, which is unnecessary as it's just looks odd (e.g., in dropdown menu) and also breaks our screenshot tests.
…expressive theme AOSP devs decided to set com.google.android.material.R.styleable#AppBarLayout_expanded to "false" in Android 16 when expressive theme is enabled. We don't want that, and this behavior change breaks our screenshot tests. NOTE: the expanded state is applied only during the first launch before the activity is laid out. The state will be retained upon activity recreation (e.g., screen rotation).
…ors" This reverts commit ce1c068. No more compilation issues after bumping Kotlin from v1.9 to v2.1 Signed-off-by: iusmac <iusico.maxim@libero.it>
Handle the case when there are no .patch files to apply (the array will contain the glob pattern).
…sePreferenceFragment` Applies expressive design to preferences (also on groups & categories).
Our schedule cards are custom preferences, so need apply the new material colors from SettingsLib library when expressive design is enabled. --- @color/settingslib_materialColorSurfaceBright (collapsed) @color/settingslib_materialColorSurfaceDim (expanded)
…der content scrim background color Inherit the color from expressive design theme.
…hen expanded This removes the max 3 lines limit on the subtitle. It also improves the way the toolbar title will position itself within the toolbar view, as its gravity is set by the library to be at the bottom of the CollapsingToolbarLayout, but we may have a subtitle at the very bottom that also requires room, so they will overlap if the title is not pushed up using setExpandedTitleMarginBottom() so that it's above the subtitle. To work around the above, we continue to push the title to be above the subtitle, but we also increase or shrink the overall height of the CollapsingToolbarLayout, so that the title stays in the expanded area and not behind the scrim.
…reens Needed to fit the content of the CollapsingToolbarLayout, so that it's visible on the screenshot.
f4e98a0 to
e13fb01
Compare
…ton by default Expressive theme adds an action button between framework Toolbar and tree-dots/options button, that even when hidden (visibility = GONE), leaves some empty space, which prevents the toolbar title/subtitle to fully expand. The space comes from the action button's parent view that has a padding on it. To mitigate the empty space, we'll also hide the action button parent view.
46d10af to
9f003e6
Compare
/home/runner/work/7SIM/7SIM/src/com/github/iusmac/sevensim/ui/components/toolbar/ToolbarDecorator.java:390: warning: [EffectivelyPrivate] This declaration has public or protected modifiers, but is effectively private.
public CollapsedSubtitle(final Context context) {
^
(see https://errorprone.info/bugpattern/EffectivelyPrivate)
Did you mean 'CollapsedSubtitle(final Context context) {'?
/home/runner/work/7SIM/7SIM/src/com/github/iusmac/sevensim/ui/components/toolbar/ToolbarDecorator.java:447: warning: [EffectivelyPrivate] This declaration has public or protected modifiers, but is effectively private.
public ExpandedSubtitle(final Context context) {
^
(see https://errorprone.info/bugpattern/EffectivelyPrivate)
Did you mean 'ExpandedSubtitle(final Context context) {'?
/home/runner/work/7SIM/7SIM/src/com/github/iusmac/sevensim/ui/scheduler/SchedulerFragment.java:820: warning: [EffectivelyPrivate] This declaration has public or protected modifiers, but is effectively private.
public LayoutManager(final Context context) {
^
(see https://errorprone.info/bugpattern/EffectivelyPrivate)
Did you mean 'LayoutManager(final Context context) {'?
/home/runner/work/7SIM/7SIM/src/com/github/iusmac/sevensim/UserAuthenticationObserverService.java:219: warning: [EffectivelyPrivate] This declaration has public or protected modifiers, but is effectively private.
public Worker() {
^
(see https://errorprone.info/bugpattern/EffectivelyPrivate)
Did you mean 'Worker() {'?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.