Merge "Full-height panels on phones." into jb-mr1-dev (5a426f6c) · Commits · e / os / android_frameworks_base

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

0 → 100644

+23 −0

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

		<Space
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:visibility="gone"
		/>
		No newline at end of file

0 → 100644

+30 −0

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

		<TextView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/carrier_label"
		android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Network"
		android:layout_height="@dimen/carrier_label_height"
		android:layout_width="match_parent"
		android:layout_gravity="bottom"
		android:layout_marginBottom="@dimen/close_handle_height"
		android:gravity="center"
		android:visibility="invisible"
		/>
		No newline at end of file

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:id="@+id/settings_panel"
		android:background="#80000080"
		>
		<ImageView
		android:layout_width="match_parent"
		@@ -26,7 +27,6 @@
		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"

+2 −7

Original line number	Diff line number	Diff line
		@@ -29,15 +29,10 @@
		android:layout_marginLeft="@dimen/notification_panel_margin_left"
		>

		<TextView
		android:id="@+id/carrier_label"
		android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Network"
		<include
		layout="@layout/carrier_label"
		android:layout_height="@dimen/carrier_label_height"
		android:layout_width="match_parent"
		android:layout_gravity="bottom"
		android:layout_marginBottom="@dimen/close_handle_height"
		android:gravity="center"
		android:visibility="invisible"
		/>

		<LinearLayout

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,11 +40,11 @@
		>
		<include layout="@layout/status_bar_expanded"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_height="match_parent"
		/>
		<include layout="@layout/quick_settings"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_height="match_parent"
		/>
		</com.android.systemui.statusbar.phone.PanelHolder>