Merge "Move more of the system bar to the layout." (a2b78e21) · Commits · e / os / android_frameworks_base

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

+25 −3

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		android:descendantFocusability="afterDescendants"
		>

		<RelativeLayout android:id="@+id/icons"
		<RelativeLayout android:id="@+id/notifications"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal">
		@@ -52,9 +52,31 @@
		android:paddingLeft="6dip"
		android:gravity="center_vertical"
		android:orientation="horizontal"
		>
		<view
		class="com.android.systemui.statusbar.tablet.NotificationIconArea$MoreView"
		android:id="@+id/more"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:src="@drawable/stat_notify_more"
		/>
		<view
		class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout"
		android:id="@+id/icons"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		/>
		<view
		class="com.android.systemui.statusbar.tablet.NotificationIconArea$DraggerView"
		android:id="@+id/handle"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:src="@drawable/notification_dragger"
		/>

		</com.android.systemui.statusbar.tablet.NotificationIconArea>

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

packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationIconArea.java

+12 −22

Original line number	Diff line number	Diff line
		@@ -38,36 +38,26 @@ public class NotificationIconArea extends LinearLayout {
		public NotificationIconArea(Context context, AttributeSet attrs) {
		super(context, attrs);

		mMoreView = new MoreView(context);
		addView(mMoreView, new LinearLayout.LayoutParams(
		LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));

		mIconLayout = new IconLayout(context);
		addView(mIconLayout, new LinearLayout.LayoutParams(
		LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));

		mDraggerView = new DraggerView(context);
		addView(mDraggerView, new LinearLayout.LayoutParams(
		LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
		mMoreView = (MoreView) findViewById(R.id.more);
		mIconLayout = (IconLayout)findViewById(R.id.icons);
		mDraggerView = (DraggerView) findViewById(R.id.handle);
		}

		class MoreView extends ImageView {
		public MoreView(Context context) {
		super(context);
		setImageResource(R.drawable.stat_notify_more);
		static class MoreView extends ImageView {
		public MoreView(Context context, AttributeSet attrs) {
		super(context, attrs);
		}
		}

		class IconLayout extends LinearLayout {
		public IconLayout(Context context) {
		super(context);
		static class IconLayout extends LinearLayout {
		public IconLayout(Context context, AttributeSet attrs) {
		super(context, attrs);
		}
		}

		class DraggerView extends ImageView {
		public DraggerView(Context context) {
		super(context);
		setImageResource(R.drawable.notification_dragger);
		static class DraggerView extends ImageView {
		public DraggerView(Context context, AttributeSet attrs) {
		super(context, attrs);
		}
		}
		}