Commit Graph

115880 Commits

Author SHA1 Message Date
Kuan Wang
9059b26db8 Add logging for count of shown / hidden apps in Battery Usage page. am: 676bcedb85 am: 93c0d0227b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893207

Change-Id: I8014b3155c6f731aa88133c718c986b09893723e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 01:39:00 +00:00
Joshua Mccloskey
6d8f88e86b [automerger skipped] Merge "Add phone, tablet, device fp deletion strings." into tm-qpr-dev am: 8ff0234717 am: eafa298200 -s ours
am skip reason: skipped by user augale

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19929437

Change-Id: I4e5f4147ea3152853900ab3d3acd51816aa8231f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 01:38:15 +00:00
Kweku Adams
a277f4cdbc Merge "Allow updating app install reward values." 2022-09-14 23:45:30 +00:00
Automerger Merge Worker
bb05572061 Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp am: 808da23434 am: a75ff5a3fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: Ib50907e03280a47120e6fac8df4f7c47e4a71da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:37:40 +00:00
TreeHugger Robot
caa25c294e [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: 84fdac6e03 -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: I92b049306875e8e8d097b7261f014d75b5e53055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:37:23 +00:00
Automerger Merge Worker
451a5b8411 Merge changes from topic "am-c8328431a47c4eebb006716640e11064" into tm-qpr-dev-plus-aosp am: c570258cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: Ifbb729ac6119e0e3addd2d5dc3da1a9703074c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:23:38 +00:00
TreeHugger Robot
f23b9de58b [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: 8c7f8c8de9 -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: Icd5c0010cbdf10f287399600414d6ebd7ffe3094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:23:16 +00:00
TreeHugger Robot
1c8e5c243e [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: e4f166a93b -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: Ic1236b31d1c34b6ea41eb015ba075cb6372a972d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:12:10 +00:00
Bill Yi
b159737e35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: cd1753080f -s ours am: fd8f0fee80 -s ours am: ef92baaca9 -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: I560a9aa4dde615f0ec3e76fbfb22c6a5afec88fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:11:58 +00:00
Bill Yi
f1b861a001 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 92b538c0f0 -s ours am: 63fc658151 -s ours am: c0d4a1358a -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: I323606e8753e178d81f4227b1f012e9d083903b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:11:44 +00:00
Kweku Adams
fbded716fd Allow updating app install reward values.
Bug: 243987091
Test: modify values in UI and confirm settings values changed via adb
Change-Id: I4d2a4409883ec06b93f4fa55e3a46829e06fe68e
2022-09-14 19:58:00 +00:00
TreeHugger Robot
f221b3a898 Merge "Refine WifiTetherSoftApManager and DataSaverBackend to avoid activity leaks" 2022-09-14 17:19:38 +00:00
Angela Wang
673f40d4c8 Merge "Logs hearing aid information when a hearing aid is bonded" 2022-09-14 10:49:07 +00:00
Weng Su
2f55ae15f1 Refine WifiTetherSoftApManager and DataSaverBackend to avoid activity leaks
- Declare the service callback as static class and use WeakReference to avoid the callback link being occupied

- Use application context instead of fragment context to avoid context being occupied by external modules

Bug: 237273138
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest

Change-Id: Icca145b8ef08b9949feafbbd4e761f8d50c99181
2022-09-14 10:10:41 +00:00
Chaohui Wang
aea2e7cd2e Merge "Migrate UsageStats to Spa" 2022-09-14 08:38:28 +00:00
Chaohui Wang
5a99df9f0f Merge "Clean up some UnusedResources detected by lint 5" 2022-09-14 08:17:40 +00:00
Angela Wang
cf199c96bf Logs hearing aid information when a hearing aid is bonded
The information including device mode, device side, and entry page id where the binding process starts. Set the mapped bond entry from BluetoothPairingDetail into the cached bluetooth device and log it later when the device mode and device side is received after the hearing aid bluetooth profile is connected.

Bug: 237344016
Test: m statsd_testdrive & statsd_testdrive 513

Change-Id: Ie0432f7da4f29e89e47d0ad3d72a04a9f5ea83ae
2022-09-14 06:27:10 +00:00
Chaohui Wang
a179e04c66 Clean up some UnusedResources detected by lint 5
Bug: 234570979
Test: Manual with Settings App
Change-Id: Icd8df5fc8345a85b948dae3a41de85bf39b2cbc9
2022-09-14 13:54:41 +08:00
Xinyi Zhou
d0ee760ed2 Merge "Add back Fast Pair MainSwitch logic" 2022-09-14 04:18:10 +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
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: d04dc24d56 -s ours am: dd445a736a -s ours am: 025c77a1e7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours am: 751b145c67 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours am: 71ff19c956 -s ours
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: d04dc24d56 -s ours am: dd445a736a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours
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
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
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