Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8be08e56 authored by Carmen Jackson's avatar Carmen Jackson
Browse files

Add textview and framelayout inflation cases, refactor.

This change adds a base activity to inflate views, and then adds two
more views to inflate: one with 1000 TextViews and the other with 1000
FrameLayouts in a LinearLayout nested inside a ScrollView.

This change also adds launcher icons for each of the new cases for
ease in testing a launcher-based start.

Bug: 132721345
Test: Verified that the layout segments appear in traces as expected.

Change-Id: Id8c3e867a1ad5df5c3322ce5d69c9b4255042b69
parent a1cae835
Loading
Loading
Loading
Loading
+4 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,9 @@ android_app {
    name: "startop_test_app",
    name: "startop_test_app",
    srcs: [
    srcs: [
        "src/EmptyActivity.java",
        "src/EmptyActivity.java",
        "src/LayoutInflation.java",
        "src/LayoutInflationActivity.java",
        "src/ComplexLayoutInflationActivity.java",
        "src/FrameLayoutInflationActivity.java",
        "src/TextViewInflationActivity.java",
    ],
    ],
}
}
+41 −2
Original line number Original line Diff line number Diff line
@@ -23,7 +23,12 @@
        android:label="@string/app_name"
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true">
        android:supportsRtl="true">
        <activity android:name=".EmptyActivity">

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

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


@@ -31,7 +36,41 @@
            </intent-filter>
            </intent-filter>
        </activity>
        </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>
    </application>


</manifest>
</manifest>
+1 −1
Original line number Original line 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
spent in view inflation to make it easier to focus on the time spent in view
inflation.
inflation.


    adb shell am start -n com.android.startop.test/.LayoutInflation
    adb shell am start -n com.android.startop.test/.ComplexLayoutInflationActivity
+5013 −0

File added.

Preview size limit exceeded, changes collapsed.

+5014 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading