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

Commit 23af341c authored by Utkarsh Gupta's avatar Utkarsh Gupta Committed by Danny Baumann
Browse files

Allow screen unpinning on devices without navbar

Change-Id: Iedfc08f4d95bbee3c8578c0d2450b90739e63603
parent 516e6530
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -341,4 +341,7 @@
    <string name="live_display_outdoor">Outdoor (bright sun)</string>
    <string name="live_display_outdoor_summary">Use outdoor settings only</string>
    <string name="live_display_hint">LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out!</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>
+2 −0
Original line number Diff line number Diff line
@@ -328,4 +328,6 @@

    <!-- Advanced settings switch -->
    <java-symbol type="bool" name="config_advancedSettingsMode" />

    <java-symbol type="string" name="lock_to_app_toast_no_navbar" />
</resources>
+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"
+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"
+2 −0
Original line number Diff line number Diff line
@@ -116,4 +116,6 @@
    <string name="select_application">Select application</string>
    <string name="lockscreen_target_empty">Empty</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>
Loading