Menghan Li
0a768105b2
Merge "[FAB] Improve the shortcut dialog ux after change accessibility button mode" into sc-dev am: 09f6086bea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255419
Change-Id: I83583ff6462f11009f67aeea29b9143d05ba3a68
2021-04-22 11:36:46 +00:00
Menghan Li
09f6086bea
Merge "[FAB] Improve the shortcut dialog ux after change accessibility button mode" into sc-dev
2021-04-22 11:18:23 +00:00
TreeHugger Robot
48f6cdad57
Merge "Replace to correct footer preference style" into sc-dev am: 913dd4c8a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271576
Change-Id: Ibfff6750188ff6b7b050bd6603baa95b51e41ff8
2021-04-22 10:59:42 +00:00
TreeHugger Robot
913dd4c8a0
Merge "Replace to correct footer preference style" into sc-dev
2021-04-22 10:42:55 +00:00
Tsung-Mao Fang
a58b144822
Replace to correct footer preference style
...
Test: Rebuilt apk and see the result
Fix: 186078568
Change-Id: I24ee2371dd51b8be4aa69d51d08c534117978ff2
2021-04-22 17:28:26 +08:00
Wesley Wang
e72ac29cde
Merge "Update app usage page active time format" into sc-dev am: 6ffcf8bfa9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14264141
Change-Id: Ibf9616b42812495a371aee299e435875c44649ce
2021-04-22 09:12:52 +00:00
YUKAI HUNG
f93d059ec7
Merge "Implement expandable item for system component usage data" into sc-dev am: 7144b6fe5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266965
Change-Id: Ic5e22934ba7db6150b05ecfce0fc229dfec2a8f1
2021-04-22 09:12:47 +00:00
Wesley Wang
6ffcf8bfa9
Merge "Update app usage page active time format" into sc-dev
2021-04-22 08:52:39 +00:00
YUKAI HUNG
7144b6fe5d
Merge "Implement expandable item for system component usage data" into sc-dev
2021-04-22 08:42:45 +00:00
Joy Babafemi
bc92aa5fb1
Merge "Add UWB Settings" into sc-dev am: a1fe5ec083
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14240457
Change-Id: I5e735a07c27060927342e123e5b6df36c4d6445b
2021-04-22 07:56:36 +00:00
Jeremy Goldman
ba2ac59d50
Merge "Make gear symbol in "Mobile Data Usage" RTL friendly" into sc-dev am: ef7fd39f91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233634
Change-Id: I8810188d7670e61633be0cada0f55e7c98ed0af1
2021-04-22 07:56:17 +00:00
Joy Babafemi
a1fe5ec083
Merge "Add UWB Settings" into sc-dev
2021-04-22 07:39:12 +00:00
Jeremy Goldman
ef7fd39f91
Merge "Make gear symbol in "Mobile Data Usage" RTL friendly" into sc-dev
2021-04-22 07:26:10 +00:00
ykhung
e1cec0e08d
Implement expandable item for system component usage data
...
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id488ab23039ff12480da5e02b6a96ff70e879007
2021-04-22 06:50:39 +00:00
TreeHugger Robot
be4d09f4fe
Merge "Update the style for collapsing toolbar" into sc-dev am: ea2a359561
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199749
Change-Id: Id807ab2c348cdde21aaf11ccd8074cd33a39b590
2021-04-22 06:46:20 +00:00
TreeHugger Robot
ea2a359561
Merge "Update the style for collapsing toolbar" into sc-dev
2021-04-22 06:40:23 +00:00
Joy Babafemi
a5672945ae
Add UWB Settings
...
Screenshot 1: https://screenshot.googleplex.com/5wjKkioeehZnz74
Screenshot 2: https://screenshot.googleplex.com/AtaufsUgLgVk2Ur
Test: Robotest
Bug: 183254940
Change-Id: Ibd2e3f3ad9596dddbdd23d7f2ad5e03768648faf
2021-04-22 06:16:35 +00:00
PETER LIANG
9387dcc992
Merge "Fix the entire text is aligned middle of the Vision setting screen." into sc-dev am: f71aad11e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265788
Change-Id: I6e16c1cf9e1c6462844b28903fe3724b0bf68888
2021-04-22 00:51:28 +00:00
Chloris Kuo
6cf4234515
Merge "NAS setting migration" into sc-dev am: 1a44af9585
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14259014
Change-Id: If9dfc47c2013a9c40bc83f62b0c88f3ccd048835
2021-04-22 00:42:03 +00:00
PETER LIANG
f71aad11e3
Merge "Fix the entire text is aligned middle of the Vision setting screen." into sc-dev
2021-04-22 00:41:41 +00:00
Chloris Kuo
1a44af9585
Merge "NAS setting migration" into sc-dev
2021-04-22 00:23:25 +00:00
Curtis Belmonte
0df91fb86c
Merge "Log new auth-related framework atoms for Android 12" into sc-dev am: b662335341
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14257139
Change-Id: I1078fe8732411656a2b7191e9b5e68a37861aab1
2021-04-21 21:56:01 +00:00
Curtis Belmonte
b662335341
Merge "Log new auth-related framework atoms for Android 12" into sc-dev
2021-04-21 21:34:22 +00:00
Neil Fuller
1ce7157d63
Merge "Remove restriction for "Use location..."" into sc-dev am: 33aa65b3cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251331
Change-Id: I89c59f36081d244a722f726e950e23a327afe0b1
2021-04-21 20:00:47 +00:00
Neil Fuller
33aa65b3cc
Merge "Remove restriction for "Use location..."" into sc-dev
2021-04-21 19:54:41 +00:00
TreeHugger Robot
4976265375
Merge "Notif history styling updates" into sc-dev am: b768489fa0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266709
Change-Id: Id48c975be077f7689dd48b61d388844be58842be
2021-04-21 17:18:03 +00:00
TreeHugger Robot
b768489fa0
Merge "Notif history styling updates" into sc-dev
2021-04-21 16:46:31 +00:00
Sally Yuen
fb29b725c0
Merge "Add extra dim keywords to aosp settings" into sc-dev am: 790d69d465
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14252125
Change-Id: Ic710c818cab2f65be5db8e8f986c2480093e205d
2021-04-21 16:23:44 +00:00
Julia Reynolds
4cc62db155
Merge "Use a new string for category headers" into sc-dev am: 5770b4e928
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265928
Change-Id: Ib01630aa088f3bd0156a55f9cd541cbc4a5f255d
2021-04-21 16:23:21 +00:00
Sally Yuen
790d69d465
Merge "Add extra dim keywords to aosp settings" into sc-dev
2021-04-21 16:13:46 +00:00
Julia Reynolds
5770b4e928
Merge "Use a new string for category headers" into sc-dev
2021-04-21 16:10:22 +00:00
Julia Reynolds
e8a33e0c83
Notif history styling updates
...
Test: manual
Fixes: 185625272
Change-Id: Ie9d62573b2c6480b84ab9172beccf519e7e880dc
2021-04-21 10:55:51 -04:00
Julia Reynolds
60ded30669
Use a new string for category headers
...
The existing string refers to singular objects, but we need
to refer to several
Test: manual
Fixes: 185325146
Change-Id: Ie22fa7a8c1857558baceb05d8ca80cfd6ff61ed4
2021-04-21 14:48:31 +00:00
YUKAI HUNG
825cee7382
Merge "Add new expandable preference component" into sc-dev am: c6c3b383da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260595
Change-Id: I5f4708a6fb429264e308667fe894c0416208c67e
2021-04-21 14:45:24 +00:00
YUKAI HUNG
c6c3b383da
Merge "Add new expandable preference component" into sc-dev
2021-04-21 14:20:26 +00:00
Peter_Liang
d2658b57d8
Fix the entire text is aligned middle of the Vision setting screen.
...
Root cause:
The preferenceStyle attribute was overridden in the PreferenceTheme.SetupWizard style.
Solution:
Remove the overriden preferenceStyle.
Bug: 183086481
Test: manual test
Change-Id: I60d127baef9274170a31eaf3cfbd210312334311
2021-04-21 22:08:45 +08:00
TreeHugger Robot
e80dd29760
Merge "Notif history Long tap functions as short tap" into sc-dev am: e1b63f00a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14254102
Change-Id: I813039bccdc1663b21a125fd333ac5c792287a9d
2021-04-21 13:33:38 +00:00
TreeHugger Robot
1170dc1800
Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev am: 7f065adfcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255423
Change-Id: Id669662a2c093a2497653397501c375eb972b57c
2021-04-21 13:33:29 +00:00
TreeHugger Robot
e1b63f00a2
Merge "Notif history Long tap functions as short tap" into sc-dev
2021-04-21 13:10:25 +00:00
TreeHugger Robot
7f065adfcb
Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev
2021-04-21 13:06:45 +00:00
Wesley.CW Wang
2cc7431fa3
Update app usage page active time format
...
- Make the text of active time support different states like foreground or background usage time less than one minutes
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I20be88e5b23a679c15f97bac4b9d400557685463
2021-04-21 20:20:05 +08:00
ykhung
b8721cf980
Add new expandable preference component
...
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id2b2a1f4fa557467efcaa013aa9e978b2c66d974
2021-04-21 11:58:45 +00:00
menghanli
54ded4cb5e
[FAB] Improve the shortcut dialog ux after change accessibility button mode
...
Problem: The "Customize accessibility button" link only exists when the user selects the FAB location, which may confuse and disorient the user
Solution: It is hard to back to floating menu mode if we turns to navigation bar from "Customize accessibility button" setting. Added the link in the "navigation bar mode" can help on this problem.
Fix: 183342563
Test: manual test
Change-Id: Ife572b0962f3a57c34af56cd930a487c9d813c0c
2021-04-21 19:39:13 +08:00
Matt Pietal
9cfa695a4a
Merge "Remove "Device Controls" from Settings" into sc-dev am: ee2086872e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215389
Change-Id: Icf782b29fb0670c2b60123e90488d023f9a1abc4
2021-04-21 11:38:42 +00:00
Matt Pietal
ee2086872e
Merge "Remove "Device Controls" from Settings" into sc-dev
2021-04-21 11:31:33 +00:00
Alex Johnston
01e46e8b44
Merge "Fix maximum time to lock" into sc-dev am: 2f9b5b6ad7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14109359
Change-Id: Id0b4872853dab8dfb7dd029d69cc9b3370b68c99
2021-04-21 09:17:49 +00:00
TreeHugger Robot
940ddee02a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -s ours am: 58ff823e7e -s ours am: d070df12f4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14261000
Change-Id: Ic39de791c5b4b59704ec4ace896f07f7a2aad82d
2021-04-21 09:17:40 +00:00
Automerger Merge Worker
48767f99ca
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours" into sc-dev am: 1119508d1c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260991
Change-Id: Iabf0469a2346e97d7147b161de3d2a7a70eafe9b
2021-04-21 09:17:33 +00:00
TreeHugger Robot
7040d9186d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: bdd118dd32 -s ours am: 9817a5b35a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260576
Change-Id: Ib5604490dba9a9da70a670f811b978d35139f8f6
2021-04-21 09:17:29 +00:00
Alex Johnston
2f9b5b6ad7
Merge "Fix maximum time to lock" into sc-dev
2021-04-21 09:17:28 +00:00