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
076dec35c0
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: I7d3dcc99e14401f307cff471893cea56e449c8cb
2021-04-22 09:12:05 +00:00
YUKAI HUNG
1fd87d761c
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: I8d9c4f6a6c53e63314781113d3ac83698d5e0566
2021-04-22 09:11:55 +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
50e994415d
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: I731cde2d7c29296d8c02947aedba1b6000b4c455
2021-04-22 07:56:13 +00:00
Jeremy Goldman
3e007b982b
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: Iacb5dd373f1bf945c8ca7be381b5d18f38c7fda4
2021-04-22 07:56:03 +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
381449bc08
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: Ib1e8753306e6bb8e9c6cb4f641f45c5c36da9f0b
2021-04-22 06:45:53 +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
2b64f6d175
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: I22895964c1e97dbb225a2324d31120ae3f7a27bc
2021-04-22 00:51:02 +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
3694584c99
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: I5d853abd51ecc10c22cf0fd14df6e3c129bebc89
2021-04-22 00:41:22 +00:00
Chloris Kuo
1a44af9585
Merge "NAS setting migration" into sc-dev
2021-04-22 00:23:25 +00:00
Yomna Nasser
e43f26294d
Handle invalid subIds in Enable2gPreferenceController.
...
Implements improved handling of invalid subIds in the
"Allow 2G" controller + unit tests.
Bug: 185264531
Test: m & atest -c Enable2gPreferenceControllerTest
Change-Id: I7587f1a2a8150bbc6cc0864c9a13d0d910a26682
2021-04-22 00:14:29 +00:00
Curtis Belmonte
ddd6e8dde7
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: I53c80ff6d1e69df9c69dd90fb3d6daa42c3a30bc
2021-04-21 21:55:36 +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
91f2d0010f
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: Ia0d58fb47e9317d7d95398f31a6e0d3f987dc730
2021-04-21 20:00:24 +00:00
Neil Fuller
33aa65b3cc
Merge "Remove restriction for "Use location..."" into sc-dev
2021-04-21 19:54:41 +00:00
Chloris Kuo
61bb91658f
NAS setting onboarding string change
...
Bug: 185112379
Bug: 185535840
Test: manual test on device
Change-Id: Ieb7ea74398ac333b4adc722ea54b30b9f89d02a1
2021-04-21 12:15:52 -07:00
TreeHugger Robot
3825c962b9
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: I0f9478f1b44d7c3edc362f168728d737d5a2dcd8
2021-04-21 17:16:54 +00:00
TreeHugger Robot
b768489fa0
Merge "Notif history styling updates" into sc-dev
2021-04-21 16:46:31 +00:00
Sally Yuen
6a7eb6e47f
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: I5a550926f200025d66b364a49622cb607abc4589
2021-04-21 16:23:30 +00:00
Julia Reynolds
c258da5c1d
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: Ica558f736109f99fadfb60d4fd58812148bf597a
2021-04-21 16:23:01 +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
4bb02f3a03
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: I5265baab866a2f68b90d620a03a2d92e0195b133
2021-04-21 14:44:58 +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
ecf3583e2e
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: I6db26625699e368eaaf227aadc96426125601052
2021-04-21 13:33:15 +00:00
TreeHugger Robot
bd2b2cfdc1
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: I3bd7071e577a02b36d44274b49832329b57149fb
2021-04-21 13:33:07 +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
8310786aef
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: I87db94c693686b479a62f9375f54feb54bf4a031
2021-04-21 11:38:20 +00:00
Matt Pietal
ee2086872e
Merge "Remove "Device Controls" from Settings" into sc-dev
2021-04-21 11:31:33 +00:00
Alex Johnston
364df11fdd
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: I3e6717637d45e7b5470bbd85c5a6df3dcb68b499
2021-04-21 09:17:43 +00:00
TreeHugger Robot
d064a2bffd
[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: Idc609f98c416044f78fe2cf31fdd8c552a8f8bfd
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
Automerger Merge Worker
1c46cd4a38
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: Iff649fed55f52ab56dcd304b6fdcdb743279930c
2021-04-21 09:17:18 +00:00
TreeHugger Robot
769640c06c
[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: Id6a725399ec50d8acf5832ab7d904bbc5ea0ae1c
2021-04-21 09:17:15 +00:00
Bill Yi
0b6bf303b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7be92bf6a
-s ours am: 710845107d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260572
Change-Id: I435c895b3c0ef5be75e64f33b8d43c32d326fda1
2021-04-21 09:17:06 +00:00