Matías Hernández
7b36addbb2
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours am: b971690a4e
-s ours am: d185f3aebf
-s ours am: 897c8321a6
-s ours am: 14c85fff7d
-s ours am: 41d3ecca1c
-s ours am: 4226b5bb24
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Idbfb483da8370a173c35b20c9c61563913455e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:04:38 +00:00
Matías Hernández
6ca31b9630
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 0166bcc776
am: 46cdbed02e
am: a820fd4bce
am: 0bdda899d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ia4171da942ba43cb37e6540a3e484e86a445684f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:04:19 +00:00
Matías Hernández
f5355dbb51
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 2b1faa0aea
am: dcbe38baa9
am: e8cfc9cb3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I152c75f7bde652a89db3780858914d31751b2ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:04:00 +00:00
Treehugger Robot
7abcb94693
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725
Change-Id: I2cc82b781919c303a70bcdb39c162d5a68fa7e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:01:44 +00:00
TreeHugger Robot
5eb79cef8c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c
-s ours am: 1bc160c342
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: Ib0c728b5ef5b783e5c713622a78de6fe2ae5f66e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:40:50 +00:00
Bill Yi
4b303c23bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff
-s ours am: 48534e61a8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: I791a55f652eb93e20929a9bbf7c2acef5e39dc67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:40:46 +00:00
TreeHugger Robot
fa3f43793d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b
-s ours am: 636c7ba7c1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: I32bc3a02e901ec5103dc0015a29ef383832f6076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:40:39 +00:00
Bill Yi
85728f90a6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b47c44e4dd
-s ours am: 133e504b7e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: Icde1dd8c8e1eab23890747ca16deca7f935a4fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:40:07 +00:00
TreeHugger Robot
305d40b7cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c937ce7a22
-s ours am: 9d9a674b40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664036
Change-Id: Ifa8edaeb04d559329a2949f94d61b1a9ba248fc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:39:47 +00:00
Bill Yi
2de76698bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3
-s ours am: f859b36ddb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664036
Change-Id: Ib999ca4907180fef9b1947bdc0c0714b0d1f8a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:39:32 +00:00
TreeHugger Robot
1bc160c342
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: I7a65d2d7176fa864f1133165680d64c6424f3747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:03:03 +00:00
Bill Yi
48534e61a8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: I2ab2b12c9e803664792e848a06c706255df36362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:02:58 +00:00
TreeHugger Robot
636c7ba7c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: I2d790bcc16451d6774c135fa36c99a79a7304313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:02:52 +00:00
Bill Yi
133e504b7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b47c44e4dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: I589fbeeaf83e149aea616634f01d0c81e2321826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:02:20 +00:00
TreeHugger Robot
9d9a674b40
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c937ce7a22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664036
Change-Id: I937087f8bd1fd457a00ade60bf0734aad317e2a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:02:01 +00:00
Bill Yi
f859b36ddb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664036
Change-Id: I136aeaefefff80d8a6ee29236d0f5b623d50a446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:01:45 +00:00
Yi-Ling Chuang
2a9b9cfd4c
Update BatterySettingsFeatureProvider interface
...
Added context to each method for more flexibility.
Bug: 276399056
Test: robotests
Change-Id: I0bbf8841775bc2f584d66c59c2c78ed4e5c951c2
2023-06-17 12:49:46 +08:00
Julia Tuttle
b23136041d
Fix colors in importance and conversation priority preferences
...
This would have been simpler and faster, but the ChannelPanelActivity
was giving me a context where Material colors always inflated in light
theme even if the device was in dark theme, so I had to work around it.
On the plus side, whoever next needs to change these colors will find
them neatly organized in themes.xml!
Bug: 284380876
Test: manual
Change-Id: I2eee877fe44d307a96d60168d0317444ff002669
2023-06-16 19:17:09 +00:00
Chaohui Wang
c91d017080
[LE Broadcast] Fix crash when scan QR code
...
Crash happens when rotated screen.
QrCodeScanModeFragment should only have default constructor.
Remove unused params to fix.
To start this page,
adb shell am start \
-a android.settings.BLUETOOTH_LE_AUDIO_QR_CODE_SCANNER
Fix: 287363885
Test: Manually
Change-Id: I3c4bcfdb8ae6ddf750e16d8e7565cb9d45d11788
2023-06-16 16:10:53 +00:00
Tetiana Meronyk
5aca5fbecd
Merge "Add padding to dialog" into udc-qpr-dev am: e992927655
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23710326
Change-Id: Ide345f8e12db9dec8c2eadc7b7680ca14d8f4106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 12:25:13 +00:00
Tetiana Meronyk
e992927655
Merge "Add padding to dialog" into udc-qpr-dev
2023-06-16 11:56:04 +00:00
Chaohui Wang
78981afdc2
Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196
Change-Id: I8746fd67255bd0799307f403f132e5a1692e41b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 08:40:02 +00:00
Chaohui Wang
879ff5f271
Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev
2023-06-16 07:59:01 +00:00
Treehugger Robot
068edcc9ec
Merge "Guard slices from being requested by guest user" into udc-qpr-dev am: 9718f0e04f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578868
Change-Id: I0f964c6032f300a82a8873453c78060e131e455e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 02:05:03 +00:00
Treehugger Robot
9718f0e04f
Merge "Guard slices from being requested by guest user" into udc-qpr-dev
2023-06-16 01:14:40 +00:00
Treehugger Robot
d918700749
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours am: ee8cd42af0
-s ours am: 2f6b7bea9b
-s ours am: 474a9393c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I3a19597528011967646ef3183f8557e9ad1f8e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:07:11 +00:00
Bill Yi
20ff3de948
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours am: 4368d3a79a
-s ours am: 39dbfc2e78
-s ours am: 042c7ca3f3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I38539bec85a66c499fe265bb73962654d8d6581a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:07:09 +00:00
Treehugger Robot
26f930e91f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours am: a7bcd85abc
-s ours am: 36f6b1720a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I43d600caa9e303cc411f6d426009ed504938ad51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:06:13 +00:00
Bill Yi
ea545a70a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours am: ee15b19128
-s ours am: 51f878871b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I7d97d5cf7144e9087aae1d9b716d1e3a81b0d10c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:06:06 +00:00
Treehugger Robot
297f578098
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours am: 3ea3bb83ae
-s ours am: a68566dd5c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: I6941d55b07d2a490819d1e81b66e925a68b71cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:06:01 +00:00
Bill Yi
f2da605d4c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours am: 0138ef4a5e
-s ours am: f8cbacdd78
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ie2bc4f8150770b8152ccd3d5a40594047a98ca2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:05:42 +00:00
Treehugger Robot
a16ec14f18
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours am: 41bd0f8ae1
-s ours am: 2760803621
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I3b54e4dc10760f8de3b76bb3efe1f95f22db6dfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:05:23 +00:00
Bill Yi
469b01963a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours am: bd6c412717
-s ours am: b7628ea90a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: Iaa5e3aa528774816bb8e887d76ebb91a22289e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:05:05 +00:00
Zaiyue Xue
f727ada668
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
-s ours am: 8cbeaf6a74
-s ours am: a6c104de54
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: Id82b0a154d2d8df0c327350f7d016f2c68ca1a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:03:46 +00:00
Zaiyue Xue
5d9c185f32
[automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc
-s ours am: d593cb5284
-s ours am: fb9bc753fe
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I1d3820ccd0cda90a5052e9a9e891d004c0430e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:03:43 +00:00
Treehugger Robot
12451957a9
Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
am: 2f87be66ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143
Change-Id: I31f631bb61f85d9eb5116bbee7e26c1cef936dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:03:34 +00:00
Wenhui Yang
df8382905c
Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba
am: 8513da9a31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227
Change-Id: Id73a846a03ec02db5805cc0a7b58c3768e651071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 23:03:24 +00:00
Treehugger Robot
474a9393c8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours am: ee8cd42af0
-s ours am: 2f6b7bea9b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I001e19d72c81ff2faf24d79ac7ade1899fc11b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:19:25 +00:00
Bill Yi
042c7ca3f3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours am: 4368d3a79a
-s ours am: 39dbfc2e78
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I5b7fbb5b2a749ac243a6265fffed30f849558836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:19:22 +00:00
Treehugger Robot
36f6b1720a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours am: a7bcd85abc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I607b78b45ccb32ca971b04188c5ed836bc9fa636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:18:35 +00:00
Bill Yi
51f878871b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours am: ee15b19128
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I8ab2d0e2129f29e69cdb17dd831cc9166328002e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:18:28 +00:00
Treehugger Robot
a68566dd5c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours am: 3ea3bb83ae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: I79c3c5d81db0e72bd300366bf04d8b961fae88cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:18:23 +00:00
Bill Yi
f8cbacdd78
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours am: 0138ef4a5e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ic97ca29b205004829be56d57c0eaadc45d1252d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:18:04 +00:00
Treehugger Robot
2760803621
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours am: 41bd0f8ae1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I49ce84ffd4d81a8565543003b70d09d31dee653f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:17:45 +00:00
Bill Yi
b7628ea90a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours am: bd6c412717
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I2897e553e4340f193135c4c0660b0d2ea834356d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:17:28 +00:00
Zaiyue Xue
a6c104de54
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
-s ours am: 8cbeaf6a74
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I8849da1171750b8ee2b00bc4c02dba5c64f69609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:16:09 +00:00
Zaiyue Xue
fb9bc753fe
[automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc
-s ours am: d593cb5284
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I894a72c3547a75c500ba60a4a07fbd8bb445b7b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:16:06 +00:00
Treehugger Robot
2f87be66ce
Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143
Change-Id: I6b737218b4bec1500ea31218c0b7d13fb0a57f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:15:59 +00:00
Wenhui Yang
8513da9a31
Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227
Change-Id: Ie7dc4d98079153d48dbbf0f82e380ef744abe49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:15:44 +00:00
Grace Cheng
14f209c149
Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c
am: 71a57d8cec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674
Change-Id: I4e198e342f989d040ed194dab44b6835e2ab364b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 21:41:11 +00:00