Bill Yi
63f15c33d9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b
-s ours am: 95fef514c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280
Change-Id: Ic7b942b83171e4032a767c985d1b98ebdc72887f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 00:14:47 +00:00
Bill Yi
95fef514c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280
Change-Id: I1a14edab2cb0cc8d0878cc0a0195db8b8ae816c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 23:50:35 +00:00
Bill Yi
8cfc636454
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415
-s ours am: 6620ba750b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696259
Change-Id: I5ac5e91be389bf3a7c8ff54c6f8c8bd924c35fd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 23:04:01 +00:00
Bill Yi
6620ba750b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696259
Change-Id: I30af08bada2f825641e1dc015b753bd242b63315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 22:40:56 +00:00
TreeHugger Robot
70cdd5c5b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: I1d7afd78b111c3fa396339a430c6e2daf6d40140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:49:12 +00:00
Bill Yi
8a85b26086
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: I0ec8e5a382eb8887ee7fedc3acfe14d8e21e6158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:49:05 +00:00
TreeHugger Robot
c705beea0d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-01 19:23:59 +00:00
Joshua Mccloskey
3dd64a3e25
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: Icd03348aae7c7f2814a4b00244016caaf8f6bbf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 18:53:17 +00:00
Joshua Mccloskey
14a5aded8f
Merge "Ensure lottie animations are not empty." into tm-dev
2022-06-01 18:02:39 +00:00
Chaohui Wang
c308cad5c4
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I2b28f1f5052b553accc273ac356bd47ea832e805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 12:37:45 +00:00
Chaohui Wang
9ada0accef
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev
2022-06-01 12:24:24 +00:00
Bill Yi
a3d586794b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id5c20332cf35d47975bb187aa64db2045acaebd3
2022-06-01 03:47:38 -07:00
Bill Yi
3466df0415
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9c0c9eb87ae757d27c2917878e21cb2a7b3bc217
2022-06-01 03:43:59 -07:00
Bill Yi
7e605531d0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I577bf242a12cc6c991af536908032b74cf248c93
2022-06-01 00:12:09 -07:00
Chaohui Wang
f1487a7661
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I649d3486aa2228af4d68dc1a80b414fe36510c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 02:50:22 +00:00
Chaohui Wang
71fe20ea8b
Merge "Fix flicker in Dark theme" into tm-dev
2022-06-01 02:35:51 +00:00
Joshua McCloskey
68f6089745
Ensure lottie animations are not empty.
...
Test: Verified device doesn't crash in AOSP when lottie
animations are empty.
Bug: 228284341
Change-Id: If39096b3169c4956cb7f3ec66c4df58e41c66e86
2022-06-01 01:01:12 +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
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
Chaohui Wang
75e4028b3e
Clean up DarkUIInfoDialogFragment
...
The usage of this dialog is removed in
Change Ie2cf147de53385ae0c626c8472306f1b85317686
But this dialog is created (but not show) in DarkUIPreferenceController
each time dark mode toggle is turned on by user.
So clean this up.
Fix: 234419979
Test: make Settings
Change-Id: Icdc9d7a4fb77dc8b2a3f1a9d8e3f40fc0af4917d
2022-05-31 17:58:05 +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
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
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
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
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
Treehugger Robot
24f96c2c2e
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info"
2022-05-30 03:01:23 +00:00
TreeHugger Robot
460dcee74b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: If9a0a56197a12a7d7bc178d0bec11559e8d7c9e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:56:21 +00:00
Bill Yi
496b722a23
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: I5cce0ab8e7413f6e3ddf4fe7b1cd0321d3561fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:56:15 +00:00
TreeHugger Robot
7307f75d1e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627432
Change-Id: I6eb2fd9487f6c77e5d62e5c0981d77ed3a977d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:56:00 +00:00
Bill Yi
684e2ab4bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627432
Change-Id: I32a92c567c667bd8a987b99d61c8fb01f9b058c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:55:36 +00:00
TreeHugger Robot
8720510d2d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-27 16:45:14 +00:00
TreeHugger Robot
a55b8573ef
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-27 16:45:14 +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
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
81d910a3bd
[automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487
am: 640e337b19
-s ours
...
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107797
Change-Id: I024566b56adef549b2992c235d4b202c00c7743f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:34:04 +00:00
SongFerngWang
0cdfaf2eed
[automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7
am: 5de8fbc299
-s ours
...
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: I790378343eefb8e03232fe325e34209eb290557c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:34:02 +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
Betty Chang
34c513f0d4
[automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d
am: e300781fb8
-s ours
...
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794
Change-Id: I1e1d2af2be4b97cbbeaa579963a7865f1c25ba40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:03:07 +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
Zoey Chen
badca36723
[LeAudio] Remove the QrCamera and decorateView in Settings
...
Bug: 214340362
Test: Manual test
Change-Id: Ibc29f0e90af28e14a11164fa8940920745545c7e
Merged-In: Ibc29f0e90af28e14a11164fa8940920745545c7e
2022-05-27 22:39:58 +08:00
Betty Chang
e5a21d345d
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT"
2022-05-27 14:30:02 +00:00
Tsung-Mao Fang
40fbcf333f
Fix can't change notification sound for work profile.
...
Use correct user id context to query the type,
so we won't get empty result unexpectedly.
If we get the null result, then we won't set sound sucessfully.
Fix: 233580016
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
2022-05-27 21:13:33 +08:00
Chaohui Wang
c20f0cabf7
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: Ie214b97a1019488909831453470f0d250c11913f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:33:25 +00:00