Yasin Kilicdere
18252d9f88
Merge "Fix Guest string was not translated in UMS.userWithName()"
2022-03-03 03:24:18 +00:00
Karishma Vakil
e23cd8ad0b
[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs
...
Test: atest SettingsUnitTests
Bug: 219195246
Bug: 219078602
Bug: 218852160
Change-Id: Ieaa1c9d04a0a9805abb10025f170cd9283b4a906
Merged-In: Ieaa1c9d04a0a9805abb10025f170cd9283b4a906
2022-03-03 01:52:01 +00:00
Karishma Vakil
9540b9b15b
[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs
...
Test: atest SettingsUnitTests
Bug: 219195246
Bug: 219078602
Bug: 218852160
Change-Id: Ieaa1c9d04a0a9805abb10025f170cd9283b4a906
2022-03-03 01:22:45 +00:00
menghanli
b759790da1
Apply Glif theme before using dynamic color.
...
As changes are being made to remove the dependency between dynamic
color and the glifv3 theme, this sets the Glif theme before calling
trySetDymanicColor, as requested.
Bug: 219882220
Test: Build & flash; visual inspection
Change-Id: I4c28ea52411f3436c98e4689c7fa1784254fd572
2022-03-03 05:23:02 +08:00
Yasin Kilicdere
87c063e051
Merge "Remove the fallback AddSupervisedUserActivity."
2022-03-02 20:15:41 +00:00
Kweku Adams
fae96341ad
Merge "Indicate min allowed bucket." into tm-dev am: 4a21c60862
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034518
Change-Id: I5bf8224ff0979f64c5e531462ab03e161dca52df
2022-03-02 18:06:32 +00:00
Amy Hsu
b7b6ed91cf
Add ScreenResolutionController to Settings app
...
Settings for resolution switch
Bug: b/199559703
Test: Check resolution switch UI in Settings app
atest SettingsUnitTests:ScreenResolutionControllerTest
atest SettingsUnitTests:ScreenResolutionFragmentTest
Change-Id: I46d3be3b82ca512b8672efaa489df2cdaab26d6d
2022-03-03 01:56:00 +08:00
Kweku Adams
4a21c60862
Merge "Indicate min allowed bucket." into tm-dev
2022-03-02 17:55:45 +00:00
Beverly Tai
690bce0c9a
Merge "Don't show the "When to show" PreferenceCategory" into tm-dev am: b2baaebb8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17045663
Change-Id: I6f00e55fadccf302a3a9893ed6bf5e3a12b62bea
2022-03-02 13:38:32 +00:00
Edgar Wang
ca258ccd33
Use android.app.AlertDialog in SetupChooseLockGeneric
...
androidx.appcompat.app.AlertDialog will cause postiveButton and negativeButton become too close when the texts are longer.
Bug: 216442969
Change-Id: I39e84c1007c817399902034e853b2aeee1343adc
Test: visual verify
2022-03-02 13:35:03 +00:00
Beverly Tai
b2baaebb8a
Merge "Don't show the "When to show" PreferenceCategory" into tm-dev
2022-03-02 13:14:14 +00:00
Tom Hsu
2788e6e073
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
am: 0e8aed527f
am: 293571f054
am: d626cb16f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: Iee2086215a2c7079831afaab626cbfab103a3957
2022-03-02 12:53:36 +00:00
Tom Hsu
d626cb16f8
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
am: 0e8aed527f
am: 293571f054
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: Ib7b1d25aa8ff2e1f172eebf148790873cc292ded
2022-03-02 12:42:33 +00:00
Tom Hsu
293571f054
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
am: 0e8aed527f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: I874e3e478ce29dda24860a2e007279bf7ca77c47
2022-03-02 12:19:56 +00:00
Tom Hsu
0e8aed527f
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: I5de3906942beb7efe557e3491468f91f9d67db48
2022-03-02 11:59:46 +00:00
Tom Hsu
d915b09e21
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier."
2022-03-02 11:28:50 +00:00
TreeHugger Robot
9e9a39d717
Merge "Cache mechanism for Storage page with work profile" into tm-dev
2022-03-02 09:49:42 +00:00
Arc Wang
6f5cb09bc2
Merge "Only show 2-pane deep link when homepage is available" into tm-dev am: f74e1195a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005472
Change-Id: Ic9e80fb5a0922b528221b44c3127d71a314ef87d
2022-03-02 07:44:53 +00:00
Arc Wang
f74e1195a4
Merge "Only show 2-pane deep link when homepage is available" into tm-dev
2022-03-02 07:20:00 +00:00
Tsung-Mao Fang
c9702a2c7a
Merge "Fix unable to scroll to the bottom page" into tm-dev am: 88bff1ebc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033482
Change-Id: I6f15e4d61195240fb092cccdb117eb33bfc13c57
2022-03-02 03:42:07 +00:00
Tsung-Mao Fang
88bff1ebc5
Merge "Fix unable to scroll to the bottom page" into tm-dev
2022-03-02 03:13:01 +00:00
Edgar Wang
752cce2f6f
Merge "Update workprofile TabLayout for Material Next style" into tm-dev am: ab22c72319
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17020504
Change-Id: Ie2229daad02fab617b01278e47788dcfe7b4f8b1
2022-03-02 02:58:18 +00:00
Edgar Wang
ab22c72319
Merge "Update workprofile TabLayout for Material Next style" into tm-dev
2022-03-02 02:28:03 +00:00
Arc Wang
9ba80e76b3
Only show 2-pane deep link when homepage is available
...
DeepLinkHomepageActivity is disabled by default and may be
enabled after receiving the PRE_BOOT_COMPLETED broadcast.
On some virtual devices, DeepLinkHomepageActivity may not
be enabled for test cases. This is a fallback option to
show a full screen Activity to pass tests.
Bug: 221149428
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I4bbe785176fe3fe8831484141aff7367e4ca25ce
2022-03-02 01:24:14 +00:00
Colin Cross
96971375c5
Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102
am: e23884eed9
am: f21625fe80
am: 54a9fd4e17
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011
Change-Id: Ic6ad45cb22a916b93b1afff688885125ab4150c9
2022-03-02 01:18:56 +00:00
Colin Cross
54a9fd4e17
Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102
am: e23884eed9
am: f21625fe80
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011
Change-Id: I6e850608c5454ce80562a956074bc9ebe5c1597d
2022-03-02 00:55:39 +00:00
Colin Cross
f21625fe80
Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102
am: e23884eed9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011
Change-Id: If16d05bf70b7802cfc0aaf917949b62231147058
2022-03-02 00:34:33 +00:00
Colin Cross
e23884eed9
Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011
Change-Id: If31ca44328dd6794977bba78e7c07d89e7d1c796
2022-03-02 00:13:00 +00:00
Yasin Kilicdere
ae871ba823
Fix Guest string was not translated in UMS.userWithName()
...
This CL reverts the changes made in ag/14282598 since the issue is
solved from the source and removes 'String name' parameter from
UM.createGuest() calls.
Bug: 185309160
Test: atest UserDetailsSettingsTest
Change-Id: I92acad938d79e21b45af99cc76ff411022b61f1b
2022-03-02 00:03:00 +00:00
Yasin Kilicdere
86f3500439
Remove the fallback AddSupervisedUserActivity.
...
Rollback the changes done in ag/16388725 and ag/16709333
Bug: 209659998
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: I75b85df50a3caff55375ad261a97225377644a38
2022-03-01 21:59:23 +00:00
Edgar Wang
f97f5f7005
Update workprofile TabLayout for Material Next style
...
1. Upgrade ViewPager to ViewPager2 which provided better support.
2. Apply new TabLayout style
Bug: 193249384
Bug: 195655281
Bug: 193249173
Bug: 179738624
Test: manual
Change-Id: I905ee82f315316c2bf4b73bf5581423878e2c3e7
2022-03-01 18:07:43 +00:00
Yuri Ufimtsev
300f978e9a
Merge "Provide data for BiometricsSafetySource" into tm-dev am: abc541d56d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987673
Change-Id: I8c67eb3f34cbeac36aaef8b7da72d8ed110bcbec
2022-03-01 16:54:06 +00:00
Yuri Ufimtsev
8ce7c8d3d0
Merge "Add warning card for Safety Center when no screen lock is set" into tm-dev am: 530e967ac4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002664
Change-Id: Ifedf08199b8278331911be9422d5598b35b8e633
2022-03-01 16:53:55 +00:00
Yuri Ufimtsev
abc541d56d
Merge "Provide data for BiometricsSafetySource" into tm-dev
2022-03-01 16:52:46 +00:00
Yuri Ufimtsev
530e967ac4
Merge "Add warning card for Safety Center when no screen lock is set" into tm-dev
2022-03-01 16:49:54 +00:00
Jan Tomljanovic
81d74d8a26
Merge changes from topics "facesettingchange", "presubmit-am-1a8eb017a271444b896f19197b617d62" into tm-dev am: 66a3b3a927
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002665
Change-Id: I282d2fa05f84914d484e12a58d0728c1ad52866e
2022-03-01 16:44:10 +00:00
Jan Tomljanovic
66a3b3a927
Merge changes from topics "facesettingchange", "presubmit-am-1a8eb017a271444b896f19197b617d62" into tm-dev
...
* changes:
Trigger SafetyCenter update on each Face setting change.
Trigger SafetyCenter update on each Fingerprint settting change.
2022-03-01 16:21:38 +00:00
Evan Laird
39c4d8b827
Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c
Add setting for showing the vibrate icon in status bar
2022-03-01 16:19:47 +00:00
Yuri Ufimtsev
6cadee43e5
Add warning card for Safety Center when no screen lock is set
...
Test: atest SettingsUnitTests
Bug: 218868097
Change-Id: I4cbc50559dd1d32b5b916a19f7d0b2b27d67510d
2022-03-01 15:52:56 +00:00
SongFerng Wang
d2f3b44d6a
Merge "[MEP] The condition of "null point check" is wrong"
2022-03-01 15:02:19 +00:00
Beverly
81da0689ec
Don't show the "When to show" PreferenceCategory
...
If the ambient display isn't available. This includes
AOD wakeup gestures.
Test: manual
Fixes: 195413949
Change-Id: Ief1876e231288274a35db2fb185ac92864450d48
2022-03-01 14:50:07 +00:00
Julia Reynolds
97420bf2c9
Merge "Disable app toggle for some T+ apps" into tm-dev am: 40caac3c9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002650
Change-Id: Iefc69ed63d3ffd516a73c90d86ef502327934318
2022-03-01 14:10:12 +00:00
Julia Reynolds
40caac3c9e
Merge "Disable app toggle for some T+ apps" into tm-dev
2022-03-01 13:42:26 +00:00
Tsung-Mao Fang
32c1fc76d8
Fix unable to scroll to the bottom page
...
We should set padding for root view instead of margin.
Test: Verify the behavior is correct in single pane
and two panes mode.
Fix: 221422906
Change-Id: I17a63be6e536ffcf39744b2e98dc1ea2723ebf1d
2022-03-01 11:51:03 +00:00
tom hsu
427906c29e
[Tetheirng] Show a dialog indicate tethering is unsupported by carrier.
...
Bug: 161206517
Test: manual
Change-Id: I45a2e42367850ab6fc901fe508671677d843b793
2022-03-01 18:10:10 +08:00
SongFerngWang
f64b2c09c0
[MEP] The condition of "null point check" is wrong
...
The condition of "null point check" is wrong at the
SimSlotChangeHandler.
Bug: 222035986
Test: Build pass. maunal test.
Change-Id: I1b81faf082163643c1d17eae2f66d75b450288fe
2022-03-01 15:46:28 +08:00
Marie Matheson
fa49b11c8f
Merge "On Settings lockscreen changes send new safety status to Safety Center." into tm-dev am: 1a2adf5115
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17007073
Change-Id: Ic80770fd10d2d30c1e8f43989196b787451dfe4e
2022-03-01 07:37:55 +00:00
Marie Matheson
1a2adf5115
Merge "On Settings lockscreen changes send new safety status to Safety Center." into tm-dev
2022-03-01 07:18:02 +00:00
Colin Cross
3f67f87efe
Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions
...
Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY which will show a user
friendly version name for preview releases, and the release version
for final releases.
Bug: 221950960
Test: manual
Change-Id: I3a7e6a3c996d52614b89888afd35da8cff458b43
2022-02-28 18:03:23 -08:00
TreeHugger Robot
b0f4fd347f
Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev am: f73af73a1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980963
Change-Id: I8c36a15f8e525af25eb36fd2585371048ea89228
2022-02-28 22:54:26 +00:00