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

Commit 62b65e4a authored by Adrian Roos's avatar Adrian Roos
Browse files

Update immersive cling visuals 

Also enables the swipe from top gesture for revealing
the navigation bar, even if the status bar is visible.

Bug: 19282730
Change-Id: I7b562c2f0f00ff3f05b8b1e44657efe79b45f9c7
parent d5fe9f60

core/res/res/drawable/ic_expand_more_48dp.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2015 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="48.0dp"

        android:height="48.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M33.17,17.17L24.0,26.34l-9.17,-9.17L12.0,20.0l12.0,12.0 12.0,-12.0z"/>

    <path

        android:pathData="M0 0h48v48H0z"

        android:fillColor="#00000000"/>

</vector>

core/res/res/drawable/immersive_cling_bg_circ.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval" >



    <solid android:color="@color/white" />



    <size

        android:height="56dp"

        android:width="56dp" />



</shape>

core/res/res/drawable/immersive_cling_light_bg_circ.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval" >



    <solid android:color="#80ffffff" />



    <size

        android:height="76dp"

        android:width="76dp" />



</shape>

core/res/res/layout/immersive_mode_cling.xml

+68 −43
Original line number Diff line number Diff line
@@ -13,55 +13,80 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

    android:orientation="vertical"

    android:padding="12dp"

    >

    <LinearLayout

        android:id="@+id/text"

        android:background="#ff009688"

        android:gravity="center_vertical"

        android:paddingBottom="24dp">



    <FrameLayout

            android:id="@+id/immersive_cling_chevron"

            android:layout_width="76dp"

            android:layout_height="76dp"

            android:layout_marginTop="-24dp"

            android:layout_centerHorizontal="true">



        <ImageView

                android:id="@+id/immersive_cling_back_bg_light"

                android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:layout_marginTop="4dp"

        android:padding="1dp"

        >

                android:layout_height="match_parent"

                android:scaleType="center"

                android:src="@drawable/immersive_cling_light_bg_circ" />



        <ImageView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:src="@drawable/cling_arrow_up"

            />

        <FrameLayout

                android:id="@+id/immersive_cling_back_bg"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:scaleType="center"

                android:src="@drawable/immersive_cling_bg_circ" />



        <ImageView

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:paddingTop="8dp"

                android:scaleType="center"

                android:src="@drawable/ic_expand_more_48dp"

                android:tint="#ff009688"/>

    </FrameLayout>



    <TextView

            android:id="@+id/immersive_cling_title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="@drawable/cling_bg"

            android:paddingStart="14dp"

            android:paddingEnd="14dp"

            android:paddingTop="24dp"

            android:paddingBottom="24dp">

            android:layout_below="@id/immersive_cling_chevron"

            android:paddingEnd="48dp"

            android:paddingStart="48dp"

            android:paddingTop="40dp"

            android:text="@string/immersive_cling_title"

            android:textColor="@color/primary_text_default_material_light"

            android:textSize="24sp" />



    <TextView

            android:id="@+id/immersive_cling_description"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

                android:text="@string/immersive_mode_confirmation"

                android:textColor="#80000000"

                android:textSize="16sp"

                />

        </FrameLayout>

    </LinearLayout>

            android:layout_below="@id/immersive_cling_title"

            android:paddingEnd="48dp"

            android:paddingStart="48dp"

            android:paddingTop="12.6dp"

            android:text="@string/immersive_cling_description"

            android:textColor="@color/primary_text_default_material_light"

            android:textSize="16sp" />



    <Button

            android:id="@+id/ok"

        android:layout_width="160sp"

            style="@style/Widget.Material.Button.Borderless"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

        android:layout_gravity="right"

            android:layout_alignParentEnd="true"

            android:layout_below="@+id/immersive_cling_description"

            android:layout_marginEnd="40dp"

            android:layout_marginTop="18dp"

        android:gravity="center"

        android:text="@string/ok"

        android:background="@drawable/cling_button"

        />



</LinearLayout>



            android:paddingEnd="8dp"

            android:paddingStart="8dp"

            android:text="@string/immersive_cling_positive"

            android:textColor="@android:color/white"

            android:textSize="14sp" />



</RelativeLayout>
 
 No newline at end of file

core/res/res/values/strings.xml

+8 −2
Original line number Diff line number Diff line
@@ -4983,8 +4983,14 @@ 
    <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->

    <string name="restr_pin_try_later">Try again later</string>



    <!-- Cling help message when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->

    <string name="immersive_mode_confirmation" msgid="8554991488096662508">Swipe down from the top to exit full screen.</string>

    <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->

    <string name="immersive_cling_title">Viewing full screen</string>



    <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->

    <string name="immersive_cling_description">To exit, swipe down from the top.</string>



    <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->

    <string name="immersive_cling_positive">Got it</string>



    <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->

    <string name="done_label">Done</string>