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

Commit e0d7f93e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8794174 from 4c542314 to tm-qpr1-release 

Change-Id: I3906f9bd529211d3784fb35314469baa0df55784
parents 2413ac05 4c542314

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+0 −20
Original line number Diff line number Diff line
@@ -59,26 +59,6 @@ 


    </LinearLayout>



    <com.android.systemui.statusbar.KeyguardAffordanceView

        android:id="@+id/camera_button"

        android:layout_height="@dimen/keyguard_affordance_height"

        android:layout_width="@dimen/keyguard_affordance_width"

        android:layout_gravity="bottom|end"

        android:src="@drawable/ic_camera_alt_24dp"

        android:scaleType="center"

        android:contentDescription="@string/accessibility_camera_button"

        android:tint="?attr/wallpaperTextColor" />



    <com.android.systemui.statusbar.KeyguardAffordanceView

        android:id="@+id/left_button"

        android:layout_height="@dimen/keyguard_affordance_height"

        android:layout_width="@dimen/keyguard_affordance_width"

        android:layout_gravity="bottom|start"

        android:src="@*android:drawable/ic_phone"

        android:scaleType="center"

        android:contentDescription="@string/accessibility_phone_button"

        android:tint="?attr/wallpaperTextColor" />



    <ImageView

        android:id="@+id/wallet_button"

        android:layout_height="@dimen/keyguard_affordance_fixed_height"

packages/SystemUI/res/layout/media_ttt_chip_receiver.xml

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,12 @@ 
    android:layout_height="wrap_content"

    >



    <com.android.systemui.media.taptotransfer.receiver.ReceiverChipRippleView

        android:id="@+id/ripple"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        />



    <com.android.internal.widget.CachingIconView

        android:id="@+id/app_icon"

        android:layout_width="@dimen/media_ttt_icon_size_receiver"

packages/SystemUI/res/layout/wireless_charging_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <com.android.systemui.statusbar.charging.ChargingRippleView

    <com.android.systemui.ripple.RippleView

        android:id="@+id/wireless_charging_ripple"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

packages/SystemUI/res/values/config.xml

+0 −6
Original line number Diff line number Diff line
@@ -37,12 +37,6 @@ 
        <item>400</item>

    </integer-array>



    <!-- Show mic or phone affordance on Keyguard -->

    <bool name="config_keyguardShowLeftAffordance">false</bool>



    <!-- Show camera affordance on Keyguard -->

    <bool name="config_keyguardShowCameraAffordance">false</bool>



    <!-- decay duration (from size_max -> size), in ms -->

    <integer name="navigation_bar_deadzone_hold">333</integer>

    <integer name="navigation_bar_deadzone_decay">333</integer>

packages/SystemUI/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -676,9 +676,6 @@ 
    <!-- The minimum background radius when swiping to a side for the camera / phone affordances. -->

    <dimen name="keyguard_affordance_min_background_radius">30dp</dimen>



    <!-- The size of the touch targets on the keyguard for the affordances. -->

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



    <!-- The grow amount for the camera and phone circles when hinting -->

    <dimen name="hint_grow_amount_sideways">60dp</dimen>