Merge "Start honeyphoning the notification panel." (d1085385) · Commits · e / os / android_frameworks_base

core/res/res/layout/status_bar_latest_event_content.xml

+26 −34

Original line number	Diff line number	Diff line
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:paddingTop="7dp"
		android:paddingLeft="5dp"
		>

		<ImageView android:id="@+id/icon"
		android:layout_width="@dimen/notification_large_icon_width"
		android:layout_height="@dimen/notification_large_icon_height"
		android:background="@drawable/notify_panel_notification_icon_bg"
		android:scaleType="center"
		/>
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:paddingTop="3dp"
		android:layout_gravity="center_vertical"
		android:layout_weight="1"
		android:orientation="vertical"
		android:paddingLeft="16dp"
		>
		<!--com.android.server.status.AnimatedImageView android:id="@+id/icon" -->
		<ImageView android:id="@+id/icon"
		android:layout_width="25dp"
		android:layout_height="25dp"
		android:scaleType="fitCenter"
		android:src="@drawable/arrow_down_float"/>
		<TextView android:id="@+id/title"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"
		android:paddingLeft="4dp"
		android:layout_marginBottom="-3dp"
		/>
		</LinearLayout>
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		>
		<TextView android:id="@+id/text"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:layout_marginTop="-2dp"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"
		android:paddingLeft="4dp"
		/>
		<android.widget.DateTimeView android:id="@+id/time"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
		android:layout_marginLeft="4dp"
		</LinearLayout>
		<TextView android:id="@+id/info"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_height="match_parent"
		android:singleLine="true"
		android:paddingRight="5dp"
		android:gravity="center_vertical"
		android:paddingLeft="8dp"
		/>
		</LinearLayout>
		</LinearLayout>

core/res/res/layout/status_bar_latest_event_content_large_icon.xml

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		>
		<LinearLayout
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:layout_weight="1"
		android:orientation="vertical"
		android:paddingLeft="16dp"
		>
		<TextView android:id="@+id/title"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"
		android:layout_marginBottom="-3dp"
		/>
		<TextView android:id="@+id/text"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:layout_marginTop="-2dp"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"
		/>
		</LinearLayout>
		<TextView android:id="@+id/info"
		android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:singleLine="true"
		android:gravity="center_vertical"
		android:paddingLeft="4dp"
		android:paddingRight="4dp"
		/>
		<ImageView android:id="@+id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom"
		android:layout_marginBottom="13dip"
		android:scaleType="center"
		/>
		</LinearLayout>

core/res/res/values/styles.xml

+3 −6

Original line number	Diff line number	Diff line
		@@ -217,7 +217,6 @@

		<style name="TextAppearance.StatusBar">
		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		</style>
		<style name="TextAppearance.StatusBar.Ticker">
		</style>
		@@ -226,15 +225,13 @@
		</style>

		<style name="TextAppearance.StatusBar.Icon">
		<item name="android:textStyle">bold</item>
		</style>
		<style name="TextAppearance.StatusBar.EventContent">
		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
		<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
		<item name="android:textColor">#ff999999</item>
		<item name="android:textSize">14sp</item>
		</style>
		<style name="TextAppearance.StatusBar.EventContent.Title">
		<item name="android:textSize">18sp</item>
		<item name="android:textStyle">bold</item>
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		</style>
		<style name="TextAppearance.StatusBar.EventContent.Info">
		<item name="android:textAppearance">?android:attr/textAppearanceLarge</item>

packages/SystemUI/res/drawable-hdpi/status_bar_background.9.png

deleted100644 → 0

−3.16 KiB

Loading image diff...

packages/SystemUI/res/drawable-hdpi/status_bar_close_on.9.png

0 → 100644

+1.23 KiB

Loading image diff...