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
TreeHugger Robot
93cb240fc3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1d302c6fd8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19947547
Change-Id: Iab1c5cba53b72345113da45fcb34a97136044a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 21:19:05 +00:00
Bill Yi
db799fa99c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1cf6de04d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19947547
Change-Id: Ie0d6bceed0363591b93a901548dfb7285657f318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 21:18:50 +00:00
TreeHugger Robot
1d302c6fd8
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-14 20:45:40 +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
Hugh Chen
f8704add51
Add Spatial audio settings for LE Audio devices
...
- Adds TYPE_BLE_HEADSE, TYPE_BLE_SPEAKER and TYPE_BLE_BROADCAST for
display Le audio devices.
- Adds TYPE_HEARING_AID for display hearing aid devices.
Bug: 244528781
Test: make -j64 RunSettingsRoboTests
Change-Id: I1278a5e0c93fdc5a4873df68032128ffedfe72d6
2022-09-14 12:00:45 +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
Zaiyue Xue
83ef9001e7
Merge changes from topic "accessibility1" into tm-qpr-dev am: 9b24df2c38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19771692
Change-Id: I80680875b02983c58a9e3c324dc13e055ad75fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 06:09:40 +00:00
Zaiyue Xue
9479b18cf9
Support accessibility for battery chart (1) am: 9c962b03e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764112
Change-Id: If91f5422518ff8cc76dcc5c216a83a70dd7a337d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 06:09:35 +00:00
Treehugger Robot
912fbfe668
[automerger skipped] Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee
am: ca3213bf88
am: be35244362
am: 9c695a54f5
-s ours
...
am skip reason: Merged-In Ib225d185b6f15463f4fae809e0cdaa25920d52af with SHA-1 d55a7067aa
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309
Change-Id: I2afdae09b71b3be22538b6433cc44a615e7b8ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 05:56:52 +00:00
Treehugger Robot
78b58e08f5
Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f
am: 227b8f0272
am: 4aea873647
am: 68a63e0280
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421
Change-Id: I0580d5dc5853ca5ed43a023aa5875750ed104f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 05:56: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
Zaiyue Xue
9b24df2c38
Merge changes from topic "accessibility1" into tm-qpr-dev
...
* changes:
Support accessibility for battery chart (4)
Support accessibility for battery chart (3)
Support accessibility for battery chart (2)
Support accessibility for battery chart (1)
2022-09-14 05:46:17 +00:00
Treehugger Robot
9c695a54f5
Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee
am: ca3213bf88
am: be35244362
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309
Change-Id: I11dd065ebb4f1092207fae5b2b78a62f26049a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 05:28:37 +00:00
Treehugger Robot
68a63e0280
Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f
am: 227b8f0272
am: 4aea873647
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421
Change-Id: Iaad1dacbe8f2b477876bc0c12a49bafdfc4dd449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 05:28:17 +00:00
Binyi Wu
2c1b1aa813
Prevent intent defined in AccountPreference from leaking access
...
Intent defined in AccountPreferences can grant Settings protected ContentProviders' access to authenticator app. We'll explicitly set an empty ClipData to avoid being used for unexpected access grant.
Test: manual, refer to #comment5 in bug for repro steps
Bug: 220733496
Change-Id: I85c22c9a7d72b8a55472d366d8adb6a75ac5c8a5
2022-09-14 05:04:35 +00:00
Treehugger Robot
be35244362
Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee
am: ca3213bf88
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309
Change-Id: I2562d3ac792867e5b19539ce82137b3fc2dfe40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 04:58:18 +00:00
Treehugger Robot
4aea873647
Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f
am: 227b8f0272
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421
Change-Id: I171aa7c274c51bf67f5a34740782c7ce78f88a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 04:57:58 +00:00
Treehugger Robot
ca3213bf88
Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309
Change-Id: I87f90878ea379a8f27bd57c13dc777803ec248a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 04:28:52 +00:00
Treehugger Robot
227b8f0272
Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421
Change-Id: Iad4eab5a28611ea7e8473f34ebb8af9b00158a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 04:28:19 +00:00
Xinyi Zhou
d0ee760ed2
Merge "Add back Fast Pair MainSwitch logic"
2022-09-14 04:18:10 +00:00
Treehugger Robot
8b0e08ecee
Merge "Fix compile warnings due to non-varargs call of varargs method"
2022-09-14 04:16:30 +00:00
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: 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