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

Commit 1af5b159 authored by Utkarsh Gupta's avatar Utkarsh Gupta Committed by Steve Kondik
Browse files

Allow screen unpinning on devices without navbar 

Change-Id: Iedfc08f4d95bbee3c8578c0d2450b90739e63603
parent 5ead120b

core/res/res/values/cm_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -204,4 +204,6 @@ 
    <string name="app_ops_wifi_change">change WiFI state</string>

    <string name="app_ops_su">get Superuser access</string>



    <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->

    <string name="lock_to_app_toast_no_navbar">To unpin this screen, touch and hold the Back button.</string>

</resources>

core/res/res/values/cm_symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -93,4 +93,6 @@ 
    <!-- Blur effects -->

    <java-symbol type="bool" name="config_ui_blur_enabled" />



    <!-- Advanced settings switch -->

    <java-symbol type="string" name="lock_to_app_toast_no_navbar" />

</resources>

packages/SystemUI/res/layout/screen_pinning_request.xml

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

        layout="@layout/screen_pinning_request_text_area" />



    <View

        android:id="@+id/spacer"

        android:layout_width="@dimen/screen_pinning_request_width"

        android:layout_height="18dp"

        android:background="@color/screen_pinning_request_bg" />



    <include

        android:layout_width="@dimen/screen_pinning_request_width"

        android:layout_height="wrap_content"

packages/SystemUI/res/layout/screen_pinning_request_text_area.xml

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:layout_height="wrap_content"

        android:paddingEnd="48dp"

        android:paddingStart="48dp"

        android:paddingTop="43dp"

        android:paddingTop="18dp"

        android:text="@string/screen_pinning_title"

        android:textColor="@color/screen_pinning_primary_text"

        android:textSize="24sp" />
@@ -50,7 +50,7 @@ 
        android:id="@+id/screen_pinning_ok_button"

        style="@android:style/Widget.Material.Button"

        android:layout_width="wrap_content"

        android:layout_height="36dp"

        android:layout_height="54dp"

        android:layout_alignParentEnd="true"

        android:layout_below="@+id/screen_pinning_description"

        android:layout_marginEnd="40dp"
@@ -66,7 +66,7 @@ 
        android:id="@+id/screen_pinning_cancel_button"

        style="@android:style/Widget.Material.Button"

        android:layout_width="wrap_content"

        android:layout_height="36dp"

        android:layout_height="54dp"

        android:layout_alignTop="@id/screen_pinning_ok_button"

        android:layout_marginEnd="4dp"

        android:layout_toStartOf="@id/screen_pinning_ok_button"

packages/SystemUI/res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -77,4 +77,7 @@ 
    <string name="quick_settings_edit_label">Edit Tiles</string>

    <string name="quick_settings_cannot_delete_edit_tile">Cannot delete the Edit tile</string>

    <string name="qs_tiles_reset_confirmation">Reset quick settings tiles to default configuration?</string>



    <!-- Screen pinning dialog description (for devices without navbar) -->

    <string name="screen_pinning_description_no_navbar">This keeps it in view until you unpin. Touch and hold the Back button to unpin.</string>

</resources>