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

Commit 29f7a7b0 authored by Jason Monk's avatar Jason Monk
Browse files

SysUI Tests: Make tests not break SysUI 

Now you can run the tests without getting the blank broken sysui.
The tests instrument themselves so they include all of the source
they need to run rather than piggybacking on the sysui process.

A couple of changes were needed for this.  The xml files cannot
reference com.android.systemui, instead they must use res-auto.
The tests can no longer make privileged calls, so some restructuring
to avoid those calls was needed.

Bug: 18222975
Change-Id: I67b794af854f1420583d48960bd6e52ca753b56d
parent 61a848dd

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

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


<com.android.systemui.recent.RecentsPanelView

    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:layout_height="match_parent"

    android:layout_width="match_parent"

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

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

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

    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_width="match_parent"

    android:background="@drawable/system_bar_background"

packages/SystemUI/res/layout/navigation_bar.xml

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


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

    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_width="match_parent"

    android:background="@drawable/system_bar_background"

packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml

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

-->

<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:paddingRight="16dp"

    style="@style/BrightnessDialogContainer">

packages/SystemUI/res/layout/status_bar_expanded_header.xml

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

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

    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:layout_width="@dimen/notification_panel_width"

    android:layout_height="@dimen/status_bar_header_height"