05e2414ef5
In fact, there's even more going on here. Icons were
appearing cut off because of the unusual width of icons on
the right-hand side of the status bar; we now take extra
steps to ensure that the IconMerger is only wide enough to
show an integral number of icons. But that causes problems
with the rest of the status bar the IconMerger makes itself
thinner than the overall layout requires, so there's now a
containing layout to absorb the additional horizontal space
properly.
Bug: 5136545
Change-Id: I8c4d1ee2bcd976c452510b33c196fbe0c3e8c660
141 lines
5.7 KiB
XML
141 lines
5.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
/* apps/common/assets/default/default/skins/StatusBar.xml
|
|
**
|
|
** Copyright 2006, 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.
|
|
*/
|
|
-->
|
|
|
|
<!-- android:background="@drawable/status_bar_closed_default_background" -->
|
|
<com.android.systemui.statusbar.phone.PhoneStatusBarView
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
|
|
android:background="@drawable/status_bar_background"
|
|
android:orientation="vertical"
|
|
android:focusable="true"
|
|
android:descendantFocusability="afterDescendants"
|
|
>
|
|
|
|
<LinearLayout android:id="@+id/icons"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:paddingLeft="6dip"
|
|
android:paddingRight="6dip"
|
|
android:orientation="horizontal"
|
|
>
|
|
|
|
<LinearLayout
|
|
android:layout_width="0dip"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1"
|
|
android:orientation="horizontal"
|
|
>
|
|
<com.android.systemui.statusbar.StatusBarIconView android:id="@+id/moreIcon"
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="match_parent"
|
|
android:src="@drawable/stat_notify_more"
|
|
android:visibility="gone"
|
|
/>
|
|
|
|
<com.android.systemui.statusbar.phone.IconMerger android:id="@+id/notificationIcons"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_alignParentLeft="true"
|
|
android:gravity="center_vertical"
|
|
android:orientation="horizontal"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/statusIcons"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:gravity="center_vertical"
|
|
android:orientation="horizontal"/>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/signal_battery_cluster"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:paddingLeft="2dp"
|
|
android:orientation="horizontal"
|
|
android:gravity="center"
|
|
>
|
|
<include layout="@layout/signal_cluster_view"
|
|
android:id="@+id/signal_cluster"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
/>
|
|
<ImageView
|
|
android:id="@+id/battery"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:paddingLeft="4dip"
|
|
/>
|
|
</LinearLayout>
|
|
|
|
<com.android.systemui.statusbar.policy.Clock
|
|
android:id="@+id/clock"
|
|
android:textAppearance="@style/TextAppearance.StatusBar.Clock"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:singleLine="true"
|
|
android:paddingLeft="6dip"
|
|
android:gravity="center_vertical|left"
|
|
/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/ticker"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:paddingLeft="6dip"
|
|
android:animationCache="false"
|
|
android:orientation="horizontal" >
|
|
<ImageSwitcher android:id="@+id/tickerIcon"
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="@dimen/status_bar_icon_size"
|
|
android:layout_marginRight="4dip"
|
|
>
|
|
<com.android.systemui.statusbar.AnimatedImageView
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="@dimen/status_bar_icon_size"
|
|
android:scaleType="center"
|
|
/>
|
|
<com.android.systemui.statusbar.AnimatedImageView
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="@dimen/status_bar_icon_size"
|
|
android:scaleType="center"
|
|
/>
|
|
</ImageSwitcher>
|
|
<com.android.systemui.statusbar.phone.TickerView android:id="@+id/tickerText"
|
|
android:layout_width="0dip"
|
|
android:layout_weight="1"
|
|
android:layout_height="wrap_content"
|
|
android:paddingTop="2dip"
|
|
android:paddingRight="10dip">
|
|
<TextView
|
|
android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:singleLine="true"
|
|
/>
|
|
<TextView
|
|
android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:singleLine="true"
|
|
/>
|
|
</com.android.systemui.statusbar.phone.TickerView>
|
|
</LinearLayout>
|
|
</com.android.systemui.statusbar.phone.PhoneStatusBarView>
|