Treehugger Robot
8f793f5e4f
Merge "Fix the IllegalArgumentException from RecyclerView"
2022-09-14 03:55:49 +00:00
Chaohui Wang
645aa5d311
Merge "Clean up some UnusedResources detected by lint 4"
2022-09-14 03:28:33 +00:00
Stanley Wang
cbf765d03a
Merge "Fix the problem that sim2 can not copy imei"
2022-09-14 02:38:06 +00:00
Kuan Wang
93c0d0227b
Add logging for count of shown / hidden apps in Battery Usage page. am: 676bcedb85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893207
Change-Id: I52977900a9f669fa7b31c2c72cbd5ec10646a28a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 02:36:50 +00:00
Kuan Wang
676bcedb85
Add logging for count of shown / hidden apps in Battery Usage page.
...
Bug: 245455490
Test: manually
Change-Id: I7342e822f00f9a0aedcef592cae9809251518812
2022-09-14 02:09:16 +00:00
Zekan Qian
d488206364
Merge "Add debug page in Settings"
2022-09-14 01:55:02 +00:00
Bill Yi
c1cf6de04d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I08d15308d2597efc1683aa3ca74eaf6ca69bab47
2022-09-13 18:09:00 -07:00
Joshua Mccloskey
eafa298200
Merge "Add phone, tablet, device fp deletion strings." into tm-qpr-dev am: 8ff0234717
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19929437
Change-Id: Ida9695d5f938e31f27888c7e1c90600b17fd0804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 23:46:06 +00:00
Joshua Mccloskey
8ff0234717
Merge "Add phone, tablet, device fp deletion strings." into tm-qpr-dev
2022-09-13 23:13:15 +00:00
Automerger Merge Worker
a75ff5a3fb
Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp am: 808da23434
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: If583d5d86e5fd65a3f0a8a8196c07d6f42bd6c8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 20:26:30 +00:00
TreeHugger Robot
84fdac6e03
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours am: 9dbda868e8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I514e8480d1735ac3e449035f76f580b60901aac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 20:26:12 +00:00
Automerger Merge Worker
c570258cf0
Merge changes from topic "am-c8328431a47c4eebb006716640e11064" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56dd445a736a025c77a1e7a4f092c748ffd1ed3a00751b145c67f3457e40805020aeaf5b71ff19c956
2022-09-13 20:21:05 +00:00
TreeHugger Robot
e4f166a93b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: 73cfa8885a -s ours am: 338c608012 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I6fab242aaf3eeafaaa122b72a466f4c044c3bb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 20:18:29 +00:00
Bill Yi
ef92baaca9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: cd1753080f -s ours am: fd8f0fee80 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: Ib99a187b3f747c5caa785e0b3600f22d639e2382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 20:18:15 +00:00
Bill Yi
c0d4a1358a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 92b538c0f0 -s ours am: 63fc658151 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: I7f184e13907d499238356ab0448e2d3fa4847446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 20:18:03 +00:00
TreeHugger Robot
8c7f8c8de9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours am: 025c77a1e7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: Id58fcf70171d1ef37b47d72907dc9cb8745422c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 20:17:09 +00:00
Bill Yi
d68b27fed7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours am: 751b145c67 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I42ec578c2c20de4c955d5bb69e02ab6064683942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 20:17:01 +00:00
Bill Yi
bf5d13159f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours am: 71ff19c956 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: Ie3e390ae9167520d0d5c1dae5152fc99afda7c69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 20:16:42 +00:00
Xinyi Zhou
827267dc69
Add back Fast Pair MainSwitch logic
...
Bug: 203579197
Test: -m
Change-Id: I861ece6cf6dd50c982fccc56f84f63243120e250
2022-09-13 12:10:47 -07:00
Automerger Merge Worker
808da23434
Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56dd445a736aa4f092c748ffd1ed3a00f3457e40805020aeaf5b
2022-09-13 18:54:26 +00:00
TreeHugger Robot
338c608012
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: 73cfa8885a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I463ef303e41f838db56589f2e01d07168fe79cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:51 +00:00
Bill Yi
fd8f0fee80
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: cd1753080f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I7cb16d01b31890db0f2b5bc585120d9e52491b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:37 +00:00
TreeHugger Robot
9dbda868e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I22d4e5beabb84f2f7eb204df23f62aee984fd82f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:32 +00:00
Bill Yi
63fc658151
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 92b538c0f0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: I204587378c45b54606f0faea021e442f0d5fffd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:25 +00:00
Bill Yi
7334ac9765
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I54e65f48186d28ab71978cadb4d5aa6c9cb76ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:18 +00:00
Bill Yi
94b95cd07c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: Ifb42aaa4bc5b011d9c5397096e341818c06989bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:06 +00:00
TreeHugger Robot
025c77a1e7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: Ibe4b17fc3d476b322f38ec0dc27291568bb2a386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:50:49 +00:00
Bill Yi
751b145c67
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I66e82dbfe3e615faff30d30eca1a883e233ae660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:50:34 +00:00
Bill Yi
71ff19c956
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: I003a3441594793b6ec60375d7fbe72d09cec5c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:50:24 +00:00
TreeHugger Robot
dd445a736a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I7dcc61b6ab4486462819e00f32ad0257eab4bac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:40 +00:00
Bill Yi
ffd1ed3a00
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I727cf5bfa8c148e0f589bd8c8e87aa8d59fd7c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:26 +00:00
TreeHugger Robot
ca6138e6b8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I2b18a6b2df07cee43045a0f33d4566d63ba1e01f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:24 +00:00
Bill Yi
5020aeaf5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: Ib510c3a81b652a330367a43560050f78531f34ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:14 +00:00
Bill Yi
40dbc67c91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I4130101fdc714dc0d4f53b54a06b0d5739c721d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:12 +00:00
TreeHugger Robot
73cfa8885a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I4b0bb9c5644698a69ea1bac97dab0d14a99163fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:07 +00:00
Bill Yi
c76428d937
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: I1c0fbcb9c835fbf176cc04949288d1ef9557fb48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:10:58 +00:00
Bill Yi
cd1753080f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I28cc254ac98e63f6ca79b17a0e0938a5a8961ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:10:55 +00:00
Bill Yi
92b538c0f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: I1146a9d8ceea29a070889cab45fe93aeb1189b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:10:40 +00:00
YK Hung
e9ca70362c
Merge "Add fade in / out animation for battery usage hourly chart." into tm-qpr-dev am: 2a33c12028 am: 63dd5861a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19897905
Change-Id: Ieb54a462cc5cc5bc1f7135b92a010953cf365134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 17:40:03 +00:00
TreeHugger Robot
d04dc24d56
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-13 17:20:55 +00:00
YK Hung
63dd5861a9
Merge "Add fade in / out animation for battery usage hourly chart." into tm-qpr-dev am: 2a33c12028
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19897905
Change-Id: I78fd0896d72ab78b8a7ad676ae6c1beab3c260fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 17:10:17 +00:00
TreeHugger Robot
a95e746231
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-09-13 16:53:33 +00:00
TreeHugger Robot
de45148d16
Merge changes from topic "tc_change_22091207_22"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 35b51c6a87
2022-09-13 16:53:33 +00:00
YK Hung
2a33c12028
Merge "Add fade in / out animation for battery usage hourly chart." into tm-qpr-dev
2022-09-13 16:44:17 +00:00
Chaohui Wang
7ef27fbe85
Clean up some UnusedResources detected by lint 4
...
Bug: 234570979
Test: Manual with Settings App
Change-Id: Icc21ef3bedc7a39e7841271f51b77e9b543f6f0f
2022-09-13 20:00:38 +08:00
Stanley Wang
9a325cee1f
Fix the problem that sim2 can not copy imei
...
Set the CopyingEnabled value to true.
Fix: 239327568
Test: manually test and review UI
Change-Id: Id0025588aa4a93ec06f976c2569404627883c25a
2022-09-13 18:55:07 +08:00
Zekan Qian
eaa0ca22e7
Add debug page in Settings
...
Bug: 244122804
Test: manually build SettingsGoogle
Change-Id: I4853e17028dfe0eed4342b4691962b508bc87357
2022-09-13 10:19:37 +00:00
Chaohui Wang
186eb66c4f
Add 4 app op permission App List
...
- All files access
- Display over other apps
- Media management apps
- Modify system settings
Bug: 235727273
Test: Manual with Settings App
Change-Id: I60abb44558f535d5e26d498164d5429ede4033f8
2022-09-13 17:24:48 +08:00
Shen Lin
c463aee2b8
Fix the IllegalArgumentException from RecyclerView
...
Attempt to remove the animator as early as possible to avoid a RecyclerView crash.
Bug: 246411107
Related bug: 184214085
Test: manual.
Change-Id: I8fcb06836217f4de200a53bb88a1a0b5e42bbe21
2022-09-13 08:46:30 +00:00
Chaohui Wang
7f82ea1854
Merge "Clean up some UnusedResources detected by lint 3"
2022-09-13 07:55:18 +00:00
