Merge "Clean up the Builder test." into jb-mr1.1-dev (54525d8e) · Commits · e / os / android_frameworks_base

tests/StatusBar/res/layout/notification_builder_test.xml

+565 −482

Original line number	Diff line number	Diff line
		@@ -222,16 +222,17 @@
		>

		<!-- setWhen -->
		<RadioGroup
		android:id="@+id/group_when"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setWhen"
		/>
		<RadioGroup
		android:id="@+id/group_when"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/when_midnight"
		style="@style/FieldContents"
		@@ -253,18 +254,20 @@
		android:text="tomorrow"
		/>
		</RadioGroup>
		</LinearLayout>

		<!-- icon -->
		<RadioGroup
		android:id="@+id/group_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setSmallIcon"
		/>
		<RadioGroup
		android:id="@+id/group_icon"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/icon_im"
		style="@style/FieldContents"
		@@ -297,18 +300,20 @@
		/>
		<!-- todo setSmallIcon(int icon, int level) -->
		</RadioGroup>
		</LinearLayout>

		<!-- setContentTitle -->
		<RadioGroup
		android:id="@+id/group_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setContentTitle"
		/>
		<RadioGroup
		android:id="@+id/group_title"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/title_short"
		style="@style/FieldContents"
		@@ -334,18 +339,20 @@
		android:tag="This is one heckuva long title for a notification"
		/>
		</RadioGroup>
		</LinearLayout>

		<!-- setContentText -->
		<RadioGroup
		android:id="@+id/group_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setContentText"
		/>
		<RadioGroup
		android:id="@+id/group_text"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/text_none"
		style="@style/FieldContents"
		@@ -383,18 +390,20 @@
		android:tag="sholes final approach\nlanding gear punted to flan\nrunway foam glistens"
		/>
		</RadioGroup>
		</LinearLayout>

		<!-- setContentInfo -->
		<RadioGroup
		android:id="@+id/group_info"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setContentInfo"
		/>
		<RadioGroup
		android:id="@+id/group_info"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/info_none"
		style="@style/FieldContents"
		@@ -414,18 +423,20 @@
		android:tag="this content info is way too long"
		/>
		</RadioGroup>
		</LinearLayout>

		<!-- setNumber -->
		<RadioGroup
		android:id="@+id/group_number"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setNumber"
		/>
		<RadioGroup
		android:id="@+id/group_number"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/number_0"
		style="@style/FieldContents"
		@@ -469,18 +480,20 @@
		android:tag="12345"
		/>
		</RadioGroup>
		</LinearLayout>

		<!-- setContentIntent -->
		<RadioGroup
		android:id="@+id/group_intent"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setContentIntent"
		/>
		<RadioGroup
		android:id="@+id/group_intent"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/intent_none"
		style="@style/FieldContents"
		@@ -492,18 +505,20 @@
		android:text="alert"
		/>
		</RadioGroup>
		</LinearLayout>

		<!-- setDeleteIntent -->
		<RadioGroup
		android:id="@+id/group_delete"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setDeleteIntent"
		/>
		<RadioGroup
		android:id="@+id/group_delete"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/delete_none"
		style="@style/FieldContents"
		@@ -515,14 +530,12 @@
		android:text="alert"
		/>
		</RadioGroup>

		</LinearLayout>

		<!-- setFullScreenIntent -->
		<RadioGroup
		android:id="@+id/group_full_screen"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		style="@style/FieldChoices"
		android:visibility="gone"
		>
		<TextView
		@@ -543,16 +556,17 @@


		<!-- setTicker -->
		<RadioGroup
		android:id="@+id/group_ticker"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setTicker"
		/>
		<RadioGroup
		android:id="@+id/group_ticker"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/ticker_none"
		style="@style/FieldContents"
		@@ -589,19 +603,20 @@
		android:text="custom view"
		/>
		</RadioGroup>

		</LinearLayout>

		<!-- setLargeIcon -->
		<RadioGroup
		android:id="@+id/group_large_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setLargeIcon"
		/>
		<RadioGroup
		android:id="@+id/group_large_icon"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/large_icon_none"
		style="@style/FieldContents"
		@@ -623,14 +638,12 @@
		android:text="small"
		/>
		</RadioGroup>

		</LinearLayout>

		<!-- setSound -->
		<RadioGroup
		android:id="@+id/group_sound"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		style="@style/FieldChoices"
		android:visibility="gone"
		>
		<TextView
		@@ -646,55 +659,57 @@


		<!-- setVibrate -->
		<RadioGroup
		android:id="@+id/group_vibrate"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setVibrate"
		/>
		<RadioGroup
		android:id="@+id/group_vibrate"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/vibrate_none"
		style="@style/FieldContents"
		android:text="none"
		/>
		<RadioButton
		android:id="@+id/vibrate_short"
		android:id="@+id/vibrate_zero"
		style="@style/FieldContents"
		android:text="short"
		android:text="0"
		/>
		<RadioButton
		android:id="@+id/vibrate_medium"
		android:id="@+id/vibrate_short"
		style="@style/FieldContents"
		android:text="long"
		android:text="100"
		/>
		<RadioButton
		android:id="@+id/vibrate_long"
		style="@style/FieldContents"
		android:text="long"
		android:text="1000"
		/>
		<RadioButton
		android:id="@+id/vibrate_pattern"
		style="@style/FieldContents"
		android:text="longer"
		android:text="...---..."
		/>
		</RadioGroup>

		</LinearLayout>

		<!-- setLights -->
		<RadioGroup
		android:id="@+id/group_lights_color"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setLights (color)"
		/>
		<RadioGroup
		android:id="@+id/group_lights_color"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/lights_red"
		style="@style/FieldContents"
		@@ -738,18 +753,60 @@
		android:tag="0xffffff"
		/>
		</RadioGroup>
		</LinearLayout>

		<!-- setLights -->
		<!-- setPriority -->
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setPriority"
		/>
		<RadioGroup
		android:id="@+id/group_lights_blink"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:id="@+id/group_priority"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/pri_max"
		style="@style/FieldContents"
		android:text="MAX"
		/>
		<RadioButton
		android:id="@+id/pri_high"
		style="@style/FieldContents"
		android:text="HIGH"
		/>
		<RadioButton
		android:id="@+id/pri_default"
		style="@style/FieldContents"
		android:text="DEFAULT"
		/>
		<RadioButton
		android:id="@+id/pri_low"
		style="@style/FieldContents"
		android:text="LOW"
		/>
		<RadioButton
		android:id="@+id/pri_min"
		style="@style/FieldContents"
		android:text="MIN"
		/>
		</RadioGroup>
		</LinearLayout>

		<!-- setLights -->
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="setLights (blink)"
		/>
		<RadioGroup
		android:id="@+id/group_lights_blink"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/lights_off"
		style="@style/FieldContents"
		@@ -771,45 +828,49 @@
		android:text="on"
		/>
		</RadioGroup>
		</LinearLayout>

		<!-- flags -->
		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_marginTop="12dp"
		style="@style/FieldGroup"
		android:layout_marginTop="30dp"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="flags"
		/>
		<LinearLayout
		style="@style/FieldChoices"
		>
		<CheckBox
		android:id="@+id/flag_ongoing"
		style="@style/FieldContents"
		android:text="setOngoing"
		android:text="ongoing"
		/>
		<CheckBox
		android:id="@+id/flag_once"
		style="@style/FieldContents"
		android:text="setOnlyAlertOnce"
		android:text="onlyAlertOnce"
		/>
		<CheckBox
		android:id="@+id/flag_auto_cancel"
		style="@style/FieldContents"
		android:text="setAutoCancel"
		android:text="autoCancel"
		/>
		</LinearLayout>
		</LinearLayout>

		<!-- defaults -->
		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="defaults"
		/>
		<LinearLayout
		style="@style/FieldChoices"
		>
		<CheckBox
		android:id="@+id/default_sound"
		style="@style/FieldContents"
		@@ -826,10 +887,32 @@
		android:text="lights"
		/>
		</LinearLayout>
		</LinearLayout>




		<!-- delay -->
		<LinearLayout
		style="@style/FieldGroup"
		>
		<TextView
		style="@style/FieldTitle"
		android:text="notify"
		/>
		<RadioGroup
		android:id="@+id/group_delay"
		style="@style/FieldChoices"
		>
		<RadioButton
		android:id="@+id/delay_none"
		style="@style/FieldContents"
		android:text="immediately"
		/>
		<RadioButton
		android:id="@+id/delay_5"
		style="@style/FieldContents"
		android:text="in 5 sec"
		/>
		</RadioGroup>
		</LinearLayout>
		</LinearLayout>
		</LinearLayout>

tests/StatusBar/res/values/styles.xml

+16 −1

Original line number	Diff line number	Diff line
		@@ -45,8 +45,10 @@

		<style name="FieldTitle">
		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
		<item name="android:layout_width">wrap_content</item>
		<item name="android:layout_width">120dp</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:gravity">right</item>
		<item name="android:textStyle">bold</item>
		</style>

		<style name="FieldContents">
		@@ -61,5 +63,18 @@
		<item name="android:visibility">gone</item>
		</style>

		<style name="FieldGroup">
		<item name="android:layout_width">wrap_content</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:orientation">horizontal</item>
		<item name="android:layout_marginTop">18dp</item>
		</style>

		<style name="FieldChoices">
		<item name="android:layout_width">wrap_content</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:orientation">vertical</item>
		<item name="android:baselineAlignedChildIndex">0</item>
		</style>
		</resources>

tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java

+73 −12

File changed.

Preview size limit exceeded, changes collapsed.