173bae2c67
A) Hide icons corresponding to the active panel with a
downward push animation. Notes:
1. this animation will now apply any time the status bar
icons are disabled via DISABLE_NOTIFICATION_ICONS.
2. DISABLE_SYSTEM_INFO will now only hide the right hand
icons (system status icons, battery, clock). But you
weren't using it anyway, right?
B) Stop pulling down the panels in response to just a touch
on the status bar. (That should never have worked.) In
general, we now require that a fling proceed more than
10dp to be treated as a fling with velocity (as opposed
to a v=0 fling, or "let-go").
C) If a panel is pulled down more than halfway and then let
go with v=0, it is expanded. If less than halfway, it is
contracted. (Helps fix B) above, plus it just makes good
sense.)
Bug: 7211541 (A)
Bug: 7227237 (B)
Bug: 7228541 (B)
Change-Id: I5662269b753376804bf629239835dc212716d5c3
161 lines
6.6 KiB
XML
161 lines
6.6 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:id="@+id/status_bar"
|
|
android:background="@drawable/status_bar_background"
|
|
android:orientation="vertical"
|
|
android:focusable="true"
|
|
android:descendantFocusability="afterDescendants"
|
|
android:fitsSystemWindows="true"
|
|
>
|
|
|
|
<ImageView
|
|
android:id="@+id/notification_lights_out"
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="match_parent"
|
|
android:paddingLeft="6dip"
|
|
android:paddingBottom="2dip"
|
|
android:src="@drawable/ic_sysbar_lights_out_dot_small"
|
|
android:scaleType="center"
|
|
android:visibility="gone"
|
|
/>
|
|
|
|
<LinearLayout android:id="@+id/status_bar_contents"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:paddingLeft="6dip"
|
|
android:paddingRight="6dip"
|
|
android:orientation="horizontal"
|
|
>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/notification_icon_area"
|
|
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/system_icon_area"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:orientation="horizontal">
|
|
|
|
<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>
|
|
|
|
<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>
|