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

Commit 197e6650 authored by Carmen Jackson's avatar Carmen Jackson Committed by android-build-merger
Browse files

Merge "Add textview and framelayout inflation cases, refactor." am: 1b3687c0 

am: e11cfda3

Change-Id: Iad4539ec0eae2fb1e64fe9f733791251ea974a93
parents 01ffb2b2 e11cfda3

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",

    ],

}

startop/apps/test/AndroidManifest.xml

+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>

startop/apps/test/README.md

+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