Merge "Quick settings come to all Android devices." into jb-mr1-dev (9cc9aeb0) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable-nodpi/qs_coming_soon.png

0 → 100644

+29.2 KiB

Loading image diff...

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -36,11 +36,17 @@
		android:id="@+id/panel_holder"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginTop="@*android:dimen/status_bar_height"
		>
		<include layout="@layout/status_bar_expanded"
		android:layout_width="@dimen/notification_panel_width"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|top"
		android:layout_gravity="left\|top"
		/>
		<include layout="@layout/quick_settings"
		android:layout_width="@dimen/notification_panel_width"
		android:layout_height="wrap_content"
		android:layout_gravity="right\|top"
		/>
		</com.android.systemui.statusbar.phone.PanelHolder>
		</com.android.systemui.statusbar.phone.StatusBarWindowView>

packages/SystemUI/res/layout/quick_settings.xml

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2012 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.
		-->

		<com.android.systemui.statusbar.phone.PanelView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:id="@+id/settings_panel"
		>
		<ImageView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:scaleType="centerInside"
		android:src="@drawable/qs_coming_soon"
		android:padding="4dp"
		android:background="#80000080"
		/>
		<LinearLayout android:id="@+id/handle"
		android:layout_width="match_parent"
		android:layout_height="@dimen/close_handle_height"
		android:layout_gravity="bottom"
		android:orientation="vertical"
		>
		<ImageView
		android:layout_width="match_parent"
		android:layout_height="@dimen/close_handle_height"
		android:layout_gravity="bottom"
		android:scaleType="fitXY"
		android:src="@drawable/status_bar_close"
		/>
		</LinearLayout>
		</com.android.systemui.statusbar.phone.PanelView>
		No newline at end of file

packages/SystemUI/res/layout/super_status_bar.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -36,11 +36,16 @@
		android:id="@+id/panel_holder"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginTop="@*android:dimen/status_bar_height"
		>
		<include layout="@layout/status_bar_expanded"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		/>
		<include layout="@layout/quick_settings"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		/>
		</com.android.systemui.statusbar.phone.PanelHolder>

		</com.android.systemui.statusbar.phone.StatusBarWindowView>

packages/SystemUI/res/values-sw600dp-land/dimens.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -19,8 +19,4 @@
		<!-- Layout parameters for the notification panel -->
		<dimen name="notification_panel_margin_bottom">0dp</dimen>
		<dimen name="notification_panel_margin_left">32dp</dimen>

		<!-- Gravity for the notification panel -->
		<!-- 0x33 = left\|top -->
		<integer name="notification_panel_layout_gravity">0x33</integer>
		</resources>