diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-09-13 02:17:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-13 02:17:07 +0000 |
| commit | 72e99bb302c848bfe80a81043101992d0546d508 (patch) | |
| tree | c58195f6bb4de38f16c85f08ae18aa01a28a3bbf /packages/SystemUI/res | |
| parent | fb97a8ed5111dc6e935a24cd61da7d92bb790dd8 (diff) | |
| parent | 7c05e7448b982e656e11e5ab80d6445e18b7c88d (diff) | |
| download | frameworks_base-72e99bb302c848bfe80a81043101992d0546d508.zip frameworks_base-72e99bb302c848bfe80a81043101992d0546d508.tar.gz frameworks_base-72e99bb302c848bfe80a81043101992d0546d508.tar.bz2 | |
am 38e0d1bf: am 39538cd0: am a853c623: Merge "Avoid some more layer creations" into lmp-dev
* commit '38e0d1bf93e0abe7cbd5765f3043c8b5ada485da':
Avoid some more layer creations
Diffstat (limited to 'packages/SystemUI/res')
4 files changed, 8 insertions, 8 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_user_switcher.xml b/packages/SystemUI/res/layout/keyguard_user_switcher.xml index 7c918c2..3730bbe 100644 --- a/packages/SystemUI/res/layout/keyguard_user_switcher.xml +++ b/packages/SystemUI/res/layout/keyguard_user_switcher.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<com.android.systemui.statusbar.AlphaOptimizedLinearLayout +<com.android.keyguard.AlphaOptimizedLinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/keyguard_user_switcher" android:orientation="vertical" @@ -23,4 +23,4 @@ android:gravity="end" android:visibility="gone" android:paddingTop="4dp"> -</com.android.systemui.statusbar.AlphaOptimizedLinearLayout> +</com.android.keyguard.AlphaOptimizedLinearLayout> diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index 0d414f9..245c128 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -57,7 +57,7 @@ > <!-- The alpha of this area is both controlled from PhoneStatusBarTransitions and PhoneStatusBar (DISABLE_NOTIFICATION_ICONS), so we need two views here. --> - <com.android.systemui.statusbar.AlphaOptimizedLinearLayout + <com.android.keyguard.AlphaOptimizedLinearLayout android:id="@+id/notification_icon_area_inner" android:layout_width="match_parent" android:layout_height="match_parent" @@ -74,10 +74,10 @@ android:layout_alignParentStart="true" android:gravity="center_vertical" android:orientation="horizontal"/> - </com.android.systemui.statusbar.AlphaOptimizedLinearLayout> + </com.android.keyguard.AlphaOptimizedLinearLayout> </com.android.systemui.statusbar.AlphaOptimizedFrameLayout> - <com.android.systemui.statusbar.AlphaOptimizedLinearLayout android:id="@+id/system_icon_area" + <com.android.keyguard.AlphaOptimizedLinearLayout android:id="@+id/system_icon_area" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="horizontal" @@ -94,7 +94,7 @@ android:paddingStart="7dp" android:gravity="center_vertical|start" /> - </com.android.systemui.statusbar.AlphaOptimizedLinearLayout> + </com.android.keyguard.AlphaOptimizedLinearLayout> </LinearLayout> <ViewStub diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 34e062c..7ea9145 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -44,7 +44,7 @@ android:scaleType="centerInside"/> </com.android.systemui.statusbar.phone.MultiUserSwitch> - <ImageButton android:id="@+id/settings_button" + <com.android.keyguard.AlphaOptimizedImageButton android:id="@+id/settings_button" style="@android:style/Widget.Material.Button.Borderless" android:layout_toStartOf="@id/multi_user_switch" android:layout_width="48dp" diff --git a/packages/SystemUI/res/layout/system_icons.xml b/packages/SystemUI/res/layout/system_icons.xml index 8f25d99..21386ef 100644 --- a/packages/SystemUI/res/layout/system_icons.xml +++ b/packages/SystemUI/res/layout/system_icons.xml @@ -20,7 +20,7 @@ android:layout_height="match_parent" android:gravity="center_vertical"> - <com.android.systemui.statusbar.AlphaOptimizedLinearLayout android:id="@+id/statusIcons" + <com.android.keyguard.AlphaOptimizedLinearLayout android:id="@+id/statusIcons" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" |