Daniel Huang
67e1c060dc
Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb
am: d7bec8275e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896
Change-Id: Ic9de27ea9701df5ca3bbe7cec284f003065ebdda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 09:39:30 +00:00
Weng Su
f65c4530e4
Hide carrier service package in Wi-Fi data usage settings
...
- When there is no specified SubscriptionInfo, Wi-Fi data usage will be displayed. In this case, the carrier service package also needs to be hidden.
- Fix failing test cases in DataUsageListTest
Bug: 273167633
Bug: 280021214
Test: manual test
Change-Id: I66ff8a28d9e7f7db77c8a210cb36676a07fc2c7d
2023-05-10 17:30:01 +08:00
Marcello Galhardo
852c116fc4
Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850
Change-Id: I0a93a9691687eb532324a1b19a478e2447f36700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 09:26:35 +00:00
Marcello Galhardo
f5a3485300
Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev
2023-05-10 09:23:52 +00:00
Derek Jedral
9340c6f9b7
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
am: fff41e6aa3
am: 6b96b8fc4f
am: 27b5b2d1ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: I045d924f9af06aa7ec3ab18f421b72ce7a42cdd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 09:00:26 +00:00
Daniel Huang
d7bec8275e
Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896
Change-Id: I608e726a2ac9c92b9a565c938688430508276a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 09:00:16 +00:00
Daniel Huang
2c30f604b4
Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896
Change-Id: Icbc09be2306b0a5a6bcc2d55aa7777acd1d8cfb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 09:00:09 +00:00
Daniel Huang
52567d5ce9
Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896
Change-Id: I2c554ed2dbe696f2d8c10b5860b6796eba2dccf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 08:56:36 +00:00
Guangjie (Jerry) Shi
c6c4a3a2da
Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
am: 54a6dd7217
am: 7045faeae1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101
Change-Id: Ic49765df91b4b932251c9e44b41696dd494d8e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 08:55:21 +00:00
ykhung
981726c0e7
Move duplicate operations in the BackupHelper to OptimizeUtils
...
Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
adb shell bmgr restore 34bbf79f36c8ed43 com.android.settings
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I2bc8842849998841aa38af3564f51bb81606c8cf
2023-05-10 08:41:58 +00:00
Evan Laird
328e1cb636
Merge "Set default value of battery percent preference" am: 145caf7d4e
am: b4d2e7da30
am: ff6f9337c8
am: 930bee6167
am: 2785a8410d
am: 4c0fb53033
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617
Change-Id: I29d607cfe8128df313d7059b4043d4a1c75ebd0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 08:28:01 +00:00
Daniel Huang
28aa2964fb
Merge "[Fixed] UI issues after rotation" into udc-dev
2023-05-10 07:59:20 +00:00
Guangjie (Jerry) Shi
27b27f8143
Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
am: 8e70a25893
am: d8bfff3134
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101
Change-Id: Iaebddf667cded193f7d571bd5696217f801c216e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:58:02 +00:00
Guangjie (Jerry) Shi
7045faeae1
Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
am: 54a6dd7217
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101
Change-Id: I3763ee97b9bfb17e1aa2f654abb4e059532d1ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:57:59 +00:00
Chaohui Wang
e598d5a065
Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
am: e98635c9fd
am: b03ee1ad90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494
Change-Id: Id8c9e51796dad8774392df0afa5a1f8f8234ec9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:57:52 +00:00
Guangjie (Jerry) Shi
15eb2fd250
Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
am: 8e70a25893
am: 02f56a627a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101
Change-Id: If2b67e526591a8468b098626299dc990d238d78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:37:14 +00:00
Chaohui Wang
16edb9b32e
Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
am: e98635c9fd
am: 9ea3fb9e53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494
Change-Id: Iefd82fa6ea75e2b998e8478f03182fe921be6d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:36:32 +00:00
Chaohui Wang
6a8a4127c0
Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
am: 8178129fca
am: 7b7ff6e1db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494
Change-Id: I586069702c45a8df6a7713fa3032fd55323bd784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:31:37 +00:00
Guangjie (Jerry) Shi
02f56a627a
Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
am: 8e70a25893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101
Change-Id: Ibc4efb04f0c68aa79883cb4d7fe37777c38ffc41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:31:33 +00:00
Guangjie (Jerry) Shi
d8bfff3134
Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
am: 8e70a25893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101
Change-Id: I312a5f5d30b89205938d43567a1a6946a46bc6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:15:30 +00:00
Chaohui Wang
b03ee1ad90
Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
am: e98635c9fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494
Change-Id: I96513932ba3e689f6d69400f134082d22d64019a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:15:09 +00:00
Guangjie (Jerry) Shi
c93df29409
Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101
Change-Id: Ica8ac64f4e85934d11e556ff214db60afa75b8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:14:54 +00:00
Guangjie (Jerry) Shi
8e70a25893
Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101
Change-Id: I79921f8f98396e741852d68f81b1d537ba0e87f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:14:52 +00:00
Chaohui Wang
9ea3fb9e53
Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
am: e98635c9fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494
Change-Id: I8a8e870d4a36effc36110e3bde00b4b7fa0fca89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:11:51 +00:00
Guangjie (Jerry) Shi
54a6dd7217
Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101
Change-Id: I6063d2795be8883e3d46b7a3290a32cb1addc3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 07:10:32 +00:00
Chaohui Wang
7b7ff6e1db
Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
am: 8178129fca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494
Change-Id: I425facb683b1af1816c7ae81faf3e91a2fa73c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 06:56:54 +00:00
Guangjie (Jerry) Shi
ba44f13498
Merge "Add null check for settings default preference controller" into udc-dev
2023-05-10 06:30:37 +00:00
Chaohui Wang
e98635c9fd
Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494
Change-Id: Ib24e2c605b64bc20abf7b1cdf2a1af3dee2e0346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 06:15:55 +00:00
Chaohui Wang
2bf036e61c
Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494
Change-Id: Ia36b1bc8d0263d26f0550a0dbda3a5189c2e49a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 06:14:43 +00:00
Chaohui Wang
8178129fca
Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494
Change-Id: Idd096dfa879208010ce24ae96432d42ceae572d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 06:06:48 +00:00
Chaohui Wang
6619994919
Merge "Fix button not clickable in sim confirm dialog" into udc-dev
2023-05-10 05:26:02 +00:00
Chaohui Wang
9beb5605b8
Fix button not clickable in sim confirm dialog
...
Bug: 261994361
Fix: 280787593
Test: Manually with Talkback on
Test: Manually with Talkback off
Change-Id: I23d4ea816eb534dcde48cc2ebc6bb4a9770d107e
2023-05-10 04:15:37 +00:00
Jerry Shi
21df117d52
Add null check for settings default preference controller
...
Test: local built and tested
Bug: 281771729
Change-Id: Ib3467c22262125ac7dac00eb9ea68516ddf53b5a
2023-05-09 21:00:32 -07:00
Bill Yi
b083926666
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifce7a05d9ba240eced8526d739ddbfdd8a5cdc80
2023-05-09 20:03:33 -07:00
Bill Yi
e8ad3011f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6c778688723f5fe4b616809c53dd88ece43fc4af
2023-05-09 20:02:44 -07:00
Bill Yi
54d9caa29c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8077f693df23f73cd069ec7a28a59b6689de2ed0
2023-05-09 19:56:54 -07:00
Bill Yi
759fc346cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0011aa8a1c919344865626e4e263080904cd8341
2023-05-09 19:55:12 -07:00
Bill Yi
a52301e2f5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I13524991f01dda2ae916dedbc6c62598cc7e075a
2023-05-09 19:53:46 -07:00
Bill Yi
efe251ca9d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3c5403f2740d536e60f87ae605ebe1d6cd13dacf
2023-05-09 19:52:57 -07:00
Bill Yi
606f49981b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id26e7c7d2af276519fe72823d2b0288898a8c72b
2023-05-09 19:51:19 -07:00
Bill Yi
b6efea437a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9247eac3406d8d55e580a2012484fb58dc72aa4e
2023-05-09 19:49:52 -07:00
Bill Yi
66c1c35717
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I24e3086598c78dbdd81a99fa8355dba0615adea6
2023-05-09 19:20:45 -07:00
Bill Yi
6b8c61c9a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ica68575ce29c2ca9f82bfc8a694750f589fbb492
2023-05-09 19:19:35 -07:00
Bill Yi
13c4c2accb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4df0fe515c3acf2eddfeabef5b6088f437ad1b8d
2023-05-09 19:15:29 -07:00
Bill Yi
227df01c9b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibd86c070b71afe024df51354f05d5dc5313e5efd
2023-05-09 19:13:07 -07:00
Bill Yi
e69bec0564
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7cdbc4d2562b4104a9de90f1f97b67eadcc4ad1
2023-05-09 19:10:50 -07:00
Bill Yi
7a494fc7c5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I041ed592d479aeb038cb23092fa85b14d71df157
2023-05-09 19:08:51 -07:00
Bill Yi
f6e1ce0079
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If67335f6cb1c4d116442209acd6161b966e5560c
2023-05-09 19:07:40 -07:00
Bill Yi
be6f57545f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33712e7c3fd9062f28b3043d2dd6189a52532254
2023-05-09 19:06:37 -07:00
Bill Yi
63af1d8683
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id5b16e70d8c5cc99699281eed833bcabbcd8e8aa
2023-05-09 19:04:28 -07:00