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

Commit 0fc5c393 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

Removes left/right buttons from bottom area. 

The left/right button/affordance functionality is dead code for a deprecated
feature. This CL removes that code from KeyguardBottomAreaView and
cleans up usages. It also deletes a couple of now-unused classes.

The greater context for this change is the desire to refactor/modernize
the KeyguardBottomAreaView. The smaller the API surface this class
supports, the easier the refactor will be.

Test: Manually verified that the lock screen still seems to behave the
same way as it did before this change. Specifically, made sure that the
Wallet and Home Control buttons are still visible when configured and
work in the normal way.
Bug: b/235403546

Change-Id: Ib5104fafa5aae07098cd7c4d51d3e11b9e335f03
parent c5f1c156

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

packages/SystemUI/res/values/strings.xml

+0 −7
Original line number Diff line number Diff line
@@ -313,13 +313,6 @@ 
    <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] -->

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

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

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

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


    void onHintFinished();



    void onCameraHintStarted();



    void onVoiceAssistHintStarted();



    void onPhoneHintStarted();



    void onTrackingStopped(boolean expand);



    // TODO: Figure out way to remove these.