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

Commit 7f6a2ab2 authored by Jason Monk's avatar Jason Monk
Browse files

Update nav bar layout for universal grid 

Test: visual
Bug: 37115488
Change-Id: I43fe6648f56d25f41fadefcaa27d2c0cf3f077ba
parent 21c7490f

packages/SystemUI/res/layout/navigation_layout.xml

+5 −1
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:layout_marginStart="@dimen/rounded_corner_content_padding"

    android:layout_marginEnd="@dimen/rounded_corner_content_padding"

    android:paddingStart="8dp"

    android:paddingEnd="8dp">



    <FrameLayout

        android:id="@+id/nav_buttons"

packages/SystemUI/res/layout/navigation_layout_rot90.xml

+5 −1
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:layout_marginTop="@dimen/rounded_corner_content_padding"

    android:layout_marginBottom="@dimen/rounded_corner_content_padding"

    android:paddingTop="8dp"

    android:paddingBottom="8dp">



    <FrameLayout

        android:id="@+id/nav_buttons"

packages/SystemUI/res/values-sw372dp/config.xml

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

<!--

/*

** Copyright 2017, 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources>

    <!-- Nav bar button default ordering/layout -->

    <string name="config_navBarLayout" translatable="false">left[.25W],back[.5WC];home;recent[.5WC],right[.25W]</string>

</resources>

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ 
    <string name="config_systemUIFactoryComponent" translatable="false">com.android.systemui.SystemUIFactory</string>



    <!-- Nav bar button default ordering/layout -->

    <string name="config_navBarLayout" translatable="false">left,back;home;recent,right</string>

    <string name="config_navBarLayout" translatable="false">left[.5W],back[1WC];home;recent[1WC],right[.5W]</string>



    <bool name="quick_settings_show_full_alarm">false</bool>

packages/SystemUI/src/com/android/systemui/RoundedCorners.java

+0 −8
Original line number Diff line number Diff line
@@ -98,14 +98,6 @@ public class RoundedCorners extends SystemUI implements Tunable { 
        TunablePadding.addTunablePadding(statusBar.findViewById(R.id.keyguard_header), PADDING,

                padding, FLAG_END);



        View navigationBarWindow = sb.getNavigationBarWindow();

        // Not all devices have on screen navigation bars.

        if (navigationBarWindow != null) {

            FragmentHostManager.get(navigationBarWindow).addTagListener(

                NavigationBarFragment.TAG,

                new TunablePaddingTagListener(padding, 0));

        }



        FragmentHostManager fragmentHostManager = FragmentHostManager.get(statusBar);

        fragmentHostManager.addTagListener(CollapsedStatusBarFragment.TAG,

                new TunablePaddingTagListener(padding, R.id.status_bar));