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

Commit c288c68f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "System apps must target API 28 or higher" into ub-launcher3-master

parents e0c927a5 ddcecfa6

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<manifest

    xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>

    <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="21"/>

    <!--

    Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.

    Refer comments around specific entries on how to extend individual components.

go/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.launcher3" >



    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>

    <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="21"/>



    <application

        android:backupAgent="com.android.launcher3.LauncherBackupAgent"

tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.launcher3.tests">



    <uses-sdk android:targetSdkVersion="25" android:minSdkVersion="21"

    <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="21"

              tools:overrideLibrary="android.support.test.uiautomator.v18"/>



    <application android:debuggable="true">

tests/dummy_app/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
     to come from a domain that you own or have control over. -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.example.android.aardwolf">

    <uses-sdk android:targetSdkVersion="25" android:minSdkVersion="21"/>

    <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="21"/>

    <application android:label="Aardwolf">

        <activity

            android:name="Activity1"