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

Commit d3234fd8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Idd554582,I11646fe5 

* changes:
  Style panel with Material designs (2/n)
  Style panel with Material designs (1/n)
parents fc58e326 926d532f

packages/SystemUI/res/drawable/accessibility_magnification_setting_view_bg.xml

+22 −27
Original line number Diff line number Diff line
@@ -14,14 +14,9 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="rectangle">

            <solid android:color="@color/accessibility_magnifier_bg" />

            <corners android:radius="24dp" />

            <stroke

                android:color="@color/accessibility_magnifier_bg_stroke"

                android:width="1dp" />

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

    <corners android:radius="@dimen/magnification_setting_background_corner_radius" />

    <solid android:color="?androidprv:attr/colorSurface" />

</shape>
 
 No newline at end of file
 
    </item>

</layer-list>
 
 No newline at end of file

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

+33 −53
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/magnifier_panel_view"

    android:layout_width="@dimen/magnification_max_size"

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:background="@drawable/accessibility_magnification_setting_view_bg"

    android:orientation="vertical">

    android:orientation="vertical"

    android:padding="@dimen/magnification_setting_background_padding">

    <LinearLayout

        android:layout_width="@dimen/magnification_max_size"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal">

        <TextView
@@ -29,27 +30,23 @@ 
            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:text="@string/accessibility_magnifier_size"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:textColor="?android:attr/textColorAlertDialogListItem"

            android:textAppearance="@style/TextAppearance.MagnificationSetting.Title"

            android:focusable="true"

            android:layout_gravity="center_vertical|left"

            android:layout_marginStart="20dp"/>

            android:layout_gravity="center_vertical|left" />



        <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"

            android:layout_marginEnd="20dp"/>

            android:layout_gravity="right" />

    </LinearLayout>



    <LinearLayout

        android:layout_width="@dimen/magnification_max_size"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal">

        <ImageButton
@@ -58,7 +55,6 @@ 
            android:layout_height="56dp"

            android:scaleType="center"

            android:layout_weight="1"

            android:layout_marginStart="12dp"

            android:background="@drawable/accessibility_magnification_setting_view_btn_bg"

            android:padding="@dimen/magnification_switch_button_padding"

            android:src="@drawable/ic_magnification_menu_small"
@@ -95,7 +91,6 @@ 
            android:layout_height="56dp"

            android:scaleType="center"

            android:layout_weight="1"

            android:layout_marginEnd="12dp"

            android:background="@drawable/accessibility_magnification_setting_view_btn_bg"

            android:padding="@dimen/magnification_switch_button_padding"

            android:src="@drawable/ic_open_in_new_fullscreen"
@@ -107,68 +102,53 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:paddingTop="8dp"

        android:paddingEnd="20dp"

        android:paddingStart="20dp"

        android:layout_marginTop="@dimen/magnification_setting_view_margin"

        android:layout_marginBottom="@dimen/magnification_setting_view_margin"

        android:focusable="true">



        <LinearLayout

        <TextView

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:background="?android:attr/selectableItemBackground"

            android:ellipsize="marquee"

            android:gravity="center_vertical"

            android:minHeight="?android:attr/listPreferredItemHeightSmall"

            android:orientation="vertical">



            <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            android:singleLine="true"

            android:text="@string/accessibility_allow_diagonal_scrolling"

                android:textAppearance="?android:attr/textAppearanceListItem"

                android:textColor="?android:attr/textColorAlertDialogListItem" />

        </LinearLayout>

            android:textAppearance="@style/TextAppearance.MagnificationSetting.Title" />



        <Switch

            android:id="@+id/magnifier_horizontal_lock_switch"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="right|center"

            android:theme="@android:style/Theme.DeviceDefault.DayNight"/>

            android:layout_gravity="right" />

    </LinearLayout>



    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/accessibility_magnification_zoom"

        android:textAppearance="?android:attr/textAppearanceListItem"

        android:textColor="?android:attr/textColorAlertDialogListItem"

        android:focusable="true"

        android:layout_marginStart="20dp"

        android:paddingTop="2dp"

        android:paddingBottom="10dp"/>

        android:textAppearance="@style/TextAppearance.MagnificationSetting.Title"

        android:focusable="true" />



    <SeekBar

        android:id="@+id/magnifier_zoom_seekbar"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_marginTop="@dimen/magnification_setting_seekbar_margin"

        android:progress="0"

        android:max="6"

        android:layout_marginEnd="20dp"

        android:theme="@android:style/Theme.DeviceDefault.DayNight"/>



        android:max="6" />



    <Button

        android:id="@+id/magnifier_close_button"

        android:background="@drawable/accessibility_magnification_setting_view_btn_bg"

        android:layout_width="wrap_content"

        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:paddingBottom="24dp"/>

        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

+12 −1
Original line number Diff line number Diff line
@@ -1110,13 +1110,24 @@ 
    <!-- The extra padding to show the whole outer border -->

    <dimen name="magnifier_drag_handle_padding">3dp</dimen>

    <dimen name="magnification_max_frame_size">300dp</dimen>

    <!-- Magnification settings panel -->

    <dimen name="magnification_setting_view_margin">24dp</dimen>

    <dimen name="magnification_setting_text_size">18sp</dimen>

    <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. -->

    <dimen name="magnification_button_reposition_threshold_from_edge">32dp</dimen>



    <dimen name="magnification_drag_size">15dp</dimen>

    <dimen name="magnification_max_size">360dp</dimen>

    <dimen name="magnifier_panel_size">265dp</dimen>



    <!-- Home Controls -->