Bill Yi
709263e32b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2e5d21c36 -s ours am: 6895651354 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836238
Change-Id: I52c33442ff4ce7a3a3809c61cb8493cbd942b366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:54:56 +00:00
Bill Yi
ab2e06f70b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4bd597bddf -s ours am: 8eab869e52 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836236
Change-Id: Ia7697a0504bc5130546db422226003e834178221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:54:52 +00:00
Bill Yi
eb2dc13031
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8c067128 -s ours am: a7dd9c871f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836236
Change-Id: Ibb0961fb99eca21b1c8b22b4fc590b8b98d65523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:54:43 +00:00
Bill Yi
5524dea2f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c49656808b -s ours am: fd25a4eb77 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836234
Change-Id: I343d3ed34c2936cec79d7c30562decb064a3ef41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:54:25 +00:00
Bill Yi
8c94e9cc23
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 792e7ec3e7 -s ours am: c53bca224f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836234
Change-Id: I7ebf5b05584e8af3a9ef19e291536967e0011653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:54:05 +00:00
Joshua Mccloskey
381d775118
Merge "Added SearchIndexable to FP pref controller" into main
2023-09-25 20:23:43 +00:00
Bill Yi
44dcaf366f
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-09-25 20:17:47 +00:00
Bill Yi
fe0b7a69a9
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-09-25 20:17:47 +00:00
Bill Yi
8b9815d8b2
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-09-25 20:17:47 +00:00
Bill Yi
6895651354
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2e5d21c36 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836238
Change-Id: I3640b0fc3d2a51f65a96e1f30a8c855a3c88c653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:00:54 +00:00
Bill Yi
8eab869e52
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4bd597bddf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836236
Change-Id: Iadafa0042bd7ddab8ec298711ca6a49d037d9f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:00:51 +00:00
Bill Yi
a7dd9c871f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8c067128 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836236
Change-Id: I117efa5dceadaac9119a00ba48cc0193610b83dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:00:33 +00:00
Bill Yi
fd25a4eb77
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c49656808b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836234
Change-Id: Ia5b356fc19662ec0215a83b854af653009909194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:00:15 +00:00
Bill Yi
c53bca224f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 792e7ec3e7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836234
Change-Id: I53aa0fab30662335feccdc84039d3ceb80ce9529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 19:59:52 +00:00
Bill Yi
4bd597bddf
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-25 19:45:33 +00:00
Bill Yi
c49656808b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-25 19:45:33 +00:00
Bill Yi
15c585c00a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd2639f4b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836175
Change-Id: I1fd7e0577b7465f2b559079e78df70bf1e7a8af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 19:12:18 +00:00
Joshua McCloskey
ab14463e04
Added SearchIndexable to FP pref controller
...
Test: atest
Fixes: 289967461
Change-Id: I34cac8f467326bf84ed45b3e5accc7d8817a1a2f
2023-09-25 19:00:13 +00:00
Tom Hsu
f357f32284
Merge "When device has a call, avoid user inactive/active SIM." into main
2023-09-25 06:59:44 +00:00
tom hsu
e7d98dea9d
When device has a call, avoid user inactive/active SIM.
...
Bug: 296314216
Test: atest passed
Change-Id: I1a717d24a87316ccf065a2c02c49dc7e29825905
2023-09-25 13:32:52 +08:00
Treehugger Robot
646ae689fe
Merge "Fix IllegalArgumentException" into main
2023-09-25 04:03:52 +00:00
Chelsea Hao
03fb0a8c28
Merge "Add "Previously connected devices" activity in settings for system ui QS bluetooth dialog." into main
2023-09-25 03:18:33 +00:00
Chaohui Wang
8c72d371a8
Merge "Clean up unused EXTRA_NETWORK_TYPE" into main
2023-09-25 02:42:28 +00:00
Treehugger Robot
2d7ef101b9
Merge "Clean up Backup Calling" into main
2023-09-25 02:35:46 +00:00
chelseahao
4e19ccd08d
Add "Previously connected devices" activity in settings for system ui QS bluetooth dialog.
...
Test: adb shell "am start -n 'com.android.settings/.Settings\$PreviouslyConnectedDeviceActivity'"
Bug: 298124674
Change-Id: I388aab93d4952ebc8fbd515be624f336cb083a91
2023-09-25 02:28:54 +00:00
Chaohui Wang
de83cdcdd3
Clean up unused EXTRA_NETWORK_TYPE
...
Bug: 290856342
Test: manual - on DataUsageList
Change-Id: Ibb0a50a18a581e5cd89246ed581b69e06f588f66
2023-09-25 09:42:16 +08:00
Treehugger Robot
f696c8d1ac
Merge "Avoid settingslib.widget.preference.radio" into main
2023-09-25 01:39:23 +00:00
Chaohui Wang
5ed30f4672
New DataUsageListHeaderController
...
Move spinner and config button to DataUsageListHeaderController.
Bug: 290856342
Test: manual - on DataUsageList and AppDataUsage
Test: unit test
Change-Id: I655bd3441b2305708c0052f1203538bb07eef2af
2023-09-25 00:28:31 +08:00
Chaohui Wang
84dfb76f4a
Avoid settingslib.widget.preference.radio
...
Which is deprecated and will be cleaned up.
Bug: 289155281
Test: m Settings
Change-Id: Ie91835fa98ed71b5b9c73d1bc4d953a1e3ef3d02
2023-09-24 00:41:19 +08:00
Chaohui Wang
30b81d637e
Clean up Backup Calling
...
Fix: 289967466
Test: m Settings
Change-Id: Ic487c06383f1dba04b59a54301f083c265717d9b
2023-09-23 22:35:55 +08:00
SongFerngWang
e4b08837d1
Fix IllegalArgumentException
...
Add the try-catch to avoid crash.
Fix: 301362148
Test: build pass
Change-Id: Ia1f5a4299d5f0eeffc7b25b0f3b89d56f1647062
2023-09-23 06:43:17 +00:00
Treehugger Robot
41fab98b6a
Merge "Fix tint of battery icon" into udc-qpr-dev am: 8a9074278a am: d74ddbd6ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842149
Change-Id: I1577c463bfd8ed4b43bc83c8a23664aa4d8c5e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-23 05:54:33 +00:00
Treehugger Robot
d74ddbd6ef
Merge "Fix tint of battery icon" into udc-qpr-dev am: 8a9074278a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842149
Change-Id: I854f3002c282c6909bd79eeecb839045ee8119ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-23 04:57:40 +00:00
Treehugger Robot
8a9074278a
Merge "Fix tint of battery icon" into udc-qpr-dev
2023-09-23 04:21:23 +00:00
Massimo Carli
ea28ebdc1b
Merge "Use experimental string in user aspect ratio settings" into udc-qpr-dev am: 10050559cc am: f6bafc836e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24828451
Change-Id: I768fd7baef049d3243ca01f0b0bd2eb6aa19d8e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-23 00:35:43 +00:00
Massimo Carli
f6bafc836e
Merge "Use experimental string in user aspect ratio settings" into udc-qpr-dev am: 10050559cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24828451
Change-Id: I50a45b2215e701be23cfd67f3ff1a7869a220f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-22 23:39:24 +00:00
Massimo Carli
10050559cc
Merge "Use experimental string in user aspect ratio settings" into udc-qpr-dev
2023-09-22 22:52:57 +00:00
Isaac Katzenelson
7a4d2720e4
Fix tint of battery icon
...
Bug: 300559036
Test: Visual test
Change-Id: Id4c7e7ec9f330432c01fa7fcee2474b2fe61f642
2023-09-22 22:34:15 +00:00
Weng Su
30ffee8600
[automerger skipped] Update Battery preference for Instant Hotspot am: ab895fdb9b am: 7cbef7df1f -s ours
...
am skip reason: Merged-In I89e811ba0d1b715d4fff23c96bc094cd4270fef7 with SHA-1 af77327017 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24834492
Change-Id: Ibcaca5cc8c5c13680e760d514187fe0c5ef56631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-22 19:05:53 +00:00
Peter Kalauskas
1bb84f9854
Merge "Enable use_resource_processor for all sysui deps" into main
2023-09-22 18:41:27 +00:00
Weng Su
7cbef7df1f
Update Battery preference for Instant Hotspot am: ab895fdb9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24834492
Change-Id: If9568f609efa9fb0484697eceac1f7f9a136abff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-22 18:06:51 +00:00
Massimo Carli
e3951e39ef
Use experimental string in user aspect ratio settings
...
Bug: 300219974
Test: Manual
Change-Id: I92b23e525f6c48d11e61080af5502c68ec9059e0
2023-09-22 14:12:25 +00:00
Weng Su
af77327017
Update Battery preference for Instant Hotspot
...
- Use the static battery full icon
- Show charging status in Battery preference summary
Bug: 300559036
Test: manual test
atest -c WifiNetworkDetailsFragmentTest
Change-Id: I89e811ba0d1b715d4fff23c96bc094cd4270fef7
2023-09-22 12:45:52 +00:00
Weng Su
ab895fdb9b
Update Battery preference for Instant Hotspot
...
- Use the static battery full icon
- Show charging status in Battery preference summary
Bug: 300559036
Test: manual test
atest -c WifiNetworkDetailsFragmentTest
Merged-In: I89e811ba0d1b715d4fff23c96bc094cd4270fef7
Change-Id: I89e811ba0d1b715d4fff23c96bc094cd4270fef7
2023-09-22 20:36:38 +08:00
Charlotte Lu
cb624a3155
Merge "Add SettingsExposedDropdownMenuCheckBox. SettingsExposedDropdownMenuCheckBox requires input index." into main
2023-09-22 10:35:37 +00:00
Bill Yi
25af337c47
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0cc26dff74fedf41e7f54d7302943560cad22f46
2023-09-22 02:57:41 -07:00
Treehugger Robot
b158ef82c1
Merge "Clean up unused Call Manager strings" into main
2023-09-22 09:55:02 +00:00
Bill Yi
a49cf8b52d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieef89f8247afa7ae108a69b3cce28c653211dde8
2023-09-22 02:44:13 -07:00
Bill Yi
ca3d722e2f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I39668c43f1cf010feebb19e0f5da5385dffbc400
2023-09-22 02:38:23 -07:00
Bill Yi
a2e5d21c36
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I61f9dd87a0eb80a495bb50fec51827c75053ad13
2023-09-22 02:30:39 -07:00