Treehugger Robot
7f559ca540
Merge "Fix screen time not updated issues." into main
2023-10-10 09:02:09 +00:00
Chaohui Wang
db2f4b844f
Merge "Not call refreshStats() in setDuration()" into main
2023-10-10 08:04:10 +00:00
Zaiyue Xue
8e6a5db9a2
Fix screen time not updated issues.
...
When slotUsageData is null, the UI should update screen time to 0
instead of skipping update.
Bug: 304432148
Bug: 299801782
Bug: 301943900
Fix: 304432148
Fix: 299801782
Fix: 301943900
Test: manual
Change-Id: I25da1abf8ea79305ebf5468977b2a57ce917609f
2023-10-10 15:55:37 +08:00
Chaohui Wang
252450b5fc
Improve the performance of AppDataUsagePreference
...
We only need aggregated summary, but NetworkCycleDataForUidLoader loads
usage for all cycles.
Create AppDataUsageSummaryRepository to reduce the system api call to
only once.
Fix: 304421722
Test: manual - on AppInfoSettings
Test: unit test
Change-Id: I115dfb51dbf77ed3fdde985aa1a968ff7462bebc
2023-10-10 15:51:40 +08:00
Haijie Hong
a0230b9ba0
Merge "Make bluetooth toggle be on when Bluetooth is turning on" into main
2023-10-10 07:16:05 +00:00
Charlotte Lu
ed5c52f1eb
Edit flag namespace to settings_experience
...
Fix: 304433296
Test: Visual
Change-Id: I9d81e02d130afb5ab0e2344faaf4fb6ef9449b7c
2023-10-10 14:30:36 +08:00
Charlotte Lu
0730b167c9
Merge "Use Flags to switch apn insert." into main
2023-10-10 06:25:14 +00:00
Charlotte Lu
7e3b5f4dad
Add disableInit.
...
Fix: 304433155
Test: Visual Test
Change-Id: I61c478a0d21bd321ea806ae9bd5666675e85db73
2023-10-10 14:24:43 +08:00
Haijie Hong
8d0c67408e
Make bluetooth toggle be on when Bluetooth is turning on
...
The logic should be similar to the Wi-Fi one: https://android.googlesource.com/platform/packages/apps/Settings/+/refs/heads/main/src/com/android/settings/wifi/slice/WifiSlice.java#379
BUG: 293264131
Test: unit test
Change-Id: I1222f9f793b91d81d74ed9358f1b055d3049866e
2023-10-10 13:34:23 +08:00
Eric Biggers
938902d2df
ShadowLockPatternUtils: remove patternEverChosen methods
...
These methods are being removed from LockPatternUtils because they are
no longer used, so remove them from ShadowLockPatternUtils too.
Bug: 270013005
Change-Id: If196bbef4755c644b3188043ed47e99817bf1856
Merged-In: If196bbef4755c644b3188043ed47e99817bf1856
(cherry picked from commit 795a02c92a
2023-10-10 05:29:21 +00:00
Charlotte Lu
2faf4cdd57
Use Flags to switch apn insert.
...
Fix: 304184645
Test: Visual Test
Change-Id: Iedba1343e9987a87b1adf6c1f7a8150e647e73d5
2023-10-10 13:00:58 +08:00
Cassie Wang
760712201e
Add a config to show the Vpn options menu.
...
Bug: 290124499
Test: m -j32 Settings
Change-Id: I14d59b656e917f6fb7a495f14297c594a115c018
2023-10-10 13:07:00 +09:00
Treehugger Robot
f062d1cd6e
Merge "Telephony.Carriers.MVNO_TYPE is Deprecated." into main
2023-10-10 03:28:29 +00:00
Chaohui Wang
ceb23d4407
Merge "Unify the default template and title" into main
2023-10-10 03:27:50 +00:00
Chaohui Wang
7a0134f195
Not call refreshStats() in setDuration()
...
refreshStats() needs to be called on worker thread, and all usage places
call refreshStats() after setDuration().
So no need to call refreshStats() in setDuration(), this also prevent
ANRs.
Fix: 241167275
Test: manual - on dev options
Change-Id: I8f4ad57c3843f14f6baee1d06d29eea1341509f1
2023-10-10 10:50:34 +08:00
Charlotte Lu
2d029133f2
Telephony.Carriers.MVNO_TYPE is Deprecated.
...
Fix: 304180380
Test: Visual Test
Change-Id: Ibd1574e2f5004c27a4aafb94a679db5a60113c62
2023-10-10 10:33:15 +08:00
Automerger Merge Worker
97246649e4
Merge changes from topic "am-ed5d77f7685c443197cbca230cef63e8" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6eaeb26adb0ea17648df4b3e4d7886f109fbe94d75faf8d80c91033a2abc62df55e14e426f905aea0
2023-10-10 01:38:51 +00:00
Automerger Merge Worker
656d481e18
Merge changes from topic "am-a5286f069992436fa3bf3e411ca3a093" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a61e702e6f83f7b330feacb3e4d7886feb51dfd4e9a4e1dd587c1033a2abc684ed68cd4df67e1b0f26
2023-10-10 01:37:11 +00:00
Bill Yi
1c503fed67
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: eaeb26adb0 -s ours am: ea17648df4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I535c548c0dd8f36ea535afe5cbf6ba1b93e0887d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:36:55 +00:00
Bill Yi
fa5ac0872d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: 109fbe94d7 -s ours am: 5faf8d80c9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: Ic89ddcbeb378e22a233d15fed842e93d550c2aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:36:48 +00:00
Bill Yi
573c101095
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 2df55e14e4 -s ours am: 26f905aea0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105
Change-Id: I1d133f40becc7f75fb8c61d320c52f17caad4fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:36:27 +00:00
Bill Yi
f5617ef79d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours am: f7b330feac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I794b63cdb4c5a5da0f5ee8887903f89def325210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:32:57 +00:00
Bill Yi
2b4eba117b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours am: a4e1dd587c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I6a29fa615c0dad12dbe7ced8f68dc75207dbcf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:32:45 +00:00
Bill Yi
1c03b73998
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours am: f67e1b0f26 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105
Change-Id: Ib3e1723d543331ba49f7c29b9a1a7293ff8de868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:32:29 +00:00
Bill Yi
83ca01c4cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours am: 292fb5da73 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I8762d02906de08b38a0299488a5d68dfad20b59c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:32:05 +00:00
Bill Yi
e60a24fbb3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours am: fa9aef9061 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I340d935e94774b5a0bbe2eb1e2f30e6a24c25d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:31:55 +00:00
Bill Yi
ee91548952
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours am: c01f48c623 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105
Change-Id: I99a3e1662962c9bc00465bac19fad9890e593f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:31:39 +00:00
Automerger Merge Worker
5fbadb8fbb
Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d3259a58b1580371aaccb2480b8fb9bf01b73f33a9e86c8252e6fa
2023-10-10 01:30:33 +00:00
Bill Yi
68dcc0800a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours am: 651aaef998 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: I0954c56e681eea898e38a76b61dc283cca4c8e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:26:43 +00:00
Bill Yi
affc6a9688
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours am: 84970745cc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: I8f8ebaae898d447aaab09e2644591e6539831777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:26:31 +00:00
Bill Yi
fe96df972e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 8b1c1daa2c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: Ib4a837b192401ca8a7d35348b0ba4f07cae0d426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:26:29 +00:00
Bill Yi
4635c20976
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: 8ab6607212 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I1baddb104b760a23861d3d4c0d69265fde52f51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:26:22 +00:00
Bill Yi
211c0a6bb2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours am: fc51d3d77a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979106
Change-Id: Iace4128a50e6ad86077c7779eaf7e658eb6186b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:26:16 +00:00
Bill Yi
6d60af849e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 1339a18c72 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105
Change-Id: Ia2685a2492f898b211a427eec667c4c0a07693d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:26:02 +00:00
Bill Yi
1f9a5c2e17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours am: 9a58b15803 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: If1e45e4ed269879aa39630ceb08d0f0966a33d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:57 +00:00
Bill Yi
456d4cb9f9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours am: 0b8fb9bf01 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: Ie784f8e9d0fff6326ea107ed4085093d422f478b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:49 +00:00
Bill Yi
ea17648df4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: eaeb26adb0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: Ie7c189d95598eed503e96a109f03e79123406799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:34 +00:00
Bill Yi
9df69f1f12
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours am: 6c8252e6fa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979106
Change-Id: Icde5bee08f5ffce8283aace7b67f53ee0e327ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:30 +00:00
Bill Yi
5faf8d80c9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: 109fbe94d7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I6d0bdf241b4819096f50dfe571b52932c86a7b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:24 +00:00
Bill Yi
26f905aea0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 2df55e14e4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105
Change-Id: Ia44f3b174d7343bf423c08469cb8eca8582953e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:07 +00:00
Bill Yi
f7b330feac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I5a7a5153250df9443076617ce3932d2a59773cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:16:00 +00:00
Bill Yi
a4e1dd587c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I4cc49415609542c0a0ba8aed4c323fcf5cb0c3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:15:49 +00:00
Bill Yi
f67e1b0f26
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105
Change-Id: I170ade0484ffaedee08fbb8032ea4f21a98c079f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:15:34 +00:00
Bill Yi
9a58b15803
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: Ibdc00cfc887bb008f0656f5846f66aa8a5bd6d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:11:55 +00:00
Bill Yi
0b8fb9bf01
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: Ibe4fc099db631e426de1434e21a64d699c9b3677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:11:45 +00:00
Bill Yi
6c8252e6fa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979106
Change-Id: Ifc0ee1cf6df0f789bb642e600cf907282b801a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:11:29 +00:00
Bill Yi
292fb5da73
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: Ic38d4f4db764b5823f8d03e12b591fee292f0ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:09:50 +00:00
Bill Yi
fa9aef9061
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: Ic5a6a16d80ecab22ed4a71e48a80127b3fad671b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:09:39 +00:00
Bill Yi
c01f48c623
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105
Change-Id: I8d89f060276f9dd3cedb55e826e847cd4cb172f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:09:23 +00:00
Bill Yi
651aaef998
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: I7521add4b3e9244f740aabdcc9e8f3522a241ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:03:40 +00:00
