Merge "checkpoint tablet status bar" (ce38d0c2) · Commits · e / os / android_frameworks_base

core/res/res/values-xlarge/config.xml

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2009, 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.
		*/
		-->

		<!-- These resources are around just to allow their values to be customized
		for different hardware and product builds. -->
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<!-- Component to be used as the status bar service. Must implement the IStatusBar
		interface. This name is in the ComponentName flattened format (package/class) -->
		<string name="config_statusBarComponent">com.android.systemui/com.android.systemui.statusbar.tablet.TabletStatusBarService</string>
		</resources>

core/res/res/values/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<!-- Component to be used as the status bar service. Must implement the IStatusBar
		interface. This name is in the ComponentName flattened format (package/class) -->
		<string name="config_statusBarComponent">com.android.systemui/com.android.systemui.statusbar.StatusBarService</string>
		<string name="config_statusBarComponent">com.android.systemui/com.android.systemui.statusbar.PhoneStatusBarService</string>

		<!-- Do not translate. Defines the slots for the right-hand side icons. That is to say, the
		icons in the status bar that are not notifications. -->

packages/SystemUI/AndroidManifest.xml

+6 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,12 @@
		android:icon="@drawable/ic_launcher_settings">

		<service
		android:name=".statusbar.StatusBarService"
		android:name=".statusbar.PhoneStatusBarService"
		android:exported="false"
		/>

		<service
		android:name=".statusbar.tablet.TabletStatusBarService"
		android:exported="false"
		/>

packages/SystemUI/res/drawable/notification_dragger.png

0 → 100644

+3.41 KiB

Loading image diff...

packages/SystemUI/res/layout-xlarge/status_bar.xml

0 → 100644

+155 −0

Original line number	Diff line number	Diff line
		<?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" -->
		<FrameLayout
		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"
		>

		<RelativeLayout android:id="@+id/icons"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal">

		<!--
		<LinearLayout android:id="@+id/statusIcons"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_alignParentRight="true"
		android:paddingRight="6dip"
		android:gravity="center_vertical"
		android:orientation="horizontal"/>
		-->

		<com.android.systemui.statusbar.tablet.NotificationIconArea
		android:id="@+id/notificationIcons"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_alignParentLeft="true"
		android:layout_marginLeft="10dp"
		android:paddingLeft="6dip"
		android:gravity="center_vertical"
		android:orientation="horizontal"
		/>

		<RelativeLayout android:id="@+id/icons"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_centerInParent="true"
		>

		<com.android.systemui.statusbar.Clock
		android:textAppearance="@*android:style/TextAppearance.StatusBar.Icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_centerHorizontal="true"
		android:singleLine="true"
		android:textSize="16sp"
		android:textStyle="bold"
		/>
		</RelativeLayout>

		<com.android.systemui.statusbar.KeyButtonView android:id="@+id/back"
		android:layout_width="wrap_content"
		android:layout_height="@*android:dimen/status_bar_height"
		android:layout_toLeftOf="@+id/menu"
		android:layout_marginRight="10dp"
		android:src="@drawable/status_bar_back"
		systemui:keyCode="4"
		/>
		<com.android.systemui.statusbar.KeyButtonView android:id="@+id/menu"
		android:layout_width="wrap_content"
		android:layout_height="@*android:dimen/status_bar_height"
		android:layout_toLeftOf="@+id/home"
		android:src="@drawable/status_bar_menu"
		android:layout_marginRight="10dp"
		systemui:keyCode="82"
		/>
		<com.android.systemui.statusbar.KeyButtonView android:id="@+id/home"
		android:layout_width="wrap_content"
		android:layout_height="@*android:dimen/status_bar_height"
		android:layout_alignParentRight="true"
		android:layout_marginRight="10dp"
		android:src="@drawable/status_bar_home"
		systemui:keyCode="3"
		/>

		</RelativeLayout>
		<!--

		<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="wrap_content"
		android:layout_height="match_parent"
		android:layout_marginRight="8dip"
		>
		<com.android.systemui.statusbar.AnimatedImageView
		android:layout_width="25dip"
		android:layout_height="25dip"
		/>
		<com.android.systemui.statusbar.AnimatedImageView
		android:layout_width="25dip"
		android:layout_height="25dip"
		/>
		</ImageSwitcher>
		<com.android.systemui.statusbar.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="@*android:style/TextAppearance.StatusBar.Ticker"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		/>
		<TextView
		android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		/>
		</com.android.systemui.statusbar.TickerView>
		</LinearLayout>

		<com.android.systemui.statusbar.DateView android:id="@+id/date"
		android:textAppearance="@*android:style/TextAppearance.StatusBar.Icon"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:singleLine="true"
		android:gravity="center_vertical\|left"
		android:paddingLeft="6px"
		android:paddingRight="6px"
		android:background="@drawable/status_bar_background"
		/>
		-->
		</FrameLayout>