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

Commit 4fad677c authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Android (Google) Code Review
Browse files

Merge "Update reachability UI styles to be decendants of Theme.AppCompat" into udc-dev

parents 2d319490 c1be417b

libs/WindowManager/Shell/res/layout/reachability_ui_layout.xml

+10 −9
Original line number Diff line number Diff line
@@ -20,47 +20,48 @@ 
    android:focusable="false"

    android:focusableInTouchMode="false"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:theme="@style/ReachabilityEduHandLayout">



    <androidx.appcompat.widget.AppCompatTextView

        style="@style/ReachabilityEduHandLayout"

        android:text="@string/letterbox_reachability_reposition_text"

        app:drawableTopCompat="@drawable/reachability_education_ic_right_hand"

        android:layout_gravity="center_horizontal|top"

        android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin"

        android:id="@+id/reachability_move_up_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"/>

        android:layout_height="wrap_content"

        android:visibility="invisible"/>



    <androidx.appcompat.widget.AppCompatTextView

        style="@style/ReachabilityEduHandLayout"

        android:text="@string/letterbox_reachability_reposition_text"

        app:drawableTopCompat="@drawable/reachability_education_ic_right_hand"

        android:layout_gravity="center_vertical|right"

        android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin"

        android:id="@+id/reachability_move_right_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"/>

        android:layout_height="wrap_content"

        android:visibility="invisible"/>





    <androidx.appcompat.widget.AppCompatTextView

        style="@style/ReachabilityEduHandLayout"

        android:text="@string/letterbox_reachability_reposition_text"

        app:drawableTopCompat="@drawable/reachability_education_ic_left_hand"

        android:layout_gravity="center_vertical|left"

        android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin"

        android:id="@+id/reachability_move_left_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"/>

        android:layout_height="wrap_content"

        android:visibility="invisible"/>



    <androidx.appcompat.widget.AppCompatTextView

        style="@style/ReachabilityEduHandLayout"

        android:text="@string/letterbox_reachability_reposition_text"

        app:drawableTopCompat="@drawable/reachability_education_ic_right_hand"

        android:layout_gravity="center_horizontal|bottom"

        android:layout_marginTop="@dimen/letterbox_reachability_education_dialog_margin"

        android:id="@+id/reachability_move_down_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"/>

        android:layout_height="wrap_content"

        android:visibility="invisible"/>



</com.android.wm.shell.compatui.ReachabilityEduLayout>

libs/WindowManager/Shell/res/values-night/styles.xml

+1 −3
Original line number Diff line number Diff line
@@ -17,12 +17,10 @@ 


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



    <style name="ReachabilityEduHandLayout">

    <style name="ReachabilityEduHandLayout" parent="Theme.AppCompat">

        <item name="android:focusable">false</item>

        <item name="android:focusableInTouchMode">false</item>

        <item name="android:background">@android:color/transparent</item>

        <item name="android:contentDescription">@string/restart_button_description</item>

        <item name="android:visibility">invisible</item>

        <item name="android:lineSpacingExtra">-1sp</item>

        <item name="android:textSize">12sp</item>

        <item name="android:textAlignment">center</item>

libs/WindowManager/Shell/res/values/styles.xml

+1 −3
Original line number Diff line number Diff line
@@ -151,12 +151,10 @@ 
        </item>

    </style>



    <style name="ReachabilityEduHandLayout">

    <style name="ReachabilityEduHandLayout" parent="Theme.AppCompat.Light">

        <item name="android:focusable">false</item>

        <item name="android:focusableInTouchMode">false</item>

        <item name="android:background">@android:color/transparent</item>

        <item name="android:contentDescription">@string/restart_button_description</item>

        <item name="android:visibility">invisible</item>

        <item name="android:lineSpacingExtra">-1sp</item>

        <item name="android:textSize">12sp</item>

        <item name="android:textAlignment">center</item>