Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style panel with Material designs (2/n)

Browse Source 
The following components are styled to follow Material designs in this
modification:
1. The "Edit" button
   - Modifying the text appearance
2. The "Done" button
   - Modifying the origin "Close" button to the "Done" button without
     changing the logic of the button
   - Adding a styled stroke to the button

Bug: 257272333
Test: manual - attach screenshots with the bug
Change-Id: Idd55458231c9fbceaf1bec36c34de5bc184a8ce3
This commit is contained in:
chihtinglo
2022-12-20 00:26:30 +08:00
parent 9d5a6d6676
commit 926d532fde
7 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/res/drawable/accessibility_window_magnification_button_bg.xml → packages/SystemUI/res/drawable/accessibility_window_magnification_button_done_bg.xml
View File

@@ -14,13 +14,13 @@
limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/accessibility_window_magnifier_button_bg" />
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<size
android:width="40dp"
android:height="40dp"/>
<corners android:radius="2dp"/>
android:width="@dimen/magnification_setting_button_done_width"
android:height="@dimen/magnification_setting_button_done_height"/>
<corners android:radius="@dimen/magnification_setting_button_done_corner_radius"/>
<stroke
android:color="@color/accessibility_window_magnifier_button_bg_stroke"
android:color="?androidprv:attr/colorAccent"
android:width="1dp" />
</shape>

23
packages/SystemUI/res/layout/window_magnification_settings_view.xml
View File

@@ -36,12 +36,11 @@
<Button
android:id="@+id/magnifier_edit_button"
android:background="@drawable/accessibility_magnification_setting_view_btn_bg"
android:background="@null"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/accessibility_magnifier_edit"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:textAppearance="@style/TextAppearance.MagnificationSetting.EditButton"
android:focusable="true"
android:layout_gravity="right" />
</LinearLayout>
@@ -138,14 +137,18 @@
android:max="6" />
<Button
android:id="@+id/magnifier_close_button"
android:background="@drawable/accessibility_magnification_setting_view_btn_bg"
android:layout_width="match_parent"
android:id="@+id/magnifier_done_button"
android:background="@drawable/accessibility_window_magnification_button_done_bg"
android:minHeight="@dimen/magnification_setting_button_done_height"
android:layout_width="@dimen/magnification_setting_button_done_width"
android:layout_height="wrap_content"
android:text="@string/accessibility_magnification_close"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:text="@string/accessibility_magnification_done"
android:textAppearance="@style/TextAppearance.MagnificationSetting.DoneButton"
android:focusable="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/magnification_setting_view_margin"/>
android:layout_marginTop="@dimen/magnification_setting_view_margin"
android:paddingLeft="@dimen/magnification_setting_button_done_padding_horizontal"
android:paddingRight="@dimen/magnification_setting_button_done_padding_horizontal"
android:paddingTop="@dimen/magnification_setting_button_done_padding_vertical"
android:paddingBottom="@dimen/magnification_setting_button_done_padding_vertical" />
</LinearLayout>

2
packages/SystemUI/res/values/colors.xml
View File

@@ -175,9 +175,7 @@
<color name="accessibility_magnifier_bg">#FCFCFC</color>
<color name="accessibility_magnifier_bg_stroke">#E0E0E0</color>
<color name="accessibility_magnifier_icon_color">#252525</color>
<color name="accessibility_window_magnifier_button_bg">#0680FD</color>
<color name="accessibility_window_magnifier_icon_color">#FAFAFA</color>
<color name="accessibility_window_magnifier_button_bg_stroke">#252525</color>
<color name="accessibility_window_magnifier_corner_view_color">#0680FD</color>
<!-- Volume dialog colors -->

6
packages/SystemUI/res/values/dimens.xml
View File

@@ -1110,6 +1110,12 @@
<dimen name="magnification_setting_background_padding">24dp</dimen>
<dimen name="magnification_setting_background_corner_radius">28dp</dimen>
<dimen name="magnification_setting_seekbar_margin">16dp</dimen>
<dimen name="magnification_setting_button_line_height">20sp</dimen>
<dimen name="magnification_setting_button_done_width">312dp</dimen>
<dimen name="magnification_setting_button_done_height">48dp</dimen>
<dimen name="magnification_setting_button_done_corner_radius">100dp</dimen>
<dimen name="magnification_setting_button_done_padding_vertical">10dp</dimen>
<dimen name="magnification_setting_button_done_padding_horizontal">24dp</dimen>
<!-- How far from the right edge of the screen you need to drag the window before the button
repositions to the other side. -->

6
packages/SystemUI/res/values/strings.xml
View File

@@ -2287,9 +2287,9 @@
<string name="accessibility_magnification_small">Small</string>
<!-- Click action label for magnification panel large size [CHAR LIMIT=NONE]-->
<string name="accessibility_magnification_large">Large</string>
<!-- Click action label for magnification panel Close [CHAR LIMIT=NONE]-->
<string name="accessibility_magnification_close">Close</string>
<!-- Click action label for edit magnification size [CHAR LIMIT=NONE]-->
<!-- Click action label for magnification panel Done [CHAR LIMIT=20]-->
<string name="accessibility_magnification_done">Done</string>
<!-- Click action label for edit magnification size [CHAR LIMIT=20]-->
<string name="accessibility_magnifier_edit">Edit</string>
<!-- Click action label for magnification panel settings [CHAR LIMIT=NONE]-->
<string name="accessibility_magnification_magnifier_window_settings">Magnifier window settings</string>

16
packages/SystemUI/res/values/styles.xml
View File

@@ -1343,4 +1343,20 @@
<item name="android:textColor">?androidprv:attr/textColorPrimary</item>
<item name="android:textSize">@dimen/magnification_setting_text_size</item>
</style>
<style name="TextAppearance.MagnificationSetting.EditButton">
<item name="android:fontFamily">google-sans</item>
<item name="android:textColor">?androidprv:attr/colorAccent</item>
<item name="android:textSize">@dimen/magnification_setting_text_size</item>
<item name="android:lineHeight">@dimen/magnification_setting_button_line_height</item>
<item name="android:textAlignment">center</item>
</style>
<style name="TextAppearance.MagnificationSetting.DoneButton">
<item name="android:fontFamily">google-sans</item>
<item name="android:textColor">?androidprv:attr/textColorPrimary</item>
<item name="android:textSize">@dimen/magnification_setting_text_size</item>
<item name="android:lineHeight">@dimen/magnification_setting_button_line_height</item>
<item name="android:textAlignment">center</item>
</style>
</resources>

14
packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java
View File

@@ -85,7 +85,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
private ImageButton mSmallButton;
private ImageButton mMediumButton;
private ImageButton mLargeButton;
private Button mCloseButton;
private Button mDoneButton;
private Button mEditButton;
private ImageButton mChangeModeButton;
private boolean mAllowDiagonalScrolling = false;
@@ -160,9 +160,9 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
} else if (viewId == R.id.magnifier_large_button) {
return mContext.getResources().getString(
R.string.accessibility_magnification_large);
} else if (viewId == R.id.magnifier_close_button) {
} else if (viewId == R.id.magnifier_done_button) {
return mContext.getResources().getString(
R.string.accessibility_magnification_close);
R.string.accessibility_magnification_done);
} else if (viewId == R.id.magnifier_edit_button) {
return mContext.getResources().getString(
R.string.accessibility_resize);
@@ -247,7 +247,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
setMagnifierSize(MagnificationSize.LARGE);
} else if (id == R.id.magnifier_edit_button) {
editMagnifierSizeMode(true);
} else if (id == R.id.magnifier_close_button) {
} else if (id == R.id.magnifier_done_button) {
hideSettingPanel();
} else if (id == R.id.magnifier_full_button) {
hideSettingPanel();
@@ -381,7 +381,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
mSmallButton = mSettingView.findViewById(R.id.magnifier_small_button);
mMediumButton = mSettingView.findViewById(R.id.magnifier_medium_button);
mLargeButton = mSettingView.findViewById(R.id.magnifier_large_button);
mCloseButton = mSettingView.findViewById(R.id.magnifier_close_button);
mDoneButton = mSettingView.findViewById(R.id.magnifier_done_button);
mEditButton = mSettingView.findViewById(R.id.magnifier_edit_button);
mChangeModeButton = mSettingView.findViewById(R.id.magnifier_full_button);
@@ -408,8 +408,8 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
mLargeButton.setAccessibilityDelegate(mButtonDelegate);
mLargeButton.setOnClickListener(mButtonClickListener);
mCloseButton.setAccessibilityDelegate(mButtonDelegate);
mCloseButton.setOnClickListener(mButtonClickListener);
mDoneButton.setAccessibilityDelegate(mButtonDelegate);
mDoneButton.setOnClickListener(mButtonClickListener);
mChangeModeButton.setAccessibilityDelegate(mButtonDelegate);
mChangeModeButton.setOnClickListener(mButtonClickListener);