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

Unverified Commit 473931f3 authored by Utkarsh Gupta's avatar Utkarsh Gupta Committed by Michael Bestas
Browse files

Allow screen unpinning on devices without navbar 

Change-Id: Iedfc08f4d95bbee3c8578c0d2450b90739e63603

Screen Pinning: Show correct text for on screen nav.

  Similar to I09c2ef661bff272cb4f7ca43bac0e45f4b20a4d4,
  we're not getting an instance of PhoneWindowManager which
  we can rely on to update dynamically.

  TICKET: OPO-393

Change-Id: Iacf8221066461fb6940dd88432e665812545c3ff
parent 0445bf76

core/res/res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -139,4 +139,7 @@ 
    <!-- Protected Apps Notification -->

    <string name="notify_package_component_protected_title">Activity launch blocked</string>

    <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> is protected from being launched. Tap to authenticate and launch the application.</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

+3 −0
Original line number Diff line number Diff line
@@ -65,4 +65,7 @@ 
    <java-symbol type="drawable" name="stat_notify_protected" />

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

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



    <!-- Screen unpinning -->

    <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
@@ -29,12 +29,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="?android:attr/colorAccent" />



    <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
@@ -32,4 +32,7 @@ 
    <!-- Notification which notifies user flashlight is enabled -->

    <string name="quick_settings_tile_flashlight_not_title">Flashlight is on</string>

    <string name="quick_settings_tile_flashlight_not_summary">Tap to turn off</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>