Wesley Wang
a01477087c
Merge "Refactor compact battery status method (1/2)" into tm-dev
2022-02-21 09:25:33 +00:00
menghanli
cad616bd9a
Show different tooltips for QS features auto-added and non-auto-added
...
There are 2 different kinds of auto-added / non-auto-added illustrations in QS tooltips for framework features. Show animation in the settings page for full flow for non-framework services.
Bug: 218968108
Test: manual testing
Change-Id: I9c95c9f3e60ce94ce4059e27ef93c1dacce7a5c7
2022-02-21 15:49:18 +08:00
Menghan Li
100a1f9990
Merge "Fix two intro strings for Magnification page during Suw" into tm-dev
2022-02-21 07:04:38 +00:00
Wesley Wang
6cd9fc0a7e
Refactor compact battery status method (1/2)
...
- Move compact battery status logic into libs
Bug: 219650786
Test: make SettingsRoboTests
Change-Id: Icc53c8d88235bffedfb51a3526668277fcbf4f40
2022-02-21 06:34:46 +00:00
Yuri Ufimtsev
fc9b13e865
Provide data to LockScreenSafetySource
...
Test: atest SettingsUnitTests
Bug: 215515298
Change-Id: I59640e9f691754a2225870d40f5db3e6fd8557f8
2022-02-18 23:47:42 +00:00
Kweku Adams
2a51b8bfe0
Update constant names.
...
Updating references based on changes for TIP1. This change is just to
keep things building properly. Updates to the UI and functionality will
be done separately.
Bug: 158300259
Test: Android builds
Change-Id: I3a50c028fe69a6180ae842d3117b5cdfd712e0fd
(cherry picked from commit b05665fa83
)
2022-02-18 21:55:13 +00:00
TreeHugger Robot
dff5a34eed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124
-s ours am: 1a2962d15b
-s ours am: e647298264
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934956
Change-Id: I919509a9dd95115228db54984529c6bbe89324d2
2022-02-18 18:02:31 +00:00
Bill Yi
503240098d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 382229bcb6
-s ours am: be2ae00267
-s ours am: e29c0bb725
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: If3a3114cc6b164e8dbc073f6adb77ee9272f2718
2022-02-18 18:01:52 +00:00
Bill Yi
45e3ec1efa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b45dc4ca74
-s ours am: e2d91a630e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934957
Change-Id: I2465ea56326a9646fdc01fbc08f1e59833c0bed0
2022-02-18 18:00:44 +00:00
TreeHugger Robot
e647298264
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124
-s ours am: 1a2962d15b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934956
Change-Id: Ib0efa9857c3e46969c664f6460b793aa2518844a
2022-02-18 17:50:08 +00:00
Bill Yi
e29c0bb725
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 382229bcb6
-s ours am: be2ae00267
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I0b51595a36d4dcee8c6f6833d05e96a3f697c063
2022-02-18 17:49:34 +00:00
TreeHugger Robot
1a2962d15b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934956
Change-Id: Iea951572b963b5d7c01f2c98fb298b4c579bc3e8
2022-02-18 17:40:19 +00:00
Bill Yi
be2ae00267
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 382229bcb6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: Ibf22d45eb3d5056bc345ec241c29663a5922b51a
2022-02-18 17:39:27 +00:00
Bill Yi
e2d91a630e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b45dc4ca74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934957
Change-Id: Ibd6af66701dbe80bcbe1d070ab8ba50e4410387c
2022-02-18 17:37:09 +00:00
TreeHugger Robot
1c5ae8a124
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-02-18 17:09:16 +00:00
TreeHugger Robot
2555e0d2e3
Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
Import translations. DO NOT MERGE ANYWHERE
2022-02-18 17:09:14 +00:00
Bill Yi
b45dc4ca74
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idba594ec1c8ce5633f197c8a91c4db39cb4eb5ab
2022-02-18 03:20:57 +00:00
Bill Yi
b3c81561c2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I97f82f3f3ab3ac037a2b28c4e0c0db21398a605c
2022-02-18 03:17:09 +00:00
Bill Yi
8e58f10261
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I7662c7037845f69e2008060f7e654656c6675194
2022-02-18 03:13:47 +00:00
Bill Yi
382229bcb6
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I1b36efd22b8f9c8af9ceeca44656c53010349444
2022-02-18 03:13:47 +00:00
Bill Yi
bfb1c0090c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3127e1d696f00a9d496edaa5ed672ac1820da936
2022-02-18 03:13:28 +00:00
Bill Yi
41068978bb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ief2faf3cb2373cc20904d546c356b46570551ddf
2022-02-18 02:58:19 +00:00
Marie Matheson
3b3c6bc564
Merge "Send safety center status on boot"
2022-02-17 15:45:12 +00:00
Edgar Wang
74096fa66a
Merge "Replace SettingsSpinner with Spinner"
2022-02-17 14:10:40 +00:00
menghanli
1a4ca56796
Fix two intro strings for Magnification page during Suw
...
- Keep the SuW intro and hide the setting intro
Bug: 220025399
Test: Manual testing
Change-Id: Ie4e9eace8dbd638bd141c14a22603644d93d458a
2022-02-17 14:39:32 +08:00
Rahul Sabnis
55b80392e6
Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcfff
am: 19d5264723
am: 99e2c9f2f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146
Change-Id: I8f23fc7fce504cf863b35d86fa59a2f732ab7fcd
2022-02-16 23:38:17 +00:00
Rahul Sabnis
99e2c9f2f2
Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcfff
am: 19d5264723
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146
Change-Id: I59f5ddaa559331d6efd974e7abd719db3d05aafb
2022-02-16 23:18:32 +00:00
TreeHugger Robot
59b27c9f8d
Merge "Update the show wallet settings description label."
2022-02-16 23:00:06 +00:00
Rahul Sabnis
19d5264723
Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcfff
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146
Change-Id: Icf270075cf196c75e797f967e721cab8aa0db332
2022-02-16 22:56:11 +00:00
Rahul Sabnis
2e6f2dcfff
Merge "Remove hidden Bluetooth dependencies"
2022-02-16 22:36:25 +00:00
Silin Huang
40af6d61fd
Update the show wallet settings description label.
...
Bug: 219635505
Test: manual
Change-Id: I65704c196066df3b3a8bd348a81726c559bdae93
2022-02-16 12:19:08 -08:00
William Escande
a95180f228
Remove hidden Bluetooth dependencies
...
Bug: 217736913
Test: pre-submit
Change-Id: Ib4e12e8e350ffa08b48f58e8256991d7ed4fa013
2022-02-16 20:00:59 +01:00
Edgar Wang
fa5ab2e268
Replace SettingsSpinner with Spinner
...
Bug: 219610512
Test: manual
Change-Id: Ib8562a64299a6cb36f8225199f9432cb81e8e9f2
2022-02-17 02:16:27 +08:00
Christian Göllner
3c65556ceb
Merge "Revert "Add support for device state based auto-rotation prefere...""
2022-02-16 17:27:53 +00:00
Oli Lan
6eae6d66f5
Merge "Increase default user icon size."
2022-02-16 15:50:10 +00:00
Lucas Silva
c0ff1c1ff8
Merge changes I49f4b5d6,I8eb5047d
...
* changes:
Add accessibility annotations to dream settings.
Update dream settings strings to match latest UX mocks
2022-02-16 15:15:18 +00:00
TreeHugger Robot
eef858a4c6
Merge "Show/hide back button for 2nd page"
2022-02-16 14:47:43 +00:00
Treehugger Robot
c78c5e1129
Merge "Restart the MTP connection when changing transcode enabled" am: 8109ad8033
am: df16e4b74c
am: f5246d8a8c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1882150
Change-Id: I4d0f5d3bb5d11b1217de60f6b22e5544c8d00bfa
2022-02-16 13:52:02 +00:00
Treehugger Robot
f5246d8a8c
Merge "Restart the MTP connection when changing transcode enabled" am: 8109ad8033
am: df16e4b74c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1882150
Change-Id: Ib92a9c70e554ff53f452cae5cf45d6be511da39b
2022-02-16 13:33:21 +00:00
Christian Göllner
a663f10c4e
Revert "Add support for device state based auto-rotation prefere..."
...
Revert submission 16745827-device-state-auto-rotation-preferences-aops
Reason for revert: Checking if reason for test failures
Reverted Changes:
I77ed93f04:Add support for device state based auto-rotation p...
I5b2791f54:Add support for device state based auto-rotation p...
If254220ca:Add support for device state based auto-rotation p...
If254220ca:Add support for device state based auto-rotation p...
Fix: 219652963
Change-Id: Id95d5d7bb18a28403a6d3199945044e6617e0772
2022-02-16 13:31:16 +00:00
Treehugger Robot
df16e4b74c
Merge "Restart the MTP connection when changing transcode enabled" am: 8109ad8033
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1882150
Change-Id: I180666f8edc9fdb69fcdec20b9ae2730240ff923
2022-02-16 13:08:35 +00:00
Oli Lan
43412bcccd
Increase default user icon size.
...
This increases the size of the default user icon to the size specified
by the system (190dp), using the new method added in ag/16847427.
Bug: 218838295
Test: visual inspection
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: I3d88fbd1e148f0f63c796a272cd5771f4447812d
2022-02-16 11:44:50 +00:00
Tsung-Mao Fang
2df79641cb
Show/hide back button for 2nd page
...
By design, we want to show/hide back button for 2nd
layer page when it's in two pane mode.
Test: Manual test
Bug: 219000314
Change-Id: I14d8d7ee08280d5ce80c0b59e1e91d077f0b6d09
2022-02-16 18:01:42 +08:00
Treehugger Robot
8109ad8033
Merge "Restart the MTP connection when changing transcode enabled"
2022-02-16 09:58:58 +00:00
Wesley Wang
b254c62506
Merge "Use compact battery status string if available (1/3)"
2022-02-16 06:17:05 +00:00
TreeHugger Robot
036b03c8d1
Merge "Add log for shouldShowBatteryAttributionList() checking"
2022-02-16 06:14:08 +00:00
ykhung
21a0bed00c
Add log for shouldShowBatteryAttributionList() checking
...
Bug: 195306545
Test: make SettingsRoboTests
Change-Id: I0f41d87731a6703f453a9b0476a7534b22e53884
2022-02-16 12:04:27 +08:00
PETER LIANG
f92f3c359f
Merge changes from topic "a11y_text_reading_22"
...
* changes:
Add keywords into Font Size, Display Size preferences.
New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (22/n).
2022-02-16 00:55:08 +00:00
Peter_Liang
74468a94cc
Add keywords into Font Size, Display Size preferences.
...
Bug: 211503117
Test: manual test
Change-Id: I52de77a3af689a336bf8f40c668711a48b9bbc42
2022-02-16 00:54:25 +00:00
Menghan Li
3e32ee9b55
Merge "Show different tooltips for QS features auto-added and non-auto-added"
2022-02-15 21:38:44 +00:00