PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784

Change-Id: Ib37dab22b51da7ec97990230a17b7fe698abee60
This commit is contained in:
TreeHugger Robot
2021-11-29 05:59:08 +00:00
committed by Automerger Merge Worker
parent 181853efb0 cd8a01d2fd
commit c6bc7a7c4b
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -1895,6 +1895,7 @@
<activity <activity
android:name=".accessibility.AccessibilityScreenSizeForSetupWizardActivity" android:name=".accessibility.AccessibilityScreenSizeForSetupWizardActivity"
android:theme="@android:style/Theme.DeviceDefault.Settings"
android:exported="false"/> android:exported="false"/>
<activity <activity

4
src/com/android/settings/display/PreviewPagerAdapter.java
View File

@@ -109,10 +109,6 @@ public class PreviewPagerAdapter extends PagerAdapter {
return (view == object); return (view == object);
} }
FrameLayout[] getPreviewFrames() {
return mPreviewFrames;
}
boolean isAnimating() { boolean isAnimating() {
return mAnimationCounter > 0; return mAnimationCounter > 0;
} }

6
src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java
View File

@@ -264,12 +264,6 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc
@Override @Override
public void onPageSelected(int position) { public void onPageSelected(int position) {
mPreviewPager.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT); mPreviewPager.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT);
// To avoid displaying previous page on the left side in SUW landscape mode for
// large size.
if (position > 0) {
mPreviewPagerAdapter.getPreviewFrames()[position - 1].setVisibility(View.INVISIBLE);
}
mPreviewPagerAdapter.getPreviewFrames()[position].setVisibility(View.VISIBLE);
} }
}; };