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

Commit d0e307f5 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am e316204c: am caf4828c: Merge "SysUI Tests: Make tests not break SysUI" into lmp-mr1-dev 

* commit 'e316204c':
  SysUI Tests: Make tests not break SysUI
parents a1bf50f1 e316204c

packages/SystemUI/res/layout-land/status_bar_recent_panel.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 




<com.android.systemui.recent.RecentsPanelView

<com.android.systemui.recent.RecentsPanelView

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

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

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

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

    android:id="@+id/recents_root"

    android:id="@+id/recents_root"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

packages/SystemUI/res/layout-sw600dp/navigation_bar.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
<!--  navigation bar for sw600dp (small tablets) -->

<!--  navigation bar for sw600dp (small tablets) -->

<com.android.systemui.statusbar.phone.NavigationBarView

<com.android.systemui.statusbar.phone.NavigationBarView

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

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

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

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

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:background="@drawable/system_bar_background"

    android:background="@drawable/system_bar_background"

packages/SystemUI/res/layout/navigation_bar.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 




<com.android.systemui.statusbar.phone.NavigationBarView

<com.android.systemui.statusbar.phone.NavigationBarView

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

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

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

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

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:background="@drawable/system_bar_background"

    android:background="@drawable/system_bar_background"

packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml

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

     limitations under the License.

-->

-->

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

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

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

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

    android:paddingLeft="16dp"

    android:paddingLeft="16dp"

    android:paddingRight="16dp"

    android:paddingRight="16dp"

    style="@style/BrightnessDialogContainer">

    style="@style/BrightnessDialogContainer">

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
<!-- Extends RelativeLayout -->

<!-- Extends RelativeLayout -->

<com.android.systemui.statusbar.phone.StatusBarHeaderView

<com.android.systemui.statusbar.phone.StatusBarHeaderView

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

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

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

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

    android:id="@+id/header"

    android:id="@+id/header"

    android:layout_width="@dimen/notification_panel_width"

    android:layout_width="@dimen/notification_panel_width"

    android:layout_height="@dimen/status_bar_header_height"

    android:layout_height="@dimen/status_bar_header_height"