diff options
7 files changed, 7 insertions, 46 deletions
diff --git a/packages/SystemUI/accessibility/accessibilitymenu/Android.bp b/packages/SystemUI/accessibility/accessibilitymenu/Android.bp index 6c75b4346739..0df9bac295fb 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/Android.bp +++ b/packages/SystemUI/accessibility/accessibilitymenu/Android.bp @@ -37,6 +37,7 @@ android_app { "androidx.preference_preference", "androidx.viewpager_viewpager", "SettingsLibDisplayUtils", + "SettingsLibSettingsTheme", "com_android_a11y_menu_flags_lib", ], diff --git a/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml b/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml index ca8426560ccc..648cc3b035c5 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml @@ -40,7 +40,7 @@ android:exported="true" android:label="@string/accessibility_menu_settings_name" android:launchMode="singleTop" - android:theme="@style/AccessibilityMenuSettings"> + android:theme="@style/Theme.SettingsBase"> <intent-filter> <action android:name="android.intent.action.MAIN"/> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/aconfig/accessibility.aconfig b/packages/SystemUI/accessibility/accessibilitymenu/aconfig/accessibility.aconfig index eadcd7c27a18..f5db6a4c4573 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/aconfig/accessibility.aconfig +++ b/packages/SystemUI/accessibility/accessibilitymenu/aconfig/accessibility.aconfig @@ -8,10 +8,3 @@ flag { description: "Hides the AccessibilityMenuService UI before taking action instead of after." bug: "292020123" } - -flag { - name: "a11y_menu_settings_back_button_fix_and_large_button_sizing" - namespace: "accessibility" - description: "Provides/restores back button functionality for the a11yMenu settings page. Also, fixes sizing problems with large shortcut buttons." - bug: "298467628" -} diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-night/styles.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-night/styles.xml index 1f5765465075..81b3152375ff 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-night/styles.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-night/styles.xml @@ -16,10 +16,6 @@ --> <resources> - <style name="AccessibilityMenuSettings" parent="android:Theme.DeviceDefault.DayNight"> - <item name="android:windowLightStatusBar">false</item> - </style> - <!--Adds the theme to support SnackBar component and user configurable theme. --> <style name="ServiceTheme" parent="android:Theme.DeviceDefault.DayNight"> <item name="android:colorControlNormal">@color/colorControlNormal</item> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values/styles.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values/styles.xml index a2508cdf4f16..41691552f714 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values/styles.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values/styles.xml @@ -16,11 +16,6 @@ --> <resources> - <!--The theme is for preference CollapsingToolbarBaseActivity settings--> - <style name="AccessibilityMenuSettings" parent="android:Theme.DeviceDefault.DayNight"> - <item name="android:windowLightStatusBar">true</item> - </style> - <!--Adds the theme to support SnackBar component and user configurable theme. --> <style name="ServiceTheme" parent="android:Theme.DeviceDefault.Light"> <item name="android:colorControlNormal">@color/colorControlNormal</item> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/activity/A11yMenuSettingsActivity.java b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/activity/A11yMenuSettingsActivity.java index bf51e23855d5..ab8f97ad9c3d 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/activity/A11yMenuSettingsActivity.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/activity/A11yMenuSettingsActivity.java @@ -35,7 +35,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceManager; -import com.android.systemui.accessibility.accessibilitymenu.Flags; import com.android.systemui.accessibility.accessibilitymenu.R; /** @@ -56,28 +55,17 @@ public class A11yMenuSettingsActivity extends FragmentActivity { ActionBar actionBar = getActionBar(); actionBar.setDisplayShowCustomEnabled(true); - - if (Flags.a11yMenuSettingsBackButtonFixAndLargeButtonSizing()) { - actionBar.setDisplayHomeAsUpEnabled(true); - } + actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setCustomView(R.layout.preferences_action_bar); ((TextView) findViewById(R.id.action_bar_title)).setText( getResources().getString(R.string.accessibility_menu_settings_name) ); - actionBar.setDisplayOptions( - ActionBar.DISPLAY_TITLE_MULTIPLE_LINES - | ActionBar.DISPLAY_SHOW_TITLE - | ActionBar.DISPLAY_HOME_AS_UP); } @Override public boolean onNavigateUp() { - if (Flags.a11yMenuSettingsBackButtonFixAndLargeButtonSizing()) { - mCallback.onBackInvoked(); - return true; - } else { - return false; - } + mCallback.onBackInvoked(); + return true; } /** diff --git a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuAdapter.java b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuAdapter.java index c4f372cbce51..c2cf6e104a6a 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuAdapter.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuAdapter.java @@ -28,7 +28,6 @@ import android.widget.ImageButton; import android.widget.TextView; import com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuService; -import com.android.systemui.accessibility.accessibilitymenu.Flags; import com.android.systemui.accessibility.accessibilitymenu.R; import com.android.systemui.accessibility.accessibilitymenu.activity.A11yMenuSettingsActivity.A11yMenuPreferenceFragment; import com.android.systemui.accessibility.accessibilitymenu.model.A11yMenuShortcut; @@ -81,10 +80,8 @@ public class A11yMenuAdapter extends BaseAdapter { if (convertView == null) { convertView = mInflater.inflate(R.layout.grid_item, parent, false); - if (Flags.a11yMenuSettingsBackButtonFixAndLargeButtonSizing()) { - configureShortcutSize(convertView, - A11yMenuPreferenceFragment.isLargeButtonsEnabled(mService)); - } + configureShortcutSize(convertView, + A11yMenuPreferenceFragment.isLargeButtonsEnabled(mService)); } A11yMenuShortcut shortcutItem = (A11yMenuShortcut) getItem(position); @@ -147,15 +144,6 @@ public class A11yMenuAdapter extends BaseAdapter { ImageButton shortcutIconButton = convertView.findViewById(R.id.shortcutIconBtn); TextView shortcutLabel = convertView.findViewById(R.id.shortcutLabel); - if (!Flags.a11yMenuSettingsBackButtonFixAndLargeButtonSizing()) { - if (A11yMenuPreferenceFragment.isLargeButtonsEnabled(mService)) { - ViewGroup.LayoutParams params = shortcutIconButton.getLayoutParams(); - params.width = (int) (params.width * LARGE_BUTTON_SCALE); - params.height = (int) (params.height * LARGE_BUTTON_SCALE); - shortcutLabel.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, mLargeTextSize); - } - } - if (shortcutItem.getId() == A11yMenuShortcut.ShortcutId.UNSPECIFIED_ID_VALUE.ordinal()) { // Sets empty shortcut icon and label when the shortcut is ADD_ITEM. shortcutIconButton.setImageResource(android.R.color.transparent); |