Remove targetSdkVersion workaround for library tests
Turns out that manifest merger picks the lowest target sdk version,
so it is fine to set the targetSdkVersion directly on our libraries.
https://developer.android.com/studio/build/manifest-merge
Also turns out lint was not running all the rules when we were not
setting targetSdkVersion, so fix up all the existing uses except for 2
that have followup bugs.
Bug: 132905855,132906560
Test: ./gradlew createArchive -> now our aar AndroidManifest.xml has
targetSdkVersion, but that's ok as manifest merger handles this
correctly.
Change-Id: I25c3a30c282888659e9b3177f1f9a0014c6a9a56
diff --git a/activity/integration-tests/testapp/src/androidTest/AndroidManifest.xml b/activity/integration-tests/testapp/src/androidTest/AndroidManifest.xml
index 4456d0d..f78551a 100644
--- a/activity/integration-tests/testapp/src/androidTest/AndroidManifest.xml
+++ b/activity/integration-tests/testapp/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.activity.integration.testapp.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:name="androidx.activity.integration.testapp.LeakCanaryApp">
<activity android:name="androidx.activity.integration.testapp.LeakingActivity"
android:windowSoftInputMode="stateVisible"/>
diff --git a/activity/ktx/src/androidTest/AndroidManifest.xml b/activity/ktx/src/androidTest/AndroidManifest.xml
index bc3224d..fb50b6c 100644
--- a/activity/ktx/src/androidTest/AndroidManifest.xml
+++ b/activity/ktx/src/androidTest/AndroidManifest.xml
@@ -15,7 +15,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.activity.ktx">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.activity.ActivityViewModelLazyTest$TestActivity"/>
</application>
diff --git a/activity/src/androidTest/AndroidManifest.xml b/activity/src/androidTest/AndroidManifest.xml
index 4d2f379..993f729 100644
--- a/activity/src/androidTest/AndroidManifest.xml
+++ b/activity/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.activity.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.activity.LifecycleComponentActivity"/>
diff --git a/appcompat/res/layout/abc_alert_dialog_title_material.xml b/appcompat/res/layout/abc_alert_dialog_title_material.xml
index cb19212..75c6755 100644
--- a/appcompat/res/layout/abc_alert_dialog_title_material.xml
+++ b/appcompat/res/layout/abc_alert_dialog_title_material.xml
@@ -47,6 +47,7 @@
style="?android:attr/windowTitleStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
android:ellipsize="end"
android:singleLine="true"
android:textAlignment="viewStart"/>
diff --git a/appcompat/res/layout/abc_dialog_title_material.xml b/appcompat/res/layout/abc_dialog_title_material.xml
index 3ee587b..2cd3850 100644
--- a/appcompat/res/layout/abc_dialog_title_material.xml
+++ b/appcompat/res/layout/abc_dialog_title_material.xml
@@ -33,6 +33,7 @@
android:ellipsize="end"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
android:textAlignment="viewStart"
android:paddingLeft="?attr/dialogPreferredPadding"
android:paddingRight="?attr/dialogPreferredPadding"
diff --git a/appcompat/res/layout/abc_popup_menu_header_item_layout.xml b/appcompat/res/layout/abc_popup_menu_header_item_layout.xml
index a40b6dd..9545b11 100644
--- a/appcompat/res/layout/abc_popup_menu_header_item_layout.xml
+++ b/appcompat/res/layout/abc_popup_menu_header_item_layout.xml
@@ -22,6 +22,8 @@
android:paddingRight="16dip">
<TextView
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:ignore="RtlCompat"
android:id="@android:id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/appcompat/res/layout/abc_select_dialog_material.xml b/appcompat/res/layout/abc_select_dialog_material.xml
index d4f3008..5891c81 100644
--- a/appcompat/res/layout/abc_select_dialog_material.xml
+++ b/appcompat/res/layout/abc_select_dialog_material.xml
@@ -27,6 +27,7 @@
class="androidx.appcompat.app.AlertController$RecycleListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_gravity="start"
android:cacheColorHint="@null"
android:clipToPadding="false"
android:divider="?attr/listDividerAlertDialog"
diff --git a/appcompat/resources/src/androidTest/AndroidManifest.xml b/appcompat/resources/src/androidTest/AndroidManifest.xml
index 763b200..d165e3b 100644
--- a/appcompat/resources/src/androidTest/AndroidManifest.xml
+++ b/appcompat/resources/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.appcompat.resources.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application
android:theme="@android:style/Theme">
diff --git a/appcompat/src/androidTest/AndroidManifest.xml b/appcompat/src/androidTest/AndroidManifest.xml
index b0c960e..104ebdf 100644
--- a/appcompat/src/androidTest/AndroidManifest.xml
+++ b/appcompat/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.v7.appcompat.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application
android:supportsRtl="true"
diff --git a/autofill/src/androidTest/AndroidManifest.xml b/autofill/src/androidTest/AndroidManifest.xml
index 90f93ad..1e87433 100644
--- a/autofill/src/androidTest/AndroidManifest.xml
+++ b/autofill/src/androidTest/AndroidManifest.xml
@@ -16,5 +16,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.autofill.tests">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
\ No newline at end of file
diff --git a/benchmark/src/androidTest/AndroidManifest.xml b/benchmark/src/androidTest/AndroidManifest.xml
index d3e8cf0..a64019e 100644
--- a/benchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/src/androidTest/AndroidManifest.xml
@@ -19,7 +19,6 @@
xmlns:tools="http://schemas.android.com/tools"
package="androidx.benchmark.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}" />
<!-- Important: disable debuggable for accurate performance results -->
<application
diff --git a/browser/src/androidTest/AndroidManifest.xml b/browser/src/androidTest/AndroidManifest.xml
index 646decd..ac494e9 100644
--- a/browser/src/androidTest/AndroidManifest.xml
+++ b/browser/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.customtabs.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.browser.customtabs.TestActivity"/>
diff --git a/browser/src/main/res/layout/browser_actions_context_menu_row.xml b/browser/src/main/res/layout/browser_actions_context_menu_row.xml
index 91ccd11..b08d8a8 100644
--- a/browser/src/main/res/layout/browser_actions_context_menu_row.xml
+++ b/browser/src/main/res/layout/browser_actions_context_menu_row.xml
@@ -28,6 +28,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
+ android:layout_marginLeft="10dp"
android:layout_weight="1"
android:textSize="15sp"
android:textColor="@color/browser_actions_text_color" />
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
index 99291b2..d50f813 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
@@ -345,10 +345,7 @@
jacoco.version = Jacoco.VERSION
compileSdkVersion(COMPILE_SDK_VERSION)
buildToolsVersion = BUILD_TOOLS_VERSION
- // Expose the compilation SDK for use as the target SDK in test manifests.
- defaultConfig.addManifestPlaceholders(
- mapOf("target-sdk-version" to TARGET_SDK_VERSION))
-
+ defaultConfig.targetSdkVersion(TARGET_SDK_VERSION)
defaultConfig.testInstrumentationRunner = INSTRUMENTATION_RUNNER
testOptions.unitTests.isReturnDefaultValues = true
@@ -523,7 +520,6 @@
private fun AppExtension.configureAndroidApplicationOptions(project: Project) {
defaultConfig.apply {
- targetSdkVersion(TARGET_SDK_VERSION)
versionCode = 1
versionName = "1.0"
}
diff --git a/camera/camera2/src/androidTest/AndroidManifest.xml b/camera/camera2/src/androidTest/AndroidManifest.xml
index 47dd518..527f391 100644
--- a/camera/camera2/src/androidTest/AndroidManifest.xml
+++ b/camera/camera2/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.camera.camera2.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
diff --git a/camera/core/src/androidTest/AndroidManifest.xml b/camera/core/src/androidTest/AndroidManifest.xml
index 73cd4f6..115067f 100644
--- a/camera/core/src/androidTest/AndroidManifest.xml
+++ b/camera/core/src/androidTest/AndroidManifest.xml
@@ -16,6 +16,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.camera.core.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/car/core/src/androidTest/AndroidManifest.xml b/car/core/src/androidTest/AndroidManifest.xml
index 91a2340..5b1a926f 100644
--- a/car/core/src/androidTest/AndroidManifest.xml
+++ b/car/core/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.car.widget.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:supportsRtl="true">
<activity android:name="androidx.car.drawer.CarDrawerTestActivity"
diff --git a/car/moderator/src/androidTest/AndroidManifest.xml b/car/moderator/src/androidTest/AndroidManifest.xml
index 4ab38de..484787e 100644
--- a/car/moderator/src/androidTest/AndroidManifest.xml
+++ b/car/moderator/src/androidTest/AndroidManifest.xml
@@ -16,6 +16,5 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.car.moderator.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application />
</manifest>
diff --git a/compose/plugins/cli-tests/src/main/AndroidManifest.xml b/compose/plugins/cli-tests/src/main/AndroidManifest.xml
index a8d77f4..e951ca7 100644
--- a/compose/plugins/cli-tests/src/main/AndroidManifest.xml
+++ b/compose/plugins/cli-tests/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
limitations under the License.
-->
<manifest package="androidx.compose.runtime" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
diff --git a/compose/runtime/src/main/AndroidManifest.xml b/compose/runtime/src/main/AndroidManifest.xml
index 8e5160e..cd9867b 100644
--- a/compose/runtime/src/main/AndroidManifest.xml
+++ b/compose/runtime/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.compose.runtime" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
diff --git a/content/src/androidTest/AndroidManifest.xml b/content/src/androidTest/AndroidManifest.xml
index 2dc85ab..7f7ff2e 100644
--- a/content/src/androidTest/AndroidManifest.xml
+++ b/content/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.contentpager.content.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:supportsRtl="true">
<activity android:name="androidx.contentpager.content.TestActivity" />
diff --git a/coordinatorlayout/src/androidTest/AndroidManifest.xml b/coordinatorlayout/src/androidTest/AndroidManifest.xml
index ed1e168..efaadb7 100644
--- a/coordinatorlayout/src/androidTest/AndroidManifest.xml
+++ b/coordinatorlayout/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.coordinatorlayout.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application
android:supportsRtl="true"
diff --git a/core/ktx/src/androidTest/AndroidManifest.xml b/core/ktx/src/androidTest/AndroidManifest.xml
index df6c488..7c5e9a4 100644
--- a/core/ktx/src/androidTest/AndroidManifest.xml
+++ b/core/ktx/src/androidTest/AndroidManifest.xml
@@ -1,6 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.core.ktx.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.core.TestActivity"/>
</application>
diff --git a/core/src/androidTest/AndroidManifest.xml b/core/src/androidTest/AndroidManifest.xml
index 073ff1d..b71482b 100644
--- a/core/src/androidTest/AndroidManifest.xml
+++ b/core/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.compat.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
diff --git a/customview/src/androidTest/AndroidManifest.xml b/customview/src/androidTest/AndroidManifest.xml
index e59cb3c..97b7919 100644
--- a/customview/src/androidTest/AndroidManifest.xml
+++ b/customview/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.customview.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:supportsRtl="true">
<activity android:name="androidx.customview.widget.ExploreByTouchHelperTestActivity"/>
diff --git a/dynamic-animation/ktx/src/androidTest/AndroidManifest.xml b/dynamic-animation/ktx/src/androidTest/AndroidManifest.xml
index 8cc5dd5..62f7402 100755
--- a/dynamic-animation/ktx/src/androidTest/AndroidManifest.xml
+++ b/dynamic-animation/ktx/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.dynamicanimation.ktx.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:supportsRtl="true">
<activity android:name="androidx.dynamicanimation.tests.AnimationActivity"/>
diff --git a/dynamic-animation/src/androidTest/AndroidManifest.xml b/dynamic-animation/src/androidTest/AndroidManifest.xml
index a7d8f2b..af02a67 100755
--- a/dynamic-animation/src/androidTest/AndroidManifest.xml
+++ b/dynamic-animation/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.dynamicanimation.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:supportsRtl="true">
<activity android:name="androidx.dynamicanimation.tests.AnimationActivity"/>
diff --git a/emoji/core/src/androidTest/AndroidManifest.xml b/emoji/core/src/androidTest/AndroidManifest.xml
index 12c87bd..beba93e 100644
--- a/emoji/core/src/androidTest/AndroidManifest.xml
+++ b/emoji/core/src/androidTest/AndroidManifest.xml
@@ -15,7 +15,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.emoji.text">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name=".TestActivity"/>
diff --git a/exifinterface/src/androidTest/AndroidManifest.xml b/exifinterface/src/androidTest/AndroidManifest.xml
index 0de91c6..aae9108 100644
--- a/exifinterface/src/androidTest/AndroidManifest.xml
+++ b/exifinterface/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.exifinterface.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/fragment/ktx/src/androidTest/AndroidManifest.xml b/fragment/ktx/src/androidTest/AndroidManifest.xml
index 9cbc88f..2c7f4f7 100644
--- a/fragment/ktx/src/androidTest/AndroidManifest.xml
+++ b/fragment/ktx/src/androidTest/AndroidManifest.xml
@@ -15,7 +15,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.fragment.ktx">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.fragment.app.TestActivity"/>
<activity android:name="androidx.fragment.app.FragmentViewModelLazyTest$TestActivity"/>
diff --git a/fragment/src/androidTest/AndroidManifest.xml b/fragment/src/androidTest/AndroidManifest.xml
index 41057fd..a0dc761 100644
--- a/fragment/src/androidTest/AndroidManifest.xml
+++ b/fragment/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.fragment.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
diff --git a/fragment/testing/src/androidTest/AndroidManifest.xml b/fragment/testing/src/androidTest/AndroidManifest.xml
index 215f70b..4d3baca 100644
--- a/fragment/testing/src/androidTest/AndroidManifest.xml
+++ b/fragment/testing/src/androidTest/AndroidManifest.xml
@@ -16,5 +16,4 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.fragment.testing.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/graphics/drawable/animated/src/androidTest/AndroidManifest.xml b/graphics/drawable/animated/src/androidTest/AndroidManifest.xml
index cfca36f..4104e141 100644
--- a/graphics/drawable/animated/src/androidTest/AndroidManifest.xml
+++ b/graphics/drawable/animated/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.vectordrawable.animated.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<application>
diff --git a/graphics/drawable/static/src/androidTest/AndroidManifest.xml b/graphics/drawable/static/src/androidTest/AndroidManifest.xml
index bfd46c7..7f2b137 100644
--- a/graphics/drawable/static/src/androidTest/AndroidManifest.xml
+++ b/graphics/drawable/static/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.vectordrawable.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
</manifest>
diff --git a/gridlayout/src/androidTest/AndroidManifest.xml b/gridlayout/src/androidTest/AndroidManifest.xml
index 7e6c2b5..b12b9b2 100644
--- a/gridlayout/src/androidTest/AndroidManifest.xml
+++ b/gridlayout/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.gridlayout.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.gridlayout.widget.GridLayoutTestActivity"/>
diff --git a/heifwriter/src/androidTest/AndroidManifest.xml b/heifwriter/src/androidTest/AndroidManifest.xml
index 385a884..94c8108 100644
--- a/heifwriter/src/androidTest/AndroidManifest.xml
+++ b/heifwriter/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.heifwriter.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
</manifest>
diff --git a/leanback/src/androidTest/AndroidManifest.xml b/leanback/src/androidTest/AndroidManifest.xml
index e0bd52cb..2534e63 100644
--- a/leanback/src/androidTest/AndroidManifest.xml
+++ b/leanback/src/androidTest/AndroidManifest.xml
@@ -15,7 +15,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.leanback.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application
android:supportsRtl="true">
diff --git a/lifecycle/extensions/src/androidTest/AndroidManifest.xml b/lifecycle/extensions/src/androidTest/AndroidManifest.xml
index f826d4fc7..c66c06e 100644
--- a/lifecycle/extensions/src/androidTest/AndroidManifest.xml
+++ b/lifecycle/extensions/src/androidTest/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.lifecycle.extensions.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.lifecycle.viewmodeltest.ViewModelActivity"
diff --git a/lifecycle/service/src/androidTest/AndroidManifest.xml b/lifecycle/service/src/androidTest/AndroidManifest.xml
index f34039e..513f79b 100644
--- a/lifecycle/service/src/androidTest/AndroidManifest.xml
+++ b/lifecycle/service/src/androidTest/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.lifecycle.service.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<service android:name="androidx.lifecycle.service.TestService"/>
diff --git a/lifecycle/viewmodel-savedstate/src/androidTest/AndroidManifest.xml b/lifecycle/viewmodel-savedstate/src/androidTest/AndroidManifest.xml
index 70a77ca..9ecfe5e 100644
--- a/lifecycle/viewmodel-savedstate/src/androidTest/AndroidManifest.xml
+++ b/lifecycle/viewmodel-savedstate/src/androidTest/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.lifecycle.viewmodel.savedstate.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity
diff --git a/loader/src/androidTest/AndroidManifest.xml b/loader/src/androidTest/AndroidManifest.xml
index 5115c157..2217d0e 100644
--- a/loader/src/androidTest/AndroidManifest.xml
+++ b/loader/src/androidTest/AndroidManifest.xml
@@ -16,6 +16,5 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.loader.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/media2/common/src/androidTest/AndroidManifest.xml b/media2/common/src/androidTest/AndroidManifest.xml
index 86d2b82..dd43e3e 100644
--- a/media2/common/src/androidTest/AndroidManifest.xml
+++ b/media2/common/src/androidTest/AndroidManifest.xml
@@ -16,5 +16,4 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.media2.common.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/media2/player/src/androidTest/AndroidManifest.xml b/media2/player/src/androidTest/AndroidManifest.xml
index 8afbe65..ef22b94 100644
--- a/media2/player/src/androidTest/AndroidManifest.xml
+++ b/media2/player/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.media2.player.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/media2/session/src/androidTest/AndroidManifest.xml b/media2/session/src/androidTest/AndroidManifest.xml
index 3d49478..44409fb 100644
--- a/media2/session/src/androidTest/AndroidManifest.xml
+++ b/media2/session/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.media2.session.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/media2/widget/src/androidTest/AndroidManifest.xml b/media2/widget/src/androidTest/AndroidManifest.xml
index a0a0914..eb21498 100644
--- a/media2/widget/src/androidTest/AndroidManifest.xml
+++ b/media2/widget/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.media2.widget.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.media2.widget.VideoViewTestActivity"
diff --git a/mediarouter/src/androidTest/AndroidManifest.xml b/mediarouter/src/androidTest/AndroidManifest.xml
index 79f0f69..2fba332 100644
--- a/mediarouter/src/androidTest/AndroidManifest.xml
+++ b/mediarouter/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.v7.mediarouter.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:supportsRtl="true">
<activity
diff --git a/mediarouter/src/main/res/layout/mr_cast_group_item.xml b/mediarouter/src/main/res/layout/mr_cast_group_item.xml
index f29dba4..b20bf26 100644
--- a/mediarouter/src/main/res/layout/mr_cast_group_item.xml
+++ b/mediarouter/src/main/res/layout/mr_cast_group_item.xml
@@ -42,6 +42,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:layout_gravity="start"
android:textAlignment="viewStart"
android:textAppearance="?attr/mediaRouteBodyTextAppearance" />
</LinearLayout>
\ No newline at end of file
diff --git a/mediarouter/src/main/res/layout/mr_cast_group_volume_item.xml b/mediarouter/src/main/res/layout/mr_cast_group_volume_item.xml
index 78f8de0..2f2cb10 100644
--- a/mediarouter/src/main/res/layout/mr_cast_group_volume_item.xml
+++ b/mediarouter/src/main/res/layout/mr_cast_group_volume_item.xml
@@ -23,6 +23,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
+ android:layout_gravity="start"
android:paddingTop="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
diff --git a/mediarouter/src/main/res/layout/mr_cast_header_item.xml b/mediarouter/src/main/res/layout/mr_cast_header_item.xml
index 14a6779..f5345db 100644
--- a/mediarouter/src/main/res/layout/mr_cast_header_item.xml
+++ b/mediarouter/src/main/res/layout/mr_cast_header_item.xml
@@ -19,6 +19,7 @@
android:id="@+id/mr_cast_header_name"
android:layout_width="match_parent"
android:layout_height="@dimen/mr_dynamic_dialog_row_height"
+ android:layout_gravity="start"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="24dp"
diff --git a/mediarouter/src/main/res/layout/mr_cast_media_metadata.xml b/mediarouter/src/main/res/layout/mr_cast_media_metadata.xml
index 93165e1..147f43a 100644
--- a/mediarouter/src/main/res/layout/mr_cast_media_metadata.xml
+++ b/mediarouter/src/main/res/layout/mr_cast_media_metadata.xml
@@ -60,6 +60,7 @@
<TextView android:id="@+id/mr_cast_meta_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
android:maxLines="1"
android:ellipsize="end"
android:textAlignment="viewStart"
@@ -67,6 +68,7 @@
<TextView android:id="@+id/mr_cast_meta_subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
android:maxLines="1"
android:ellipsize="end"
android:textAlignment="viewStart"
diff --git a/mediarouter/src/main/res/layout/mr_cast_route_item.xml b/mediarouter/src/main/res/layout/mr_cast_route_item.xml
index a2a1443..f4568ec 100644
--- a/mediarouter/src/main/res/layout/mr_cast_route_item.xml
+++ b/mediarouter/src/main/res/layout/mr_cast_route_item.xml
@@ -45,6 +45,7 @@
android:layout_weight="1"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
+ android:layout_gravity="start"
android:textAlignment="viewStart"
android:textAppearance="?attr/mediaRouteBodyTextAppearance" />
<CheckBox android:id="@+id/mr_cast_checkbox"
diff --git a/mediarouter/src/main/res/layout/mr_chooser_list_item.xml b/mediarouter/src/main/res/layout/mr_chooser_list_item.xml
index 3156606..f668291 100644
--- a/mediarouter/src/main/res/layout/mr_chooser_list_item.xml
+++ b/mediarouter/src/main/res/layout/mr_chooser_list_item.xml
@@ -37,6 +37,7 @@
<TextView android:id="@+id/mr_chooser_route_name"
android:layout_width="fill_parent"
android:layout_height="32dp"
+ android:layout_gravity="start"
android:singleLine="true"
android:ellipsize="marquee"
android:textAlignment="viewStart"
@@ -45,6 +46,7 @@
<TextView android:id="@+id/mr_chooser_route_desc"
android:layout_width="fill_parent"
android:layout_height="24dp"
+ android:layout_gravity="start"
android:singleLine="true"
android:ellipsize="marquee"
android:textAlignment="viewStart"
diff --git a/mediarouter/src/main/res/layout/mr_controller_material_dialog_b.xml b/mediarouter/src/main/res/layout/mr_controller_material_dialog_b.xml
index b7f1cfc..5a6d622 100644
--- a/mediarouter/src/main/res/layout/mr_controller_material_dialog_b.xml
+++ b/mediarouter/src/main/res/layout/mr_controller_material_dialog_b.xml
@@ -32,7 +32,9 @@
android:paddingRight="12dp"
android:paddingEnd="12dp"
android:orientation="horizontal" >
- <TextView android:id="@+id/mr_name"
+ <TextView xmlns:tools="http://schemas.android.com/tools"
+ tools:ignore="RtlCompat"
+ android:id="@+id/mr_name"
android:layout_width="0dp"
android:layout_height="72dp"
android:layout_weight="1"
diff --git a/mediarouter/src/main/res/layout/mr_controller_volume_item.xml b/mediarouter/src/main/res/layout/mr_controller_volume_item.xml
index 6252f52..674d9e6 100644
--- a/mediarouter/src/main/res/layout/mr_controller_volume_item.xml
+++ b/mediarouter/src/main/res/layout/mr_controller_volume_item.xml
@@ -29,6 +29,7 @@
<TextView android:id="@+id/mr_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
android:textAlignment="viewStart"
android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText"
android:singleLine="true" />
diff --git a/mediarouter/src/main/res/layout/mr_picker_header_item.xml b/mediarouter/src/main/res/layout/mr_picker_header_item.xml
index 502982b..6f66c7d 100644
--- a/mediarouter/src/main/res/layout/mr_picker_header_item.xml
+++ b/mediarouter/src/main/res/layout/mr_picker_header_item.xml
@@ -19,6 +19,7 @@
android:id="@+id/mr_picker_header_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="8dp"
diff --git a/mediarouter/src/main/res/layout/mr_picker_route_item.xml b/mediarouter/src/main/res/layout/mr_picker_route_item.xml
index a6aed0e..ebadfa0 100644
--- a/mediarouter/src/main/res/layout/mr_picker_route_item.xml
+++ b/mediarouter/src/main/res/layout/mr_picker_route_item.xml
@@ -42,6 +42,7 @@
android:layout_weight="1"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
+ android:layout_gravity="start"
android:textAlignment="viewStart"
android:textAppearance="?attr/mediaRouteBodyTextAppearance" />
</LinearLayout>
\ No newline at end of file
diff --git a/navigation/benchmark/src/androidTest/AndroidManifest.xml b/navigation/benchmark/src/androidTest/AndroidManifest.xml
index 4c64885..03cb61f 100644
--- a/navigation/benchmark/src/androidTest/AndroidManifest.xml
+++ b/navigation/benchmark/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="androidx.navigation.benchmark.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<!-- Important: disable debuggable for accurate performance results -->
<application
diff --git a/navigation/common/ktx/src/androidTest/AndroidManifest.xml b/navigation/common/ktx/src/androidTest/AndroidManifest.xml
index 619f72d..0cd8daf 100644
--- a/navigation/common/ktx/src/androidTest/AndroidManifest.xml
+++ b/navigation/common/ktx/src/androidTest/AndroidManifest.xml
@@ -17,5 +17,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.navigation.ktx">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/navigation/common/src/androidTest/AndroidManifest.xml b/navigation/common/src/androidTest/AndroidManifest.xml
index 021bec93..cfe36b8 100644
--- a/navigation/common/src/androidTest/AndroidManifest.xml
+++ b/navigation/common/src/androidTest/AndroidManifest.xml
@@ -17,5 +17,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.navigation.common">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/navigation/fragment/ktx/src/androidTest/AndroidManifest.xml b/navigation/fragment/ktx/src/androidTest/AndroidManifest.xml
index 04a996d..70a80b1 100644
--- a/navigation/fragment/ktx/src/androidTest/AndroidManifest.xml
+++ b/navigation/fragment/ktx/src/androidTest/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.navigation.fragment.ktx">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.navigation.fragment.TestActivity" />
</application>
diff --git a/navigation/fragment/src/androidTest/AndroidManifest.xml b/navigation/fragment/src/androidTest/AndroidManifest.xml
index 03b4dc3..79a2950 100644
--- a/navigation/fragment/src/androidTest/AndroidManifest.xml
+++ b/navigation/fragment/src/androidTest/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.navigation.fragment">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.navigation.fragment.test.NavigationActivity"/>
<activity android:name="androidx.navigation.fragment.XmlNavigationActivity" />
diff --git a/navigation/runtime/ktx/src/androidTest/AndroidManifest.xml b/navigation/runtime/ktx/src/androidTest/AndroidManifest.xml
index dff6919..7d9d7ba 100644
--- a/navigation/runtime/ktx/src/androidTest/AndroidManifest.xml
+++ b/navigation/runtime/ktx/src/androidTest/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.navigation.ktx">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.navigation.TestActivity"/>
</application>
diff --git a/navigation/runtime/src/androidTest/AndroidManifest.xml b/navigation/runtime/src/androidTest/AndroidManifest.xml
index 04affeb..b243562 100644
--- a/navigation/runtime/src/androidTest/AndroidManifest.xml
+++ b/navigation/runtime/src/androidTest/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.navigation">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.navigation.ActivityNavigatorActivity"/>
diff --git a/navigation/testing/src/androidTest/AndroidManifest.xml b/navigation/testing/src/androidTest/AndroidManifest.xml
index b4f223d..1d483b4 100644
--- a/navigation/testing/src/androidTest/AndroidManifest.xml
+++ b/navigation/testing/src/androidTest/AndroidManifest.xml
@@ -16,5 +16,4 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.navigation.testing">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/navigation/ui/src/androidTest/AndroidManifest.xml b/navigation/ui/src/androidTest/AndroidManifest.xml
index 39e0278..40d9eb7 100644
--- a/navigation/ui/src/androidTest/AndroidManifest.xml
+++ b/navigation/ui/src/androidTest/AndroidManifest.xml
@@ -16,6 +16,5 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.navigation.ui">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/palette/src/androidTest/AndroidManifest.xml b/palette/src/androidTest/AndroidManifest.xml
index 47202c3..03db0ba 100644
--- a/palette/src/androidTest/AndroidManifest.xml
+++ b/palette/src/androidTest/AndroidManifest.xml
@@ -16,5 +16,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.palette.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/percent/src/androidTest/AndroidManifest.xml b/percent/src/androidTest/AndroidManifest.xml
index 88caec8..cf274a1 100644
--- a/percent/src/androidTest/AndroidManifest.xml
+++ b/percent/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.percentlayout.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:supportsRtl="true">
<activity android:name="androidx.percentlayout.widget.TestFrameActivity"/>
diff --git a/preference/ktx/src/androidTest/AndroidManifest.xml b/preference/ktx/src/androidTest/AndroidManifest.xml
index 8cbbccf9..9779600 100644
--- a/preference/ktx/src/androidTest/AndroidManifest.xml
+++ b/preference/ktx/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.preference.ktx.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity
android:name="androidx.preference.PreferenceTestHelperActivity"
diff --git a/preference/res/layout/preference.xml b/preference/res/layout/preference.xml
index 56acf6d..d15cf93 100644
--- a/preference/res/layout/preference.xml
+++ b/preference/res/layout/preference.xml
@@ -22,6 +22,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:paddingEnd="?android:attr/scrollbarSize"
+ android:paddingRight="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground">
<FrameLayout
@@ -40,7 +41,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dip"
+ android:layout_marginLeft="15dip"
android:layout_marginEnd="6dip"
+ android:layout_marginRight="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -59,6 +62,7 @@
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
+ android:layout_alignLeft="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4" />
diff --git a/preference/res/layout/preference_category_material.xml b/preference/res/layout/preference_category_material.xml
index 8611e1e..30ddd59 100644
--- a/preference/res/layout/preference_category_material.xml
+++ b/preference/res/layout/preference_category_material.xml
@@ -41,6 +41,7 @@
android:id="@android:id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
android:textAlignment="viewStart"
style="@style/PreferenceCategoryTitleTextStyle"/>
@@ -53,6 +54,7 @@
android:layout_below="@android:id/title"
android:layout_alignLeft="@android:id/title"
android:layout_alignStart="@android:id/title"
+ android:layout_gravity="start"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="10"
diff --git a/preference/res/layout/preference_dropdown.xml b/preference/res/layout/preference_dropdown.xml
index 2287818..b53362b 100644
--- a/preference/res/layout/preference_dropdown.xml
+++ b/preference/res/layout/preference_dropdown.xml
@@ -22,6 +22,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:paddingEnd="?android:attr/scrollbarSize"
+ android:paddingRight="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground">
<Spinner
@@ -47,7 +48,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dip"
+ android:layout_marginLeft="15dip"
android:layout_marginEnd="6dip"
+ android:layout_marginRight="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -66,6 +69,7 @@
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
+ android:layout_alignLeft="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4" />
diff --git a/preference/res/layout/preference_dropdown_material.xml b/preference/res/layout/preference_dropdown_material.xml
index 7aacdf7..c070229 100644
--- a/preference/res/layout/preference_dropdown_material.xml
+++ b/preference/res/layout/preference_dropdown_material.xml
@@ -27,6 +27,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/preference_dropdown_padding_start"
+ android:layout_marginLeft="@dimen/preference_dropdown_padding_start"
android:visibility="invisible" />
<include layout="@layout/preference_material" />
diff --git a/preference/res/layout/preference_information.xml b/preference/res/layout/preference_information.xml
index 995d95a..0330642 100644
--- a/preference/res/layout/preference_information.xml
+++ b/preference/res/layout/preference_information.xml
@@ -22,13 +22,16 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
- android:paddingEnd="?android:attr/scrollbarSize">
+ android:paddingEnd="?android:attr/scrollbarSize"
+ android:paddingRight="?android:attr/scrollbarSize">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16sp"
+ android:layout_marginLeft="16sp"
android:layout_marginEnd="6sp"
+ android:layout_marginRight="6sp"
android:layout_marginTop="6sp"
android:layout_marginBottom="6sp"
android:layout_weight="1">
@@ -45,6 +48,7 @@
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
+ android:layout_alignLeft="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="2" />
diff --git a/preference/res/layout/preference_material.xml b/preference/res/layout/preference_material.xml
index bc1b806..5c65a6b 100644
--- a/preference/res/layout/preference_material.xml
+++ b/preference/res/layout/preference_material.xml
@@ -53,6 +53,7 @@
android:layout_below="@android:id/title"
android:layout_alignLeft="@android:id/title"
android:layout_alignStart="@android:id/title"
+ android:layout_gravity="start"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="10"
diff --git a/preference/res/layout/preference_widget_seekbar.xml b/preference/res/layout/preference_widget_seekbar.xml
index 6cc98be..b8f2743 100644
--- a/preference/res/layout/preference_widget_seekbar.xml
+++ b/preference/res/layout/preference_widget_seekbar.xml
@@ -21,6 +21,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:paddingEnd="?android:attr/scrollbarSize"
+ android:paddingRight="?android:attr/scrollbarSize"
android:clipChildren="false"
android:clipToPadding="false">
@@ -35,7 +36,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dip"
+ android:layout_marginLeft="16dip"
android:layout_marginEnd="8dip"
+ android:layout_marginRight="8dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1"
@@ -55,6 +58,7 @@
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
+ android:layout_alignLeft="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4"/>
@@ -68,6 +72,7 @@
android:layout_height="wrap_content"
android:layout_below="@android:id/summary"
android:layout_alignStart="@android:id/title"
+ android:layout_alignLeft="@android:id/title"
android:clipChildren="false"
android:clipToPadding="false">
<SeekBar
@@ -76,7 +81,9 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:paddingStart="@dimen/preference_seekbar_padding_horizontal"
+ android:paddingLeft="@dimen/preference_seekbar_padding_horizontal"
android:paddingEnd="22dp"
+ android:paddingRight="22dp"
android:focusable="false"
android:clickable="false"
android:background="@null" />
diff --git a/preference/res/layout/preference_widget_seekbar_material.xml b/preference/res/layout/preference_widget_seekbar_material.xml
index 3689e4d..1850267 100644
--- a/preference/res/layout/preference_widget_seekbar_material.xml
+++ b/preference/res/layout/preference_widget_seekbar_material.xml
@@ -62,6 +62,7 @@
android:layout_below="@android:id/title"
android:layout_alignLeft="@android:id/title"
android:layout_alignStart="@android:id/title"
+ android:layout_gravity="start"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4"
diff --git a/preference/src/androidTest/AndroidManifest.xml b/preference/src/androidTest/AndroidManifest.xml
index 936508e..7ce0a59 100644
--- a/preference/src/androidTest/AndroidManifest.xml
+++ b/preference/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.preference.tests">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.preference.tests.helpers.PreferenceTestHelperActivity"
android:theme="@style/PreferenceTestTheme"/>
diff --git a/recyclerview/benchmark/src/androidTest/AndroidManifest.xml b/recyclerview/benchmark/src/androidTest/AndroidManifest.xml
index d1faef9..96e0fb7 100644
--- a/recyclerview/benchmark/src/androidTest/AndroidManifest.xml
+++ b/recyclerview/benchmark/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="androidx.recyclerview.benchmark">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<!-- Important: disable debuggable for accurate performance results -->
<application
diff --git a/recyclerview/recyclerview/src/androidTest/AndroidManifest.xml b/recyclerview/recyclerview/src/androidTest/AndroidManifest.xml
index 69a0a3b..bb77728 100644
--- a/recyclerview/recyclerview/src/androidTest/AndroidManifest.xml
+++ b/recyclerview/recyclerview/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.v7.recyclerview.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:supportsRtl="true">
<activity android:name="androidx.recyclerview.test.RecyclerViewTestActivity"/>
diff --git a/recyclerview/selection/src/androidTest/AndroidManifest.xml b/recyclerview/selection/src/androidTest/AndroidManifest.xml
index c2ca63b..c0a0dc7 100644
--- a/recyclerview/selection/src/androidTest/AndroidManifest.xml
+++ b/recyclerview/selection/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.recyclerview.selection.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:supportsRtl="true">
</application>
diff --git a/room/benchmark/src/androidTest/AndroidManifest.xml b/room/benchmark/src/androidTest/AndroidManifest.xml
index 23d8fd0..aeadd7c 100644
--- a/room/benchmark/src/androidTest/AndroidManifest.xml
+++ b/room/benchmark/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="androidx.room.benchmark">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<!-- Important: disable debuggable for accurate performance results -->
<application
diff --git a/savedstate/src/androidTest/AndroidManifest.xml b/savedstate/src/androidTest/AndroidManifest.xml
index e9a46d7..68a93f6 100644
--- a/savedstate/src/androidTest/AndroidManifest.xml
+++ b/savedstate/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.savedstate.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
</application>
diff --git a/security/crypto/src/androidTest/AndroidManifest.xml b/security/crypto/src/androidTest/AndroidManifest.xml
index 39f2d9c..a9e1214 100644
--- a/security/crypto/src/androidTest/AndroidManifest.xml
+++ b/security/crypto/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.security.tests">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.INTERNET" />
<application>
</application>
diff --git a/sharetarget/src/androidTest/AndroidManifest.xml b/sharetarget/src/androidTest/AndroidManifest.xml
index 5a50661..6aa139e 100644
--- a/sharetarget/src/androidTest/AndroidManifest.xml
+++ b/sharetarget/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.compat.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<!-- Dummy main activity to provide a "android.app.shortcuts" meta-data entry -->
diff --git a/slices/benchmark/src/androidTest/AndroidManifest.xml b/slices/benchmark/src/androidTest/AndroidManifest.xml
index 0fdddc4..5fd3108 100644
--- a/slices/benchmark/src/androidTest/AndroidManifest.xml
+++ b/slices/benchmark/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="androidx.slice.benchmark.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<!-- Important: disable debuggable for accurate performance results -->
<application
diff --git a/slices/builders/ktx/src/androidTest/AndroidManifest.xml b/slices/builders/ktx/src/androidTest/AndroidManifest.xml
index b8e2a97..e88f27b 100644
--- a/slices/builders/ktx/src/androidTest/AndroidManifest.xml
+++ b/slices/builders/ktx/src/androidTest/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.slice.builders.ktx.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.slice.builders.TestActivity"/>
diff --git a/slices/core/src/androidTest/AndroidManifest.xml b/slices/core/src/androidTest/AndroidManifest.xml
index d885fa9..148adadd 100644
--- a/slices/core/src/androidTest/AndroidManifest.xml
+++ b/slices/core/src/androidTest/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.slice.core.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<provider android:name="androidx.slice.SliceTestProvider"
diff --git a/slices/core/src/main/res/layout/abc_slice_permission_request.xml b/slices/core/src/main/res/layout/abc_slice_permission_request.xml
index 43f895b..bb504b1 100644
--- a/slices/core/src/main/res/layout/abc_slice_permission_request.xml
+++ b/slices/core/src/main/res/layout/abc_slice_permission_request.xml
@@ -29,6 +29,7 @@
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingStart="8dp"
+ android:paddingLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/abc_slice_permission_text_1" />
@@ -37,6 +38,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
+ android:paddingLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingBottom="16dp"
android:text="@string/abc_slice_permission_text_2" />
diff --git a/slices/view/src/androidTest/AndroidManifest.xml b/slices/view/src/androidTest/AndroidManifest.xml
index 811a4d4..27a0d6b 100644
--- a/slices/view/src/androidTest/AndroidManifest.xml
+++ b/slices/view/src/androidTest/AndroidManifest.xml
@@ -15,7 +15,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.slice.view.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/slices/view/src/main/res/layout/abc_slice_grid_see_more.xml b/slices/view/src/main/res/layout/abc_slice_grid_see_more.xml
index 0a2e74622..86294b6 100644
--- a/slices/view/src/main/res/layout/abc_slice_grid_see_more.xml
+++ b/slices/view/src/main/res/layout/abc_slice_grid_see_more.xml
@@ -19,7 +19,8 @@
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingEnd="@dimen/abc_slice_grid_gutter">
+ android:paddingEnd="@dimen/abc_slice_grid_gutter"
+ android:paddingRight="@dimen/abc_slice_grid_gutter">
<TextView android:id="@+id/text_see_more_count"
android:layout_width="@dimen/abc_slice_small_image_size"
diff --git a/slices/view/src/main/res/layout/abc_slice_message.xml b/slices/view/src/main/res/layout/abc_slice_message.xml
index af5642a..e52891ee 100644
--- a/slices/view/src/main/res/layout/abc_slice_message.xml
+++ b/slices/view/src/main/res/layout/abc_slice_message.xml
@@ -20,7 +20,9 @@
android:layout_height="wrap_content"
android:paddingTop="12dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:background="?android:attr/activatedBackgroundIndicator"
android:clipToPadding="false">
@@ -34,9 +36,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-4dp"
+ android:layout_marginLeft="-4dp"
android:gravity="start|center_vertical"
android:orientation="horizontal"
android:paddingEnd="12dp"
+ android:paddingRight="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<!-- TODO: Support text source -->
@@ -52,6 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@android:id/title"
+ android:layout_alignLeft="@android:id/title"
android:textAppearance="?android:attr/textAppearanceListItem"
android:maxLines="10" />
diff --git a/slices/view/src/main/res/layout/abc_slice_message_local.xml b/slices/view/src/main/res/layout/abc_slice_message_local.xml
index a05740b..c24fb4c 100644
--- a/slices/view/src/main/res/layout/abc_slice_message_local.xml
+++ b/slices/view/src/main/res/layout/abc_slice_message_local.xml
@@ -21,7 +21,9 @@
android:gravity="center_vertical|end"
android:paddingTop="12dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:background="?android:attr/activatedBackgroundIndicator"
android:clipToPadding="false">
@@ -29,6 +31,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@android:id/title"
+ android:layout_alignLeft="@android:id/title"
android:layout_gravity="end"
android:gravity="end"
android:padding="8dp"
diff --git a/slices/view/src/main/res/layout/abc_slice_remote_input.xml b/slices/view/src/main/res/layout/abc_slice_remote_input.xml
index 7b2d7c9..e983646 100644
--- a/slices/view/src/main/res/layout/abc_slice_remote_input.xml
+++ b/slices/view/src/main/res/layout/abc_slice_remote_input.xml
@@ -31,7 +31,9 @@
android:paddingTop="2dp"
android:paddingBottom="4dp"
android:paddingStart="16dp"
+ android:paddingLeft="16dp"
android:paddingEnd="12dp"
+ android:paddingRight="12dp"
android:gravity="start|center_vertical"
android:textAppearance="?android:attr/textAppearance"
android:textColor="#FFFFFFFF"
@@ -53,7 +55,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingStart="12dp"
+ android:paddingLeft="12dp"
android:paddingEnd="24dp"
+ android:paddingRight="24dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:id="@+id/remote_input_send"
@@ -67,6 +71,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="6dp"
+ android:layout_marginRight="6dp"
android:layout_gravity="center"
android:visibility="invisible"
android:indeterminate="true"
diff --git a/slices/view/src/main/res/layout/abc_slice_small_template.xml b/slices/view/src/main/res/layout/abc_slice_small_template.xml
index 1e4fce3..2670314 100644
--- a/slices/view/src/main/res/layout/abc_slice_small_template.xml
+++ b/slices/view/src/main/res/layout/abc_slice_small_template.xml
@@ -36,7 +36,8 @@
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:orientation="horizontal"
- android:paddingEnd="12dp"/>
+ android:paddingEnd="12dp"
+ android:paddingRight="12dp"/>
<LinearLayout
android:id="@android:id/content"
@@ -94,6 +95,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"
+ android:paddingLeft="8dp"
android:gravity="end|center_vertical"
android:orientation="horizontal"
android:visibility="gone"/>
diff --git a/swiperefreshlayout/src/androidTest/AndroidManifest.xml b/swiperefreshlayout/src/androidTest/AndroidManifest.xml
index fbf912e..660a924 100644
--- a/swiperefreshlayout/src/androidTest/AndroidManifest.xml
+++ b/swiperefreshlayout/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.swiperefreshlayout.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application
android:supportsRtl="true"
diff --git a/textclassifier/src/androidTest/AndroidManifest.xml b/textclassifier/src/androidTest/AndroidManifest.xml
index 720897f..9981b00 100644
--- a/textclassifier/src/androidTest/AndroidManifest.xml
+++ b/textclassifier/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.textclassifier.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application
android:supportsRtl="true"
diff --git a/textclassifier/src/main/res/layout/floating_popup_menu_button.xml b/textclassifier/src/main/res/layout/floating_popup_menu_button.xml
index 5ccb984..a863457 100644
--- a/textclassifier/src/main/res/layout/floating_popup_menu_button.xml
+++ b/textclassifier/src/main/res/layout/floating_popup_menu_button.xml
@@ -47,6 +47,7 @@
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:padding="0dp"
android:paddingStart="@dimen/floating_toolbar_menu_button_side_padding"
+ android:paddingLeft="@dimen/floating_toolbar_menu_button_side_padding"
android:layout_margin="0dp"
android:gravity="center"
android:singleLine="true"
diff --git a/textclassifier/src/main/res/layout/floating_popup_open_overflow_button.xml b/textclassifier/src/main/res/layout/floating_popup_open_overflow_button.xml
index 6a3d5c8..22b440f 100644
--- a/textclassifier/src/main/res/layout/floating_popup_open_overflow_button.xml
+++ b/textclassifier/src/main/res/layout/floating_popup_open_overflow_button.xml
@@ -21,7 +21,9 @@
android:minWidth="@dimen/floating_toolbar_menu_button_minimum_width"
android:minHeight="@dimen/floating_toolbar_height"
android:paddingStart="0dp"
+ android:paddingLeft="0dp"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:paddingEnd="4dp"
+ android:paddingRight="4dp"
android:contentDescription="@string/floating_toolbar_open_overflow_description" />
diff --git a/transition/src/androidTest/AndroidManifest.xml b/transition/src/androidTest/AndroidManifest.xml
index 5db4604..7a72962 100755
--- a/transition/src/androidTest/AndroidManifest.xml
+++ b/transition/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.transition.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application
android:supportsRtl="true">
diff --git a/tv-provider/src/androidTest/AndroidManifest.xml b/tv-provider/src/androidTest/AndroidManifest.xml
index 312340f..83b1355 100644
--- a/tv-provider/src/androidTest/AndroidManifest.xml
+++ b/tv-provider/src/androidTest/AndroidManifest.xml
@@ -16,5 +16,4 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.tvprovider.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/ui/android-text/src/androidTest/AndroidManifest.xml b/ui/android-text/src/androidTest/AndroidManifest.xml
index acb1e8b..c11a9fd 100644
--- a/ui/android-text/src/androidTest/AndroidManifest.xml
+++ b/ui/android-text/src/androidTest/AndroidManifest.xml
@@ -15,7 +15,6 @@
~ limitations under the License.
-->
<manifest package="androidx.text" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/android-text/src/main/AndroidManifest.xml b/ui/android-text/src/main/AndroidManifest.xml
index acb1e8b..c11a9fd 100644
--- a/ui/android-text/src/main/AndroidManifest.xml
+++ b/ui/android-text/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
~ limitations under the License.
-->
<manifest package="androidx.text" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/android-view-non-ir/src/androidTest/AndroidManifest.xml b/ui/android-view-non-ir/src/androidTest/AndroidManifest.xml
index 01ebbec..258ef53 100644
--- a/ui/android-view-non-ir/src/androidTest/AndroidManifest.xml
+++ b/ui/android-view-non-ir/src/androidTest/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.androidview" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/android-view-non-ir/src/main/AndroidManifest.xml b/ui/android-view-non-ir/src/main/AndroidManifest.xml
index 01ebbec..258ef53 100644
--- a/ui/android-view-non-ir/src/main/AndroidManifest.xml
+++ b/ui/android-view-non-ir/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.androidview" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/android-view/src/androidTest/AndroidManifest.xml b/ui/android-view/src/androidTest/AndroidManifest.xml
index 9e317be..91e9621 100644
--- a/ui/android-view/src/androidTest/AndroidManifest.xml
+++ b/ui/android-view/src/androidTest/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.androidview" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.ui.androidview.test.TestActivity" android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen"/>
diff --git a/ui/android-view/src/main/AndroidManifest.xml b/ui/android-view/src/main/AndroidManifest.xml
index 01ebbec..258ef53 100644
--- a/ui/android-view/src/main/AndroidManifest.xml
+++ b/ui/android-view/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.androidview" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/animation-core/src/androidTest/AndroidManifest.xml b/ui/animation-core/src/androidTest/AndroidManifest.xml
index aefed03..62b7638 100644
--- a/ui/animation-core/src/androidTest/AndroidManifest.xml
+++ b/ui/animation-core/src/androidTest/AndroidManifest.xml
@@ -15,7 +15,6 @@
~ limitations under the License.
-->
<manifest package="androidx.animation" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/animation-core/src/main/AndroidManifest.xml b/ui/animation-core/src/main/AndroidManifest.xml
index aefed03..62b7638 100644
--- a/ui/animation-core/src/main/AndroidManifest.xml
+++ b/ui/animation-core/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
~ limitations under the License.
-->
<manifest package="androidx.animation" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/animation/integration-tests/animation-demos/src/main/AndroidManifest.xml b/ui/animation/integration-tests/animation-demos/src/main/AndroidManifest.xml
index 93d2b40..8d139eb 100644
--- a/ui/animation/integration-tests/animation-demos/src/main/AndroidManifest.xml
+++ b/ui/animation/integration-tests/animation-demos/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.ui.animation.demos">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name=".HelloAnimationActivity"
diff --git a/ui/animation/src/main/AndroidManifest.xml b/ui/animation/src/main/AndroidManifest.xml
index b61d009..319f856 100644
--- a/ui/animation/src/main/AndroidManifest.xml
+++ b/ui/animation/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
~ limitations under the License.
-->
<manifest package="androidx.ui.animation" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/core/src/androidTest/AndroidManifest.xml b/ui/core/src/androidTest/AndroidManifest.xml
index ad8d4fb..b20c213 100644
--- a/ui/core/src/androidTest/AndroidManifest.xml
+++ b/ui/core/src/androidTest/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.core" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.ui.core.DpDeviceTest$Companion$TestActivity"
diff --git a/ui/core/src/main/AndroidManifest.xml b/ui/core/src/main/AndroidManifest.xml
index 87bfa2e..a2ef1bc 100644
--- a/ui/core/src/main/AndroidManifest.xml
+++ b/ui/core/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.core" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/framework/integration-tests/framework-demos/src/main/AndroidManifest.xml b/ui/framework/integration-tests/framework-demos/src/main/AndroidManifest.xml
index 7db93a0..02880cc 100644
--- a/ui/framework/integration-tests/framework-demos/src/main/AndroidManifest.xml
+++ b/ui/framework/integration-tests/framework-demos/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.ui.framework.demos">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name=".AnimationGestureSemanticsActivity"
diff --git a/ui/framework/src/androidTest/AndroidManifest.xml b/ui/framework/src/androidTest/AndroidManifest.xml
index ca59bae..2e4d8bf 100644
--- a/ui/framework/src/androidTest/AndroidManifest.xml
+++ b/ui/framework/src/androidTest/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.framework" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.ui.framework.test.TestActivity" android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen"/>
diff --git a/ui/framework/src/main/AndroidManifest.xml b/ui/framework/src/main/AndroidManifest.xml
index ec77026..a09c9d88 100644
--- a/ui/framework/src/main/AndroidManifest.xml
+++ b/ui/framework/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.framework" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/layout/integration-tests/layout-demos/src/main/AndroidManifest.xml b/ui/layout/integration-tests/layout-demos/src/main/AndroidManifest.xml
index 90e1ba8..d94c4f0 100644
--- a/ui/layout/integration-tests/layout-demos/src/main/AndroidManifest.xml
+++ b/ui/layout/integration-tests/layout-demos/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.ui.layout.demos">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name=".LayoutActivity"
diff --git a/ui/layout/src/androidTest/AndroidManifest.xml b/ui/layout/src/androidTest/AndroidManifest.xml
index 1656ab63..d08ac5b 100644
--- a/ui/layout/src/androidTest/AndroidManifest.xml
+++ b/ui/layout/src/androidTest/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.layout" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.ui.layout.test.TestActivity"
diff --git a/ui/layout/src/main/AndroidManifest.xml b/ui/layout/src/main/AndroidManifest.xml
index 3cf47a1..1b0a423 100644
--- a/ui/layout/src/main/AndroidManifest.xml
+++ b/ui/layout/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.layout" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/material/integration-tests/material-demos/src/main/AndroidManifest.xml b/ui/material/integration-tests/material-demos/src/main/AndroidManifest.xml
index 6a27396..6e65e13e 100644
--- a/ui/material/integration-tests/material-demos/src/main/AndroidManifest.xml
+++ b/ui/material/integration-tests/material-demos/src/main/AndroidManifest.xml
@@ -18,7 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.ui.material.demos">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}" />
<application>
<activity
diff --git a/ui/material/src/androidTest/AndroidManifest.xml b/ui/material/src/androidTest/AndroidManifest.xml
index 72169ea..e8fa26f 100644
--- a/ui/material/src/androidTest/AndroidManifest.xml
+++ b/ui/material/src/androidTest/AndroidManifest.xml
@@ -15,7 +15,6 @@
~ limitations under the License.
-->
<manifest package="androidx.ui.material" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity
android:name="androidx.ui.test.android.DefaultTestActivity"
diff --git a/ui/material/src/main/AndroidManifest.xml b/ui/material/src/main/AndroidManifest.xml
index baff0bb..34909fe 100644
--- a/ui/material/src/main/AndroidManifest.xml
+++ b/ui/material/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
~ limitations under the License.
-->
<manifest package="androidx.ui.material" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/platform/src/androidTest/AndroidManifest.xml b/ui/platform/src/androidTest/AndroidManifest.xml
index 06a8561..f086f11 100644
--- a/ui/platform/src/androidTest/AndroidManifest.xml
+++ b/ui/platform/src/androidTest/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.platform" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<activity android:name="androidx.ui.platform.test.TestActivity" android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen"/>
diff --git a/ui/platform/src/main/AndroidManifest.xml b/ui/platform/src/main/AndroidManifest.xml
index cba92f3..78cb8d6 100644
--- a/ui/platform/src/main/AndroidManifest.xml
+++ b/ui/platform/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.platform" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/test/src/main/AndroidManifest.xml b/ui/test/src/main/AndroidManifest.xml
index 348b712..7eb4969 100644
--- a/ui/test/src/main/AndroidManifest.xml
+++ b/ui/test/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.ui.test" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application/>
</manifest>
diff --git a/ui/text/integration-tests/text-demos/src/main/AndroidManifest.xml b/ui/text/integration-tests/text-demos/src/main/AndroidManifest.xml
index bcf0c92..1bf75d2 100644
--- a/ui/text/integration-tests/text-demos/src/main/AndroidManifest.xml
+++ b/ui/text/integration-tests/text-demos/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.ui.text.demos">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
<!-- Note: when you have more than one demo, change the label to "Text/Demo name" -->
diff --git a/ui/text/src/androidTest/AndroidManifest.xml b/ui/text/src/androidTest/AndroidManifest.xml
index e62e0ab..faf68cd 100644
--- a/ui/text/src/androidTest/AndroidManifest.xml
+++ b/ui/text/src/androidTest/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
<manifest package="androidx.ui.text" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/ui/text/src/main/AndroidManifest.xml b/ui/text/src/main/AndroidManifest.xml
index e62e0ab..faf68cd 100644
--- a/ui/text/src/main/AndroidManifest.xml
+++ b/ui/text/src/main/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
<manifest package="androidx.ui.text" xmlns:android="http://schemas.android.com/apk/res/android">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
</manifest>
diff --git a/viewpager/src/androidTest/AndroidManifest.xml b/viewpager/src/androidTest/AndroidManifest.xml
index 07f551e..b50caaf 100644
--- a/viewpager/src/androidTest/AndroidManifest.xml
+++ b/viewpager/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.viewpager.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
diff --git a/viewpager2/src/androidTest/AndroidManifest.xml b/viewpager2/src/androidTest/AndroidManifest.xml
index 9601e02..341e38c 100755
--- a/viewpager2/src/androidTest/AndroidManifest.xml
+++ b/viewpager2/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.viewpager2.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application android:supportsRtl="true">
<activity android:name="androidx.viewpager2.widget.swipe.TestActivity"
diff --git a/wear/src/androidTest/AndroidManifest.xml b/wear/src/androidTest/AndroidManifest.xml
index 7e79803..9bbf118 100644
--- a/wear/src/androidTest/AndroidManifest.xml
+++ b/wear/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.wear.test">
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
diff --git a/webkit/src/androidTest/AndroidManifest.xml b/webkit/src/androidTest/AndroidManifest.xml
index 2e28ecc..1d57ce4 100644
--- a/webkit/src/androidTest/AndroidManifest.xml
+++ b/webkit/src/androidTest/AndroidManifest.xml
@@ -19,7 +19,6 @@
<!-- Note: we must provide INTERNET permission for
ServiceWorkerWebSettingsCompatTest#testBlockNetworkLoads -->
<uses-permission android:name="android.permission.INTERNET" />
- <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<!-- Note: we must specify this because our local server uses
http://localhost URLs (and P defaults to blocking cleartext traffic).
-->
