DO NOT MERGE Import AndroidX from build 6762995
./update_prebuilts.py -stx 6762995
Only update needed androidx.preference parts as
to include CL[1] from AOSP androidx-master-dev into prebuilt sdk.
This is necessary since some platform apps like Settings
uses prebuilt androidx sdk to create PreferenceDialogFragment
instance, this CL is to update the sdk library to align with
CL[1] changes.
CL[1]: I78603aeb7e75204540f2ac263d76b9a9a08bcf13
Remove STATE_ALWAYS_VISIBLE for PreferenceDialogFragment from R
Fix: 161506356
Test: m -j
Change-Id: I40cef11ef12a620702568489d4c9a56305bf339d
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar
index 1e095b1..74e026c 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar
Binary files differ
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.md5 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.md5
index 11d67d4..a764eab 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.md5
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.md5
@@ -1 +1 @@
-b7f8cf3c82a9cd7287edf0592e992717
\ No newline at end of file
+227b70a075a54864f9db966b9da1ccfc
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha1 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha1
index 7cb5e10..8d86d2a 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha1
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha1
@@ -1 +1 @@
-a9ea6f2750e3cdaafb8bd701913fab63b8dd23b9
\ No newline at end of file
+aadeee9a0d9971136cc69b913129340b34022213
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha256 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha256
index ef26c21..db161a6 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha256
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha256
@@ -1 +1 @@
-d86e1d9b29b21dcefc66c2e66068d4691aae3557acc03d0e67ea6c087419d79c
\ No newline at end of file
+d25a9d350c81a5c5287c5902a9ccfc52f4f02f7a5394b0d2b9c0e985c23a51d7
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha512 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha512
index df698c1..3db7248 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha512
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha512
@@ -1 +1 @@
-9cc302d52ed271b300c30dcf587b49dd953f2c8110068d409bdac70671ff5b3bf694367ff78406e4f5e137537e08cec055c60909e57a5aaa3cf937675a591e81
\ No newline at end of file
+2309cd5f17147f08be80e976fbca565d3c61889c71cf5135a20e2f1883976773925138563865f6d014a374df03239d0f07f5ee4fa347eaab20ca7fca9a25c4b9
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar
index 801972a..b704840 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar
Binary files differ
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.md5 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.md5
index e6a5cd3..5eb5761 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.md5
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.md5
@@ -1 +1 @@
-a336351e806cd2a4219855c968116728
\ No newline at end of file
+38d8748dec46d177a32bc4cd9e83c6e9
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha1 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha1
index 671f6f7..9a26c68 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha1
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha1
@@ -1 +1 @@
-e9e032d3f18b141a002e8244219bb810ffabf832
\ No newline at end of file
+708137a04076b5d3215062486727168933a0354b
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha256 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha256
index aa84932..cef2a7b 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha256
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha256
@@ -1 +1 @@
-f94645fdb1301aef13220f66e7f603d161249aa2d082f4a6f190265994277515
\ No newline at end of file
+4a8d036f828cc1b0c81d171519803f8b21063580a633af77777fa9f797e0d766
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha512 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha512
index de1302e..c867ddd 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha512
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha512
@@ -1 +1 @@
-3a430628f9d469a4271e345c817d009d44e5dd6e8de57a8a81c565c1610a2b75496ca1e43e91e117b36666953028e777b6759efece4bd2d18ce86448b5d9dca3
\ No newline at end of file
+5d3510b3d8cce354ae1b51de000db9d1358fe83539294a90b24bdda51dc565658e08b897a116d9ab9c4d9105740b9a6ed3a1ee0c8d0d02239ae144189372dd7b
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module
index 82f5538..c940873 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module
@@ -10,8 +10,8 @@
},
"createdBy": {
"gradle": {
- "version": "6.5",
- "buildId:": "6616358"
+ "version": "6.5.1",
+ "buildId:": "6762995"
}
},
"variants": [
@@ -64,11 +64,11 @@
{
"name": "preference-1.2.0-alpha01.aar",
"url": "preference-1.2.0-alpha01.aar",
- "size": 252816,
- "sha512": "3a430628f9d469a4271e345c817d009d44e5dd6e8de57a8a81c565c1610a2b75496ca1e43e91e117b36666953028e777b6759efece4bd2d18ce86448b5d9dca3",
- "sha256": "f94645fdb1301aef13220f66e7f603d161249aa2d082f4a6f190265994277515",
- "sha1": "e9e032d3f18b141a002e8244219bb810ffabf832",
- "md5": "a336351e806cd2a4219855c968116728"
+ "size": 253521,
+ "sha512": "5d3510b3d8cce354ae1b51de000db9d1358fe83539294a90b24bdda51dc565658e08b897a116d9ab9c4d9105740b9a6ed3a1ee0c8d0d02239ae144189372dd7b",
+ "sha256": "4a8d036f828cc1b0c81d171519803f8b21063580a633af77777fa9f797e0d766",
+ "sha1": "708137a04076b5d3215062486727168933a0354b",
+ "md5": "38d8748dec46d177a32bc4cd9e83c6e9"
}
]
},
@@ -128,11 +128,11 @@
{
"name": "preference-1.2.0-alpha01.aar",
"url": "preference-1.2.0-alpha01.aar",
- "size": 252816,
- "sha512": "3a430628f9d469a4271e345c817d009d44e5dd6e8de57a8a81c565c1610a2b75496ca1e43e91e117b36666953028e777b6759efece4bd2d18ce86448b5d9dca3",
- "sha256": "f94645fdb1301aef13220f66e7f603d161249aa2d082f4a6f190265994277515",
- "sha1": "e9e032d3f18b141a002e8244219bb810ffabf832",
- "md5": "a336351e806cd2a4219855c968116728"
+ "size": 253521,
+ "sha512": "5d3510b3d8cce354ae1b51de000db9d1358fe83539294a90b24bdda51dc565658e08b897a116d9ab9c4d9105740b9a6ed3a1ee0c8d0d02239ae144189372dd7b",
+ "sha256": "4a8d036f828cc1b0c81d171519803f8b21063580a633af77777fa9f797e0d766",
+ "sha1": "708137a04076b5d3215062486727168933a0354b",
+ "md5": "38d8748dec46d177a32bc4cd9e83c6e9"
}
]
},
@@ -148,11 +148,11 @@
{
"name": "preference-1.2.0-alpha01-sources.jar",
"url": "preference-1.2.0-alpha01-sources.jar",
- "size": 108348,
- "sha512": "9cc302d52ed271b300c30dcf587b49dd953f2c8110068d409bdac70671ff5b3bf694367ff78406e4f5e137537e08cec055c60909e57a5aaa3cf937675a591e81",
- "sha256": "d86e1d9b29b21dcefc66c2e66068d4691aae3557acc03d0e67ea6c087419d79c",
- "sha1": "a9ea6f2750e3cdaafb8bd701913fab63b8dd23b9",
- "md5": "b7f8cf3c82a9cd7287edf0592e992717"
+ "size": 108845,
+ "sha512": "2309cd5f17147f08be80e976fbca565d3c61889c71cf5135a20e2f1883976773925138563865f6d014a374df03239d0f07f5ee4fa347eaab20ca7fca9a25c4b9",
+ "sha256": "d25a9d350c81a5c5287c5902a9ccfc52f4f02f7a5394b0d2b9c0e985c23a51d7",
+ "sha1": "aadeee9a0d9971136cc69b913129340b34022213",
+ "md5": "227b70a075a54864f9db966b9da1ccfc"
}
]
}
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.md5 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.md5
index 5bb7b7f..97a4c79 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.md5
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.md5
@@ -1 +1 @@
-067a54971e35c9d3e01bcbe37dc54a0b
\ No newline at end of file
+256e5946a3d4c5a5ea2acfd288fe5ad4
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha1 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha1
index 112ff5b..b79c334 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha1
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha1
@@ -1 +1 @@
-740c821bba2074b765cc5105f2f2ee6f72832532
\ No newline at end of file
+54283b775a8e4903ee13090c2e7779f1750337d4
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha256 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha256
index b4244e3..13442d4 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha256
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha256
@@ -1 +1 @@
-f7e446eba5739f6a834cf7866b8b5d2f3e80c93b9d88e57ce2207b7e7e912365
\ No newline at end of file
+de21f67412dd6c4db1181fdbb6a9ba4a2f1716c240666e9d43df2810477f1636
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha512 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha512
index 8c86931..efd39ae 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha512
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha512
@@ -1 +1 @@
-4f377a4414d506101de40358b77760c08ba41923bc1ea62c089c25921ed01904b0923ae65b9bf99f6d0f80190d64689216cf8b6d2b965613c3249a141dd98345
\ No newline at end of file
+40a9ba0693ba71b20c58e14f6e76bbaef2cfe597e3a2714084719d8fbf43be5bb0a9777a08178e8ab4db1edfea346fb293e4f764324c501d7228d30479a55774
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom
index db093b0..d155bc9 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom
@@ -12,7 +12,7 @@
<packaging>aar</packaging>
<name>AndroidX Preference</name>
<description>AndroidX Preference</description>
- <url>https://developer.android.com/jetpack/androidx</url>
+ <url>https://developer.android.com/jetpack/androidx/releases/preference#1.2.0-alpha01</url>
<inceptionYear>2015</inceptionYear>
<licenses>
<license>
@@ -28,7 +28,7 @@
</developers>
<scm>
<connection>scm:git:https://android.googlesource.com/platform/frameworks/support</connection>
- <url>http://source.android.com</url>
+ <url>https://cs.android.com/androidx/platform/frameworks/support</url>
</scm>
<dependencies>
<dependency>
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.md5 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.md5
index 7a1f057..e512714 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.md5
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.md5
@@ -1 +1 @@
-3bc00e8802038be4dd3a04a69800787f
\ No newline at end of file
+e3ad5a12d4f22dbe163105bed8dc1cc9
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha1 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha1
index 208f3d1..2ba12ee 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha1
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha1
@@ -1 +1 @@
-0d83b3201c6b3ff10d368bc677f5b4b95767bac9
\ No newline at end of file
+15faf081b51284170911ff5fdb9b74fb207f43a6
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha256 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha256
index 0cb04f7..7c0d0fc 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha256
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha256
@@ -1 +1 @@
-918e9288e5d26dd70ad65e9bc6cb0af8e05dbc5ade9b3ce4d8e6c7a7a9816c2a
\ No newline at end of file
+1b4376f53edcc6ecfb33c721f5fbba3a5aa02031dcadbad2c908266567eb0233
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha512 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha512
index 729ad63..6aa36c8 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha512
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha512
@@ -1 +1 @@
-1649ee5df10be7817808d113a93c758d992a586bf6b8c6a3f64b4aa3956b6febd1bdbe072c17d4f3fd6f26620ef2711b50893aaac9ef64b6ac03cd2e9e0b94d9
\ No newline at end of file
+8a8c59689aa2d70bf184e98d006eacc99d7acb1fdbface7f3f2ec76be61f1effdf2644f075b586784f7025ed5f1db2181e548131ac186a756779124386c58817
\ No newline at end of file
diff --git a/current/androidx/manifests/androidx.preference_preference/AndroidManifest.xml b/current/androidx/manifests/androidx.preference_preference/AndroidManifest.xml
index e8b0bfe..b7740ec 100644
--- a/current/androidx/manifests/androidx.preference_preference/AndroidManifest.xml
+++ b/current/androidx/manifests/androidx.preference_preference/AndroidManifest.xml
@@ -19,6 +19,6 @@
<uses-sdk
android:minSdkVersion="14"
- android:targetSdkVersion="29" />
+ android:targetSdkVersion="30" />
</manifest>
\ No newline at end of file
