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

Commit 7153dc9e authored by Alejandro Nijamkin's avatar Alejandro Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "Removes left/right buttons from bottom area." into tm-qpr-dev am: 2d6505a6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19053512



Change-Id: I39f4c5205f0facb141099a04cbd2033b91740df3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b2ca6db 2d6505a6

packages/SystemUI/res/layout/keyguard_bottom_area.xml

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




    </LinearLayout>

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

    <ImageView

        android:id="@+id/wallet_button"

        android:id="@+id/wallet_button"

        android:layout_height="@dimen/keyguard_affordance_fixed_height"

        android:layout_height="@dimen/keyguard_affordance_fixed_height"

packages/SystemUI/res/values/config.xml

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

        <item>400</item>

    </integer-array>

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

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

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

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

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

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

packages/SystemUI/res/values/dimens.xml

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

    <!-- The minimum background radius when swiping to a side for the camera / phone affordances. -->

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

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

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

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

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

packages/SystemUI/res/values/strings.xml

+0 −7
Original line number Original line Diff line number Diff line
@@ -313,13 +313,6 @@ 
    <string name="accessibility_scanning_face">Scanning face</string>

    <string name="accessibility_scanning_face">Scanning face</string>

    <!-- Click action label for accessibility for the smart reply buttons (not shown on-screen).". [CHAR LIMIT=NONE] -->

    <!-- Click action label for accessibility for the smart reply buttons (not shown on-screen).". [CHAR LIMIT=NONE] -->

    <string name="accessibility_send_smart_reply">Send</string>

    <string name="accessibility_send_smart_reply">Send</string>

    <!-- Content description of the manage notification button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->

    <string name="phone_label">open phone</string>

    <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->

    <string name="voice_assist_label">open voice assist</string>

    <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->

    <string name="camera_label">open camera</string>

    <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->

    <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->

    <string name="cancel">Cancel</string>

    <string name="cancel">Cancel</string>

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -427,12 +427,6 @@ public interface CentralSurfaces extends Dumpable, ActivityStarter, LifecycleOwn 




    void onHintFinished();

    void onHintFinished();





    void onCameraHintStarted();



    void onVoiceAssistHintStarted();



    void onPhoneHintStarted();



    void onTrackingStopped(boolean expand);

    void onTrackingStopped(boolean expand);





    // TODO: Figure out way to remove these.

    // TODO: Figure out way to remove these.