Merge "New layout structure for the expanded status bar." (4f0128fb) · Commits · e / os / android_frameworks_base

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@
		android:id="@+id/content_holder"
		android:layout_height="wrap_content"
		android:layout_width="@dimen/notification_panel_width"
		android:layout_marginStart="@dimen/notification_panel_margin_left"
		android:background="@drawable/heads_up_window_bg"
		/>
		</com.android.systemui.statusbar.policy.HeadsUpNotificationView>

packages/SystemUI/res/layout/flip_settings.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,5 +22,4 @@
		android:layout_height="wrap_content"
		android:background="#5f000000"
		android:animateLayoutChanges="true"
		android:visibility="gone"
		android:columnCount="@integer/quick_settings_num_columns" />
		No newline at end of file

packages/SystemUI/res/layout/heads_up.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,5 @@
		android:layout_height="wrap_content"
		android:layout_width="@dimen/notification_panel_width"
		android:id="@+id/content_holder"
		android:layout_marginStart="@dimen/notification_panel_margin_left"
		android:background="@drawable/notification_panel_bg"
		/>
		No newline at end of file

packages/SystemUI/res/layout/status_bar_expanded.xml

+39 −28

Original line number	Diff line number	Diff line
		@@ -23,9 +23,7 @@
		xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
		android:id="@+id/notification_panel"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:paddingTop="@dimen/notification_panel_padding_top"
		android:layout_marginStart="@dimen/notification_panel_margin_left"
		android:layout_height="match_parent"
		>

		<include
		@@ -36,15 +34,6 @@
		android:layout_gravity="bottom"
		/>

		<include
		layout="@layout/status_bar_flip_button"
		android:id="@+id/keyguard_flipper"
		android:layout_width="50dp"
		android:layout_height="50dp"
		android:layout_gravity="right\|top"
		android:layout_marginTop="@dimen/status_bar_height"
		android:visibility="gone" />

		<com.android.keyguard.CarrierText
		android:id="@+id/keyguard_carrier_text"
		android:layout_width="wrap_content"
		@@ -54,11 +43,6 @@
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium" />

		<include layout="@layout/status_bar_expanded_header"
		android:layout_width="match_parent"
		android:layout_height="@dimen/notification_panel_header_height"
		/>

		<include
		layout="@layout/keyguard_status_view"
		android:layout_height="wrap_content"
		@@ -74,27 +58,54 @@
		android:visibility="gone"
		/>

		<FrameLayout
		<com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer
		android:id="@+id/notification_container_parent"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/close_handle_underlap"
		>
		android:clipToPadding="false"
		android:clipChildren="false">

		<com.android.systemui.statusbar.phone.ObservableScrollView
		android:id="@+id/scroll_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="invisible"
		android:scrollbars="none"
		android:fillViewport="true">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">
		<include
		layout="@layout/flip_settings"
		android:layout_marginTop="@dimen/notification_panel_header_height"
		android:layout_marginTop="@dimen/status_bar_header_height_expanded"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		/>
		android:layout_height="wrap_content"/>

		<!-- A view to reserve space for the collapsed stack -->
		<View
		android:layout_height="@dimen/collapsed_stack_height"
		android:layout_width="match_parent"/>
		</LinearLayout>
		</com.android.systemui.statusbar.phone.ObservableScrollView>


		<com.android.systemui.statusbar.stack.NotificationStackScrollLayout
		android:id="@+id/notification_stack_scroller"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_height="match_parent"
		android:layout_marginBottom="@dimen/close_handle_underlap"/>

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


		<include layout="@layout/status_bar_expanded_header"
		android:layout_width="match_parent"
		android:layout_height="@dimen/status_bar_header_height"
		/>
		</FrameLayout>

		<include
		layout="@layout/keyguard_bottom_area"
		android:visibility="gone" />

		</com.android.systemui.statusbar.phone.NotificationPanelView><!-- end of sliding panel -->

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+22 −15

Original line number	Diff line number	Diff line
		@@ -15,21 +15,30 @@
		** limitations under the License.
		-->

		<LinearLayout
		<!-- Extends RelativeLayout -->
		<com.android.systemui.statusbar.phone.StatusBarHeaderView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
		android:id="@+id/header"
		android:layout_width="match_parent"
		android:layout_height="@dimen/notification_panel_header_height"
		android:background="@drawable/notification_header_bg"
		android:layout_height="@dimen/status_bar_header_height"
		android:orientation="horizontal"
		android:gravity="center_vertical"
		android:baselineAligned="false"
		>

		<View
		android:id="@+id/background"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@drawable/notification_header_bg"
		android:clickable="true"
		/>
		<RelativeLayout
		android:id="@+id/datetime"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="start"
		android:paddingStart="8dp"
		android:paddingEnd="8dp"
		android:background="@drawable/ic_notify_button_bg"
		@@ -55,12 +64,6 @@
		/>
		</RelativeLayout>

		<Space
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_weight="1"
		/>

		<TextView
		android:id="@+id/header_debug_info"
		android:visibility="invisible"
		@@ -74,18 +77,22 @@
		android:padding="2dp"
		/>

		<include layout="@layout/status_bar_flip_button"
		android:id="@+id/header_flipper"
		android:layout_width="50dp"
		android:layout_height="50dp"
		android:layout_alignParentEnd="true"/>

		<ImageView android:id="@+id/clear_all_button"
		android:layout_width="50dp"
		android:layout_height="50dp"
		android:layout_toStartOf="@id/header_flipper"
		android:scaleType="center"
		android:src="@drawable/ic_notify_clear"
		android:background="@drawable/ic_notify_button_bg"
		android:contentDescription="@string/accessibility_clear_all"
		/>

		<include layout="@layout/status_bar_flip_button"
		android:id="@+id/header_flipper"
		android:layout_width="50dp"
		android:layout_height="50dp"
		android:layout_marginStart="12dp" />
		</LinearLayout>


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