Alex Johnston
d60558861a
[automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
am: d8124d47f0
am: 3fd5e0f7f8
-s ours
...
am skip reason: Merged-In I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0 with SHA-1 04c66a0a3c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092
Change-Id: I1db904751a2cfa6671c587a816089d825871506e
2022-01-11 21:50:53 +00:00
Alex Johnston
3fd5e0f7f8
Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
am: d8124d47f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092
Change-Id: Ia028b11274420bec314c22f967f0d7cbe0e88570
2022-01-11 21:33:10 +00:00
Alex Johnston
ca8073159b
[automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
am: d8124d47f0
-s ours
...
am skip reason: Merged-In I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0 with SHA-1 04c66a0a3c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092
Change-Id: Idb19d10a976088c5a0d7bbbefe4f01a53264b0a4
2022-01-11 21:33:08 +00:00
Alex Johnston
f65be399e4
Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
am: 7bf45c4006
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092
Change-Id: Ic1fd7ed10b52cf2d37b3c1ca9a14dde3649bfcad
2022-01-11 21:26:02 +00:00
Alex Johnston
53ffad4bcc
Merge "Add non system overlay flag to RequestManageCredentials" into sc-v2-dev am: 3ab85fbd60
am: 15c5e404bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414974
Change-Id: I24d5979f4673badf9eaa850556ab3c22b459c5d7
2022-01-11 21:25:53 +00:00
Alex Johnston
d8124d47f0
Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092
Change-Id: Ifbce4430f251b7b152538520f318e62900ea64b0
2022-01-11 21:09:59 +00:00
Alex Johnston
15c5e404bf
Merge "Add non system overlay flag to RequestManageCredentials" into sc-v2-dev am: 3ab85fbd60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414974
Change-Id: I711098bc2c2fb999ae5841d60ea8b948791d28f1
2022-01-11 21:08:52 +00:00
Alex Johnston
7bf45c4006
Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092
Change-Id: I2a1621fcddeded97c93ef41e809a7c60f13f7235
2022-01-11 21:08:42 +00:00
Alex Johnston
ff07f8c34d
Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev
2022-01-11 20:47:35 +00:00
Alex Johnston
3ab85fbd60
Merge "Add non system overlay flag to RequestManageCredentials" into sc-v2-dev
2022-01-11 20:47:28 +00:00
Julia Reynolds
4a7e2dff0d
Merge "Always check roles for non-blockability"
2022-01-11 19:46:52 +00:00
Peter_Liang
085aadb700
New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (3/n).
...
Add the "High contrast text" feature into the "Text and reading options" settings page.
Bug: 211503117
Test: manual test
Change-Id: I150fbda193c27164e02fe101373c84ff4d34a677
2022-01-11 16:17:30 +00:00
PETER LIANG
42d9a225b1
Merge "New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (2/n)."
2022-01-11 16:17:04 +00:00
Lais Andrade
a6e74db8c5
Merge "Use new Vibrator method to get default intensity per usage"
2022-01-11 15:16:30 +00:00
ronish
817a2b939a
Update settings string
...
Bug: 209335678
Test: Manually
Change-Id: I798d4c94b11d1bfafb28dccb0ef4d1f559603da2
2022-01-11 13:13:18 +00:00
Oli Lan
8aec687b29
Add config flag in Settings to control whether restricted profiles are offered.
...
This adds a config resource to specify whether restricted profiles
should be offered as an option when a new user is added. This replaces
the previous check if a device is voice capable, and will be defaulted
to false.
Bug: 202854971
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserCapabilitiesTest"
Change-Id: If090fe8d902d6521acfde8c26e801aa4fc4f5ff4
2022-01-11 12:50:15 +00:00
Yuri Ufimtsev
ac06c38866
Merge "Use correct category key for SecurityAdvancedSettings based on the type of active Security Settings"
2022-01-11 11:21:41 +00:00
Treehugger Robot
61e1a07529
Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9
am: 039cdfd764
am: 5ea82e5955
am: b21993b793
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134
Change-Id: I4fe5dfdfc66aaad72a31de1761c28c6245db5bd6
2022-01-11 10:51:15 +00:00
Treehugger Robot
b21993b793
Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9
am: 039cdfd764
am: 5ea82e5955
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134
Change-Id: I21f0e516ec82f875638eabcd700fdead02048d7c
2022-01-11 10:03:53 +00:00
TreeHugger Robot
37495f25cb
Merge "wifi: fix test failure due to no WifiManager mock"
2022-01-11 10:03:06 +00:00
Yuri Ufimtsev
5ccccc181e
Use correct category key for SecurityAdvancedSettings
...
based on the type of active Security Settings
Test: atest SettingsUnitTests:SecurityAdvancedSettingsTest
Bug: 206001340
Change-Id: I7bdac4b26653eedb45e3e2f056e6804a6c16cb18
2022-01-11 09:54:20 +00:00
Treehugger Robot
5ea82e5955
Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9
am: 039cdfd764
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134
Change-Id: I603a7c75d79b81f2b5e5809ed4292a5cba77a169
2022-01-11 09:46:19 +00:00
Treehugger Robot
039cdfd764
Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134
Change-Id: I763f17465055f64f42093fac721e06ac2c81b286
2022-01-11 09:26:59 +00:00
TreeHugger Robot
8a183a9b6b
Merge "Make 'Format as portable' scrollable"
2022-01-11 09:24:41 +00:00
Jimmy Chen
bde88c4b8d
wifi: add Trust-On-First-Use option for CA
...
Bug: 196180536
Test: * connect to a EAP-TLS network with TOFU option
* make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: I30b55d835bd073d604bddd235f2425bdc8b647af
2022-01-11 17:17:47 +08:00
Treehugger Robot
0ccb8750b9
Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages"
2022-01-11 09:06:50 +00:00
Yuri Ufimtsev
c02d474ba1
Merge "Check if Preference is initialized before interacting"
2022-01-11 08:48:33 +00:00
Bonian Chen
740809879f
[Settings] Code refactor for modulization
...
Code refactor for clean up some internal dependencies.
Bug: 213836977
Test: Junit VpnPreferenceControllerTest
Change-Id: Ib6684c7b84bd04d9c1a015fa78d2c0ac5f1773c8
2022-01-11 15:55:13 +08:00
Peter_Liang
259dea1735
New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (2/n).
...
Add the "Bold text" feature into the "Text and reading options" settings page.
Bug: 211503117
Test: manual test
Change-Id: Ia421a53d1b57dedbd7ae486f4fd4fb65e5a7127d
2022-01-11 07:46:19 +00:00
Arc Wang
87ef94e9f2
Make 'Format as portable' scrollable
...
ScrollView can't work within CoordinatorLayout,
replace it with NestedScrollView.
Bug: 213559304
Test: manual
1. Create virtual disk by below command.
adb shell sm set-virtual-disk true
2. Settings -> Storage -> select the virtual disk.
3. Format it as Phone storage.
4. Click option menu -> Format as portable.
Change-Id: Ie5e51fb3c52431e1c94c2bcaaeb88fc05dfc993d
2022-01-11 15:40:25 +08:00
Jimmy Chen
1eac7941ce
wifi: fix test failure due to no WifiManager mock
...
Bug: 0
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: I1d53be79789446ea8fdd9e929130edb56ff21399
2022-01-11 15:01:29 +08:00
TreeHugger Robot
82500f203a
Merge "Enable scrolling to fix invisible problem of partial image"
2022-01-11 03:26:35 +00:00
Junyu Lai
123f2e1581
[MS50] Remove NetworkTemplate#buildTemplate* usages
...
This is a no-op refactoring.
These functions are deprecated and replaced by
NetworkTemplate#Builder, use public API instead.
Test: make RunSettingsLibRoboTests
Bug: 204830222
Change-Id: Idc2a09d8e3789ca2c7a97691cfad4b2e2b417f0d
2022-01-11 02:53:03 +00:00
Arc Wang
40dde37a07
Merge "Revert "Revert "Prevent side channel package installation enumeration"""
2022-01-11 02:36:49 +00:00
Treehugger Robot
edba629cc1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a
-s ours am: d7b3c851b5
-s ours am: c002768550
-s ours am: fdb97d1cda
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943804
Change-Id: I3bcdd3beee970fb5cf7498b40ebbdcd637d65406
2022-01-11 02:16:41 +00:00
Treehugger Robot
cf0ccde81c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410
-s ours am: 8b4a0a04f4
-s ours am: 56786c8317
-s ours am: d2a838e2d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943805
Change-Id: I23f46cb65ebb15082f25ee8e375a2eecea311275
2022-01-11 02:15:05 +00:00
Bonian Chen
6d7e342bef
Merge "[Settings] Code refactor for performance"
2022-01-11 02:01:23 +00:00
Treehugger Robot
fdb97d1cda
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a
-s ours am: d7b3c851b5
-s ours am: c002768550
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943804
Change-Id: Iac22f27bc0535e7cd48f2ff854959594b307cdc3
2022-01-11 01:46:59 +00:00
Treehugger Robot
d2a838e2d1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410
-s ours am: 8b4a0a04f4
-s ours am: 56786c8317
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943805
Change-Id: If5f83f54ea6cb8885eeab4da7ed529e68235ce1a
2022-01-11 01:46:08 +00:00
Treehugger Robot
c002768550
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a
-s ours am: d7b3c851b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943804
Change-Id: Ib8828007c502460cab8675859efd53c79b358b61
2022-01-11 01:36:15 +00:00
TreeHugger Robot
8be64461c7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e1e9adc14
-s ours am: eb3e22d6f8
-s ours am: 2d3e0c8bb2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591753
Change-Id: I8b1b9e4f464e7e055ff841e429219d530826bc8c
2022-01-11 01:35:45 +00:00
Bill Yi
7b6bffaea0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a027938e
-s ours am: 7973db12a9
-s ours am: e407f4e902
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591754
Change-Id: I513c08155691cafe88c66c3765b3bc279e52a6b3
2022-01-11 01:34:23 +00:00
Treehugger Robot
56786c8317
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410
-s ours am: 8b4a0a04f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943805
Change-Id: I73e4abb51e6dfb3725a0b19a2c39d76ad18d7d4d
2022-01-11 01:32:53 +00:00
TreeHugger Robot
2d3e0c8bb2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e1e9adc14
-s ours am: eb3e22d6f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591753
Change-Id: I5d06593619eee1b6825e3c11e688cb13c7cc5507
2022-01-11 01:20:05 +00:00
Treehugger Robot
d7b3c851b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943804
Change-Id: Ia9a27700f722dc98f1ba8f9ff8f21ce7a2dbc0bd
2022-01-11 01:18:26 +00:00
Bill Yi
e407f4e902
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a027938e
-s ours am: 7973db12a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591754
Change-Id: I22fdc9eea1877cf46254b26a47feea6a937bc027
2022-01-11 01:16:59 +00:00
Treehugger Robot
8b4a0a04f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943805
Change-Id: If6ce83076908961edfe95a2f388d87a06a0efdf2
2022-01-11 01:15:44 +00:00
TreeHugger Robot
eb3e22d6f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e1e9adc14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591753
Change-Id: I1c6b3ef2d40215c682ba5ff59b758e9a091ac75a
2022-01-11 01:03:43 +00:00
Bill Yi
7973db12a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a027938e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591754
Change-Id: Iac3fa529e4c286e699f140a779a56c3500c5391d
2022-01-11 01:02:26 +00:00
Treehugger Robot
48c90fde8a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-11 00:46:54 +00:00