Merge "Add textview and framelayout inflation cases, refactor." am: 1b3687c0e9 (197e6650) · Commits · e / os / android_frameworks_base

startop/apps/test/Android.bp

+4 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,9 @@ android_app {
		name: "startop_test_app",
		srcs: [
		"src/EmptyActivity.java",
		"src/LayoutInflation.java",
		"src/LayoutInflationActivity.java",
		"src/ComplexLayoutInflationActivity.java",
		"src/FrameLayoutInflationActivity.java",
		"src/TextViewInflationActivity.java",
		],
		}

+41 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,12 @@
		android:label="@string/app_name"
		android:roundIcon="@mipmap/ic_launcher_round"
		android:supportsRtl="true">
		<activity android:name=".EmptyActivity">

		<activity
		android:label="Complex Layout Test"
		android:name=".ComplexLayoutInflationActivity"
		android:exported="true" >

		<intent-filter>
		<action android:name="android.intent.action.MAIN" />

		@@ -31,7 +36,41 @@
		</intent-filter>
		</activity>

		<activity android:name=".LayoutInflation" android:exported="true" />
		<activity
		android:label="Empty Activity Layout Test"
		android:name=".EmptyActivity"
		android:exported="true" >

		<intent-filter>
		<action android:name="android.intent.action.MAIN" />

		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		</activity>

		<activity
		android:label="FrameLayout Layout Test"
		android:name=".FrameLayoutInflationActivity"
		android:exported="true" >

		<intent-filter>
		<action android:name="android.intent.action.MAIN" />

		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		</activity>

		<activity
		android:label="TextView Layout Test"
		android:name=".TextViewInflationActivity"
		android:exported="true" >

		<intent-filter>
		<action android:name="android.intent.action.MAIN" />

		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		</activity>
		</application>

		</manifest>

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,4 +23,4 @@ The activity adds an `inflate#activity_main` slice to atrace around the time
		spent in view inflation to make it easier to focus on the time spent in view
		inflation.

		adb shell am start -n com.android.startop.test/.LayoutInflation
		adb shell am start -n com.android.startop.test/.ComplexLayoutInflationActivity

0 → 100644

+5013 −0

File added.

Preview size limit exceeded, changes collapsed.

0 → 100644

+5014 −0

File added.

Preview size limit exceeded, changes collapsed.