Commit Graph

109844 Commits

Author SHA1 Message Date
Bill Yi
9c19a5eed5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6e8038dac412180de51369518035e4e8e65bf7a8
2022-06-01 00:08:12 -07:00
Lin Yuan
1e71471b2c Merge "Fix: policy enforcement for location wifi scanning" 2022-05-31 13:42:13 +00:00
Amith Yamasani
b0d56f0ee3 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: b9e7df683f am: 2294b09650 am: 19fd2f197a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: Ia6b14989102c1ba7c4588cec8555c2cbbb6c0454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:19:15 +00:00
Amith Yamasani
5f3b714afa Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a am: 6cbe791c94 am: 860c9cf331
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: Ief1a4987d1cefe4b20e5a3c38d6e8bd682a9e663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:19:06 +00:00
Amith Yamasani
bdf5299053 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a am: 6a4d79541a am: bb2e561062
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I97a5f101e2d5d1f311c5e2fb47893aeb972f918a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:18:47 +00:00
Amith Yamasani
19fd2f197a Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: b9e7df683f am: 2294b09650
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I1ca776798e91d0834e475abd7ade5e1513d57b1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:01:14 +00:00
Amith Yamasani
860c9cf331 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a am: 6cbe791c94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: Ied7da083634089348e9a2664d588f4dee534b276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:00:57 +00:00
Amith Yamasani
bb2e561062 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a am: 6a4d79541a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I23449db027d5c663cb3dfe7a76211e0e92f87d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:00:44 +00:00
Amith Yamasani
2294b09650 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: b9e7df683f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I535eda21a8445deb256a145170ae42ae1a3115ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:40:10 +00:00
Amith Yamasani
6cbe791c94 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I31e002c94128935ef811033da62b831299925df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:40:00 +00:00
Amith Yamasani
6a4d79541a Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: If31bb0c8c6927bd7eb7f0898d9afdf84af6b6bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:39:59 +00:00
Amith Yamasani
d29969dc59 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: faa28109f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I670440d0d88c3deac0e080b1d78408d5ba3b25cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:39:30 +00:00
Amith Yamasani
390236115a Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I69c616bb66f0a440e654fe8c324bd222d1b3e612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:25:01 +00:00
Amith Yamasani
faa28109f2 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I451b1cddcedf6a2f5daa95d3a1426e7f6ea56a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:24:06 +00:00
Amith Yamasani
b9e7df683f Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I169d16a6dbb7cec8a82386ebd7f482845d2f0836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:23:43 +00:00
menghanli
99030d8382 Polish reset display size and text dialog content am: 51a056ec32 am: c17018fdbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659331

Change-Id: Ic09f49855014f2755a6b1ab5ed78b9bcd67b7d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 08:24:30 +00:00
menghanli
c17018fdbf Polish reset display size and text dialog content am: 51a056ec32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659331

Change-Id: I08cd1e9467a0713b41a6d86b45e46cce6c571258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 07:39:23 +00:00
Amith Yamasani
1b27c91a7b Use Uri.toString() instead of Uri.toSafeString()
Uri.toSafeString strips out paths and shouldn't be used
for situations other than logging.

Bug: 232694281
Test: PtsPowerTestCases
Change-Id: Iec835b738c3e928e922bd6a14573106f2ce4f526
2022-05-30 23:22:25 -07:00
Zoey Chen
1b58b29a41 [automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f am: bd8c589390 -s ours am: 95c15f1f0b -s ours am: ad2bdc8fef -s ours am: 99b85ef683 -s ours
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987

Change-Id: Ib74419430b66930630a0057080f36d8116782ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 05:29:02 +00:00
Zoey Chen
99b85ef683 [automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f am: bd8c589390 -s ours am: 95c15f1f0b -s ours am: ad2bdc8fef -s ours
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987

Change-Id: Ie3d10be0e38199945c2edc85a31dd7e585df06de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 04:51:05 +00:00
Zoey Chen
ad2bdc8fef [automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f am: bd8c589390 -s ours am: 95c15f1f0b -s ours
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987

Change-Id: I3696416d7a05fc2cd6d7c3d3fe4018131388f5ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 04:37:04 +00:00
Zoey Chen
95c15f1f0b [automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f am: bd8c589390 -s ours
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987

Change-Id: I25e081bb87845b2b286326eaad7f53573eb9e441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 04:22:36 +00:00
Zoey Chen
bd8c589390 Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987

Change-Id: Iee27c40089c612cd2e9ac80a4fa218d707fffd0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 03:57:00 +00:00
Zoey Chen
31011d591f Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" 2022-05-31 03:27:51 +00:00
menghanli
51a056ec32 Polish reset display size and text dialog content
Use "tablet" for tablet devices; use "phone" for default

Bug: 233985662
Test: Manual testing
Change-Id: I24e54315414502dc61efb733bbf697783b1de87a
2022-05-30 23:54:09 +00:00
Automerger Merge Worker
ddf0a2ffc6 Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 7e712ef660" into tm-d1-dev-plus-aosp am: 2773af62b8 am: c67e3c2433
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: Ie8f2ff1590c137154097cb9cd7d4c42d7a941462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:48:07 +00:00
Edgar Wang
1f557b2cba Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 am: 67e1606b5e am: c5c7fdfe34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: Ib9a0f53e27ed83da5f41e90263d1c35ac9c96aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:47:11 +00:00
Edgar Wang
2b091918d5 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 am: 4f5a65d4bb am: 607b4cd97f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I39062c0420c468db07dd3de3ba51a96986ed7b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:46:19 +00:00
Automerger Merge Worker
c67e3c2433 Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 7e712ef660" into tm-d1-dev-plus-aosp am: 2773af62b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: Ibe21453ec004a904fa756bb3398a57e4953f8b26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:23:22 +00:00
Edgar Wang
c5c7fdfe34 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 am: 67e1606b5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I2d1994989ba1b97163a892e8745bd5924df946ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:22:50 +00:00
Edgar Wang
607b4cd97f Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 am: 4f5a65d4bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I5f17e520e29ee4a2e5cfc5a315da159e591cf15a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:22:28 +00:00
Automerger Merge Worker
2773af62b8 Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 7e712ef660" into tm-d1-dev-plus-aosp 2022-05-30 05:05:51 +00:00
Automerger Merge Worker
8e704f82f0 Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 66c9a88946" 2022-05-30 05:05:33 +00:00
Edgar Wang
67e1606b5e Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I1dd67111c2d18b8f41a318860ee751a3f6ec6aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:05:31 +00:00
Edgar Wang
e735b97709 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 7e712ef660
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: Iec98afd8781aa28bb0d15a66382f0f9c1d8d9028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:05:31 +00:00
Edgar Wang
4f5a65d4bb Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I0e30a9c258df97364b0ef848ed669d73e5a9b75a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:05:29 +00:00
Treehugger Robot
5b4ca8e8ba Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 am: 22c4b4009b am: 7cf2c08b53 am: 9d92574250
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I62207f8eafb3839c984d11b73bdf2f18d14199a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:05:14 +00:00
Edgar Wang
385243d7f3 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 66c9a88946
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: Ia4a1b520c3f14593a81a0435c07b1d0b35c06e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:05:00 +00:00
Edgar Wang
1767504702 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I584713ed38df60ecb9742f79f5cbc2e0c2ea90bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 04:36:10 +00:00
Edgar Wang
66c9a88946 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I28df0c9ebe36df58bb5127c84943e00cc553f453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 04:35:29 +00:00
Treehugger Robot
9d92574250 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 am: 22c4b4009b am: 7cf2c08b53
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I2a2d7758da7c9e8484377ecb2a6c5bdc128f2566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 04:34:58 +00:00
Edgar Wang
7e712ef660 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I1e600321182b83edebe65bbc932222b4ea7bc4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 04:34:50 +00:00
Edgar Wang
610538e10b Merge "Enable hyphenation on most of preference." into tm-dev 2022-05-30 04:00:19 +00:00
Treehugger Robot
7cf2c08b53 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 am: 22c4b4009b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I68e18d34ee0f28caac1da18f76472082eb524430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 03:59:47 +00:00
Treehugger Robot
22c4b4009b Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I1fd069da08f2931ee00c7adb08df56fc4fb976b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 03:44:42 +00:00
Chaohui Wang
628abd67a5 Merge "Enable Kotlin for Settings App" into tm-qpr-dev am: 304a3fd37e am: f46186a820
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18655752

Change-Id: I25466af097e46b4238db152f5003e75615b2257e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 03:28:33 +00:00
Treehugger Robot
2341b91f32 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I3435e3bf2ee61ad4be971334f791543d9c26856d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 03:27:45 +00:00
Chaohui Wang
f46186a820 Merge "Enable Kotlin for Settings App" into tm-qpr-dev am: 304a3fd37e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18655752

Change-Id: Ieb38157536c1cb746de007ac2c162e9336a3288f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 03:01:34 +00:00
Treehugger Robot
24f96c2c2e Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" 2022-05-30 03:01:23 +00:00
Chaohui Wang
304a3fd37e Merge "Enable Kotlin for Settings App" into tm-qpr-dev 2022-05-30 02:43:23 +00:00