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

Commit f77fb917 authored by Mike Digman's avatar Mike Digman
Browse files

Fork navbar layout for quickstep 

Different navbar layouts are loaded via config.xml depending
on if Quickstep is enabled. A contextual button frame is added
to replace the right nav buttons so different styling can be
applied. New back, rotate and keyboard icons are added.

Maintains support for custom navbar layouts. Adds support for
nested reversable elements, needed for contextual button frame.
Fixes navbar gravity support by using RelativeLayout's gravity
and top/bottom switching.

Change-Id: I5e24b2392c377313d421c0f95c3a7a0b99f32590
Fixes: 79930722
Fixes: 79930974
Fixes: 80164476
Test: manual, crash sysui, test against a11y, gb menu, rotate
parent 3116918b

packages/SystemUI/res/drawable/ic_ime_switcher_default.xml

+5 −5
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
  -->



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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

        android:width="20dp"

        android:height="20dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:pathData="M21,4H3C1.9,4 1,4.9 1,6v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2V6C23,4.9 22.1,4 21,4zM21,19H3V6h18V19zM9,8h2v2H9V8zM5,8h2v2H5V8zM8,16h8v1H8V16zM13,8h2v2h-2V8zM9,12h2v2H9V12zM5,12h2v2H5V12zM13,12h2v2h-2V12zM17,8h2v2h-2V8zM17,12h2v2h-2V12z"

        android:pathData="M19,7h2v2h-2V7zM15,7h2v2h-2V7zM3,7h2v2H3V7zM7,7h2v2H7V7zM11,7h2v2h-2V7zM19,11h2v2h-2V11zM15,11h2v2h-2V11zM3,11h2v2H3V11zM7,11h2v2H7V11zM11,11h2v2h-2V11zM7,15h10v2H7V15z"

        android:fillColor="?attr/singleToneColor"/>

</vector>

packages/SystemUI/res/drawable/ic_sysbar_accessibility_button.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
     limitations under the License.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:width="21dp"

    android:height="21dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

packages/SystemUI/res/drawable/ic_sysbar_back_quick_step.xml

+2 −5
Original line number Diff line number Diff line
@@ -19,10 +19,7 @@ 
    android:height="28dp"

    android:viewportWidth="28"

    android:viewportHeight="28">



    <path

        android:fillColor="?attr/singleToneColor"

        android:pathData="M17.25,10.15V14v3.85L14,15.95L10.69,14L14,12.05L17.25,10.15 M18.16,7.71c-0.14,0-0.28,0.04-0.42,0.12 l-4.63,2.72l-4.73,2.78c-0.52,0.3-0.52,1.05,0,1.36l4.73,2.78l4.63,2.72c0.13,0.08,0.28,0.12,0.42,0.12c0.44,0,0.84-0.36,0.84-0.86 V14V8.58C19,8.08,18.6,7.71,18.16,7.71L18.16,7.71z" />

    <path

        android:pathData="M 0 0 H 28 V 28 H 0 V 0 Z" />

        android:pathData="M16.78,10.03l-3.97,3.97l3.97,3.97l-1.06,1.06l-5.03,-5.03l5.03,-5.03z"

        android:fillColor="?attr/singleToneColor" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_sysbar_menu.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
     limitations under the License.

-->

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

    android:width="28dp"

    android:height="28dp"

    android:width="21dp"

    android:height="21dp"

    android:viewportWidth="28"

    android:viewportHeight="28">

packages/SystemUI/res/drawable/ic_sysbar_rotate_button.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ 
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">

    <aapt:attr name="android:drawable">

        <vector android:name="root"

                android:width="24dp"

                android:height="24dp"

                android:width="21dp"

                android:height="21dp"

                android:viewportWidth="24.0"

                android:viewportHeight="24.0">

            <group android:name="icon" android:pivotX="12" android:pivotY="12">

                <!-- Tint color to be set directly -->

                <path android:fillColor="#FFFFFFFF"

                    android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/>

                      android:pathData="M12,4c-0.06,0 -0.12,0.01 -0.18,0.01l1.09,-1.09L11.5,1.5L8,5l3.5,3.5l1.41,-1.41l-1.08,-1.08C11.89,6.01 11.95,6 12,6c3.31,0 6,2.69 6,6c0,1.7 -0.71,3.23 -1.85,4.32l1.41,1.41C19.06,16.28 20,14.25 20,12C20,7.59 16.41,4 12,4zM16,19l-3.5,3.5l-1.41,-1.41l1.1,-1.1C12.13,19.98 12.06,20 12,20c-4.41,0 -8,-3.59 -8,-8c0,-2.25 0.94,-4.28 2.43,-5.73l1.41,1.41C6.71,8.77 6,10.3 6,12c0,3.31 2.69,6 6,6c0.05,0 0.11,-0.01 0.16,-0.01l-1.07,-1.07l1.41,-1.41L16,19z"/>

            </group>

        </vector>

    </aapt:attr>