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

Commit 53107b6e authored by Heemin Seog's avatar Heemin Seog Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Add generic rotary support for sysui overlay window" into rvc-qpr-dev

parents 6babba79 e076c234

packages/CarSystemUI/res-keyguard/layout/keyguard_container.xml

+1 −4
Original line number Diff line number Diff line
@@ -14,10 +14,7 @@ 
  ~ limitations under the License.

  -->



<!-- Car customizations

     Car has solid black background instead of a transparent one

-->

<LinearLayout

<com.android.car.ui.FocusArea

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

    android:id="@+id/keyguard_container"

    android:layout_width="match_parent"

packages/CarSystemUI/res-keyguard/layout/num_pad_keys.xml

+0 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ 
        android:src="@drawable/ic_backspace"

        android:clickable="true"

        android:tint="@android:color/white"

        android:background="@drawable/ripple_drawable"

        android:contentDescription="@string/keyboardview_keycode_delete" />

    <com.android.keyguard.NumPadKey

        android:id="@+id/key0"
@@ -77,7 +76,6 @@ 
        style="@style/NumPadKeyButton.LastRow"

        android:src="@drawable/ic_done"

        android:tint="@android:color/white"

        android:background="@drawable/ripple_drawable"

        android:contentDescription="@string/keyboardview_keycode_enter" />

</merge>

packages/CarSystemUI/res-keyguard/values/dimens.xml

+1 −3
Original line number Diff line number Diff line
@@ -17,10 +17,8 @@ 
<resources>

    <dimen name="num_pad_margin_left">112dp</dimen>

    <dimen name="num_pad_margin_right">144dp</dimen>

    <dimen name="num_pad_key_width">80dp</dimen>

    <dimen name="num_pad_key_width">120dp</dimen>

    <dimen name="num_pad_key_height">80dp</dimen>

    <dimen name="num_pad_key_margin_horizontal">@*android:dimen/car_padding_5</dimen>

    <dimen name="num_pad_key_margin_bottom">@*android:dimen/car_padding_5</dimen>

    <dimen name="pin_entry_height">@dimen/num_pad_key_height</dimen>

    <dimen name="divider_height">1dp</dimen>

    <dimen name="key_enter_margin_top">128dp</dimen>

packages/CarSystemUI/res-keyguard/values/styles.xml

+2 −5
Original line number Diff line number Diff line
@@ -23,12 +23,11 @@ 
        <item name="android:layout_width">@dimen/num_pad_key_width</item>

        <item name="android:layout_height">@dimen/num_pad_key_height</item>

        <item name="android:layout_marginBottom">@dimen/num_pad_key_margin_bottom</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="textView">@id/pinEntry</item>

    </style>



    <style name="NumPadKeyButton.MiddleColumn">

        <item name="android:layout_marginStart">@dimen/num_pad_key_margin_horizontal</item>

        <item name="android:layout_marginEnd">@dimen/num_pad_key_margin_horizontal</item>

    </style>



    <style name="NumPadKeyButton.LastRow">
@@ -36,12 +35,10 @@ 
    </style>



    <style name="NumPadKeyButton.LastRow.MiddleColumn">

        <item name="android:layout_marginStart">@dimen/num_pad_key_margin_horizontal</item>

        <item name="android:layout_marginEnd">@dimen/num_pad_key_margin_horizontal</item>

    </style>



    <style name="KeyguardButton" parent="@android:style/Widget.DeviceDefault.Button">

        <item name="android:background">@drawable/keyguard_button_background</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:textColor">@color/button_text</item>

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

    </style>

packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml

+25 −18
Original line number Diff line number Diff line
@@ -14,8 +14,14 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.systemui.car.userswitcher.UserSwitcherContainer



<com.android.car.ui.FocusArea

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

    android:id="@+id/user_switcher_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center">

    <com.android.systemui.car.userswitcher.UserSwitcherContainer

        android:id="@+id/container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -40,3 +46,4 @@ 
        </FrameLayout>



    </com.android.systemui.car.userswitcher.UserSwitcherContainer>

</com.android.car.ui.FocusArea>