Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 926d532f authored by chihtinglo's avatar chihtinglo
Browse files

Style panel with Material designs (2/n) 

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
parent 9d5a6d66

packages/SystemUI/res/drawable/accessibility_window_magnification_button_bg.xml→packages/SystemUI/res/drawable/accessibility_window_magnification_button_done_bg.xml

+6 −6
Original line number Diff line number Diff line
@@ -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>
 
 No newline at end of file

packages/SystemUI/res/layout/window_magnification_settings_view.xml

+13 −10
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -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 -->

packages/SystemUI/res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -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. -->

packages/SystemUI/res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -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>