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	Original line	Diff line number	Diff line
	@@ -222,16 +222,17 @@
	>		>

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

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

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

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

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

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

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

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

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


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

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

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


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

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

	<!-- setLights -->		<!-- setPriority -->
			<LinearLayout
			style="@style/FieldGroup"
			>
			<TextView
			style="@style/FieldTitle"
			android:text="setPriority"
			/>
	<RadioGroup		<RadioGroup
	android:id="@+id/group_lights_blink"		android:id="@+id/group_priority"
	android:layout_width="wrap_content"		style="@style/FieldChoices"
	android:layout_height="wrap_content"		>
	android:orientation="horizontal"		<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		<TextView
	style="@style/FieldTitle"		style="@style/FieldTitle"
	android:text="setLights (blink)"		android:text="setLights (blink)"
	/>		/>
			<RadioGroup
			android:id="@+id/group_lights_blink"
			style="@style/FieldChoices"
			>
	<RadioButton		<RadioButton
	android:id="@+id/lights_off"		android:id="@+id/lights_off"
	style="@style/FieldContents"		style="@style/FieldContents"
	@@ -771,45 +828,49 @@
	android:text="on"		android:text="on"
	/>		/>
	</RadioGroup>		</RadioGroup>
			</LinearLayout>

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

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

tests/StatusBar/res/values/styles.xml

+16 −1

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

	<style name="FieldTitle">		<style name="FieldTitle">
	<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>		<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:layout_height">wrap_content</item>
			<item name="android:gravity">right</item>
			<item name="android:textStyle">bold</item>
	</style>		</style>

	<style name="FieldContents">		<style name="FieldContents">
	@@ -61,5 +63,18 @@
	<item name="android:visibility">gone</item>		<item name="android:visibility">gone</item>
	</style>		</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>		</resources>

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

+73 −12

File changed.

Preview size limit exceeded, changes collapsed.