Curtis Belmonte
c17e2e75a5
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: Ic20841bee00c0a6627d1c772c346409edf894ba1
2021-04-21 21:57:59 +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
297ba96a01
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: Ief6368326813f6e444675ce0ff19ba35b3e0ff93
2021-04-21 20:01:40 +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
lucaslin
188d66a709
Use [set|get]PrivateDnsMode directly
...
The value of PRIVATE_DNS_MODE_* has changed from String to int and
ConnectivityManager provides 2 new APIs to set and get private
DNS mode, the caller can use them directly and doesn't need to update
Settings by itself.
Bug: 185311744
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
2. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: I47706efe9c53a00438fdec97fda244638cecb3dc
2021-04-22 01:46:05 +08:00
TreeHugger Robot
ffb9e456d3
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: Ie0ee54c030626845189e05ca4e8268450edf83eb
2021-04-21 17:19:25 +00:00
TreeHugger Robot
b768489fa0
Merge "Notif history styling updates" into sc-dev
2021-04-21 16:46:31 +00:00
Sally Yuen
8a495fd55c
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: I59b5bcb68a725ad69a48dbd8088db7f02d5f850e
2021-04-21 16:25:30 +00:00
Julia Reynolds
b1dda2487f
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: I9bb8705b59e20e3fd49dda97ad345c72e3fcad5b
2021-04-21 16:25:04 +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
038ea6c4cb
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: If2f78cfb89edee1613b3a5de51c311ff521b8bd2
2021-04-21 14:47:03 +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
fbc72482e3
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: I71ed1fcc3356172d93f4a585771a9ec7e8e4a220
2021-04-21 13:35:08 +00:00
TreeHugger Robot
b4678cd9a0
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: If40e4d2476825477f949a919ca106b63af9da571
2021-04-21 13:34:58 +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
Matt Pietal
aa0062c92f
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: I8936eee6221fc6090e1cf1ee185c1cd0214f5d96
2021-04-21 11:40:12 +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
ee2086872e
Merge "Remove "Device Controls" from Settings" into sc-dev
2021-04-21 11:31:33 +00:00
Alex Johnston
8a3372b075
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: Iea87a55ee8a521b706090543ff5d9c53258b62db
2021-04-21 09:29:49 +00:00
Alex Johnston
2f9b5b6ad7
Merge "Fix maximum time to lock" into sc-dev
2021-04-21 09:17:28 +00:00
TreeHugger Robot
d473c68668
[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: Iff773c0fa75dc46ab4da5e88d160a7f4db50ae27
2021-04-21 09:06:45 +00:00
Automerger Merge Worker
5d7e59f6ca
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: I8fa380ba650c00a78c51cda70147df04291d673f
2021-04-21 09:06:41 +00:00
TreeHugger Robot
7d01bd4b93
[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: I73b68c5bfdfdcee5de93405cc58c8b54db62862e
2021-04-21 09:06:37 +00:00
Bill Yi
a873daf629
[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: Ia717eade74fe3a54c05ad814207941569eaaeef7
2021-04-21 09:06:33 +00:00
TreeHugger Robot
d070df12f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -s ours am: 58ff823e7e -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: Ibf607b2bda1edbdf68e1877abe71e89ecedb5372
2021-04-21 09:06:18 +00:00
Arc Wang
6e3d7e7236
Merge "Update progress bar UI" into sc-dev am: 3486b95fd7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235149
Change-Id: Ibf6f427ebefb98bccc8bfc22e0c3cd580c2d9465
2021-04-21 09:06:18 +00:00
Automerger Merge Worker
1119508d1c
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours" into sc-dev
2021-04-21 09:06:17 +00:00
Bill Yi
23b6d6634f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -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: Ia67909919f88744680bc3263b1fba2667f060e5c
2021-04-21 09:06:14 +00:00
TreeHugger Robot
9817a5b35a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: bdd118dd32 -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: Idd71ee35579a8814b519b3c7ed989e558ad273e6
2021-04-21 09:06:11 +00:00
Bill Yi
710845107d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7be92bf6a -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: I32fdf960f120f52fdd2b712f5ad4ce9492cbba92
2021-04-21 09:05:23 +00:00
Arc Wang
3486b95fd7
Merge "Update progress bar UI" into sc-dev
2021-04-21 09:01:35 +00:00
Alex Johnston
7f56d09993
Merge "RequestManageCredentials dark theme" into sc-dev am: 4a4e2bae61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14011458
Change-Id: I5a2335e66ae74a608b20e41729a2790f7f2444cf
2021-04-21 08:54:50 +00:00
Alex Johnston
4a4e2bae61
Merge "RequestManageCredentials dark theme" into sc-dev
2021-04-21 08:45:06 +00:00
TreeHugger Robot
facbd6bb3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 73a806fa37 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14261574
Change-Id: Ib05405eef3e134c29f38c84a645c678102a2b84f
2021-04-21 08:42:40 +00:00
TreeHugger Robot
5e50d94f41
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6d25cfcc3b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14261566
Change-Id: I508afe2792d12c39a8076bd56878f30410f5320d
2021-04-21 08:42:36 +00:00
TreeHugger Robot
87c7329d25
Merge "[Provider Model] Carrie Wi-Fi offload toggle request (panel)" into sc-dev am: b8f0a8e2dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251407
Change-Id: I2bc8b0f17590af2cd1e945246ba4c5394374ca89
2021-04-21 08:42:33 +00:00
TreeHugger Robot
513c0a1d1c
Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev am: d4a4fead67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14236566
Change-Id: I18bc1abe24d6fb67772770bc473e796a9fed0c19
2021-04-21 08:41:33 +00:00
TreeHugger Robot
58ff823e7e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede -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: I905f157e08ee5b07b2ea5a0851212faa53b4fb3a
2021-04-21 08:39:24 +00:00
Bill Yi
95ffa79af1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -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: I218735c7a6468d882769285c4f4fa0e7ab1d563c
2021-04-21 08:39:21 +00:00
TreeHugger Robot
bdd118dd32
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-21 08:35:24 +00:00
TreeHugger Robot
73a806fa37
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-21 08:25:07 +00:00
TreeHugger Robot
6d25cfcc3b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-21 08:25:04 +00:00