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

Commit ceb953fb authored by Winson Chung's avatar Winson Chung
Browse files

Clean up navigation bar 

- Move off fragments, now we have direct ownership of
  NavBarController -> NavBar (per display) -> NavBarView
- Move the nav bar components to its own package
- Removed some unused files
- Can finally dump NavigationBarController instead of FragmentService :)
- Clean up some of the dumps to be more consistent

Bug: 163690441
Bug: 158605244
Test: atest SystemUITests
Test: Test bar in various nav modes

Change-Id: I21130899df560f6cf8b7f38d4d86edca6d8f920e
parent 49f75e42

packages/SystemUI/proguard.flags

+2 −2
Original line number Diff line number Diff line 
-keep class com.android.systemui.statusbar.policy.KeyButtonView {

-keep class com.android.systemui.navigationbar.buttons.KeyButtonView {

  public float getDrawingAlpha();

  public void setDrawingAlpha(float);

}



-keep class com.android.systemui.statusbar.policy.KeyButtonRipple {

-keep class com.android.systemui.navigationbar.buttons.KeyButtonRipple {

  public float getGlowAlpha();

  public float getGlowScale();

  public void setGlowAlpha(float);

packages/SystemUI/res/layout/back.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->



<com.android.systemui.statusbar.policy.KeyButtonView

<com.android.systemui.navigationbar.buttons.KeyButtonView

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

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

    android:id="@+id/back"

packages/SystemUI/res/layout/contextual.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
             android:clipChildren="false"

             android:clipToPadding="false"

             >

    <com.android.systemui.statusbar.policy.KeyButtonView

    <com.android.systemui.navigationbar.buttons.KeyButtonView

        android:id="@+id/menu"

        android:layout_height="match_parent"

        android:layout_width="match_parent"
@@ -47,7 +47,7 @@ 
             android:layout_height="match_parent"

             android:visibility="invisible"

    />

    <com.android.systemui.statusbar.policy.KeyButtonView

    <com.android.systemui.navigationbar.buttons.KeyButtonView

        android:id="@+id/accessibility_button"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

packages/SystemUI/res/layout/custom_key.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.systemui.statusbar.policy.KeyButtonView

<com.android.systemui.navigationbar.buttons.KeyButtonView

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

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

    android:layout_width="@dimen/navigation_side_padding"

packages/SystemUI/res/layout/home.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.systemui.statusbar.policy.KeyButtonView

<com.android.systemui.navigationbar.buttons.KeyButtonView

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

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

    android:id="@+id/home"