Chaohui Wang
2416be0c66
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: 57e99642e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: Ib8c22696072a50a8c7926a5625e49f0a967574f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:06:21 +00:00
Chaohui Wang
71fe20ea8b
Merge "Fix flicker in Dark theme" into tm-dev
2022-06-01 02:35:51 +00:00
TreeHugger Robot
dfcef8896f
Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e am: 28b3a9a7ae am: ace4d8944c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304
Change-Id: Ib3413537b6b069964e134f3825b235a0df3ff391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 23:33:24 +00:00
TreeHugger Robot
ace4d8944c
Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e am: 28b3a9a7ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304
Change-Id: I016d7fefa06a535a5edff5670a7c847fa86abacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 23:07:57 +00:00
TreeHugger Robot
28b3a9a7ae
Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304
Change-Id: I9e12101cb0fd246ec5dde24754f298173a1fda80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 22:54:33 +00:00
TreeHugger Robot
715ffb6f0e
Merge "Update biometrics OWNERS" into tm-d1-dev
2022-05-31 22:34:46 +00:00
Lin Yuan
1e71471b2c
Merge "Fix: policy enforcement for location wifi scanning"
2022-05-31 13:42:13 +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
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
Chaohui Wang
9f6eaf8624
Fix flicker in Dark theme
...
Currently, when schedule sets to "Turns on at bedtime", the footer will
show a slid up animation when entering the page, this is because the
"Start time" & "End time" preferences are hidden in onResume().
This is because these 2 preferences always return AVAILABLE in
getAvailabilityStatus(), and manually update visibility in
refreshSummary(), which is called each time updateState() is called.
Usually the controller not set the visibility explicitly, but return
CONDITIONALLY_UNAVAILABLE in getAvailabilityStatus() when they want to
hide the preference.
Because getAvailabilityStatus() is called in onCreate(), by using this,
we can fix the flicker.
Fix: 234399017
Test: visual & robo test
Change-Id: I4cb7dd95d2985bd1ca4c8cb30aaebdc21a5415f8
2022-05-31 19:03:54 +08: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
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
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
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
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
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
Chaohui Wang
9ec6f0e41a
Enable Kotlin for Settings App
...
Currently Kotlin files cannot build with library app-compat-annotations.
Only one @ChangeId need this library, create separate build target
library Settings-change-ids to solve this issue.
After this cl, Kotlin could be used for Settings App.
Fix: 229037247
Test: make Settings
Change-Id: I4a0d99425c9e6cc2cbc015d2561daa68609ca0fd
2022-05-30 01:58:25 +08:00
Ilya Matyukhin
28608774cb
Update biometrics OWNERS
...
Bug: 234195983
Test: N/A
Change-Id: I9843d0d6fad638cd14296624b11f86a273baab1c
2022-05-28 05:36:43 +00:00
TreeHugger Robot
ca0b0e7ca2
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I9ae683784754566b48e88d302b59f575fedca2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:14:26 +00:00
TreeHugger Robot
1dd874906b
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 84afa101d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I700c596bc9a835eb9531997044651ecacc014895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:13:51 +00:00
TreeHugger Robot
3ab05042dc
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217 am: a00962e0c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: Ida4ea18bc52ea8823a7e11579cb2b52b071d9eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:13:42 +00:00
TreeHugger Robot
a00962e0c7
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I028d9908e9510f2ae7cbebc36f9f23c0498155cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:56:37 +00:00
TreeHugger Robot
1340a91c73
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: Ifdd591d7f032facbfe0f0f6dfe6db587271ec386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:56:19 +00:00
TreeHugger Robot
58cc75e217
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I9da420078509e6aa2a8ec37f1929fcdd5f2b4ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:54:53 +00:00
SongFerng Wang
a575d9bed0
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86 am: 86fd225f79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I6146640d0aab0a0ff5d77aa7d9da4b6ae920032b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:40:51 +00:00
TreeHugger Robot
07db5f4362
Merge "Fix can't change notification sound for work profile." into tm-dev
2022-05-27 15:36:13 +00:00
SongFerng Wang
b5bc3952c5
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: Ie73fca56e20e0c70230ff6823eba12ff63c208f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:33:56 +00:00
SongFerng Wang
0a6ea7f85f
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: 716c801f6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I0d36259fd473eafe9221a559acc5890121795440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:33:23 +00:00
SongFerng Wang
86fd225f79
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I76b7ecd27dcf6b1e682cc104a389c9653b31320b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:26:31 +00:00
SongFerng Wang
e4d42c1515
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I4c163ea303beefcf265ba6b67585d7559aab9ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:18:44 +00:00
SongFerng Wang
640e337b19
Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107797
Change-Id: Idcc44c3a8d41c74cb485c5cba0764989adc17a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:18:30 +00:00
SongFerngWang
5de8fbc299
Changing the condition since the esim may be removable am: 82bf2a66b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: If58f4e897785dd92ed6de2bd847bb5a7a9728294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:18:28 +00:00
SongFerng Wang
d879d59a86
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I74352201ea603e7786ca6ee686fc9d6f142e7ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:17:25 +00:00
SongFerng Wang
d3a7c75487
Merge changes Ic2ac6a5c,I47dc068e
...
* changes:
[MEP] The removale slot can read the esim card
Changing the condition since the esim may be removable
2022-05-27 14:59:48 +00:00
SongFerng Wang
a67d5e25a3
Merge "[MEP] The removale slot can read the esim card" into tm-dev
2022-05-27 14:58:43 +00:00
Betty Chang
e300781fb8
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794
Change-Id: I9fedeeaf397e15e8c6a9421604a0cf6def4c743c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 14:47:51 +00:00