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
ca34582b3f
[automerger skipped] Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d717
am: adab78d3ce
-s ours
...
am skip reason: Merged-In I518679f90c63e12f61f08d08d5ed3f3900825be2 with SHA-1 0607c5116c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986445
Change-Id: I14b2811a97f5d860d6594615b2919bca9089cf3c
2022-03-02 10:28:46 +00:00
TreeHugger Robot
bc76e74e2d
[automerger skipped] Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d717
-s ours
...
am skip reason: Merged-In I518679f90c63e12f61f08d08d5ed3f3900825be2 with SHA-1 cda892df85
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986445
Change-Id: I24d0882afc3afedd0d707ebed547a7ec5e980e5c
2022-03-02 10:06:58 +00:00
Mill Chen
3a524f2d33
[automerger skipped] Cache mechanism for Storage page with work profile am: 0607c5116c
-s ours
...
am skip reason: Merged-In I518679f90c63e12f61f08d08d5ed3f3900825be2 with SHA-1 cda892df85
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986445
Change-Id: I9c30d728ea89520a77d923e6debb461ac823bf31
2022-03-02 10:06:57 +00:00
TreeHugger Robot
adab78d3ce
Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d717
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986445
Change-Id: I882442bb7b4e230294882d7d0439af16a2ae15af
2022-03-02 10:06:12 +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
Peter_Liang
51f1225954
Polish and humanize the summaries for "Remove animations" and "Large mouse pointer".
...
Fix: 221167118
Test: manual test
Change-Id: If5ba34ddcfed4d2b7b9166381f928f5943a5d22e
2022-03-02 08:25:14 +00:00
Arc Wang
4e5cdb259f
Merge "Only show 2-pane deep link when homepage is available" into tm-dev am: f74e1195a4
am: 3da67a327b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005472
Change-Id: I17fdb129a401aa1a8c5de91211b59ab1f05b06f9
2022-03-02 08:05:08 +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
3da67a327b
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: I015e41f1d3245190b2d4a0f893fa676c2f284457
2022-03-02 07:43:42 +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
ab2ba44583
Merge "Fix unable to scroll to the bottom page" into tm-dev am: 88bff1ebc5
am: e582ce16c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033482
Change-Id: I052c0a18be41f19cbc571f9dd0ed11032af02367
2022-03-02 04:01:59 +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
e582ce16c7
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: Ica14a430abc91aeaa2c2647d166beb3472eff07e
2022-03-02 03:40:47 +00:00
Edgar Wang
2e812b1331
Merge "Update workprofile TabLayout for Material Next style" into tm-dev am: ab22c72319
am: 64cb966e8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17020504
Change-Id: Ia76edef46e3ac4a64270492798f7fae39f9ac076
2022-03-02 03:19:14 +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
64cb966e8a
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: I8331680a21997eb0de2aa34618578e6ed2c4b4ed
2022-03-02 02:56:38 +00:00
Edgar Wang
ab22c72319
Merge "Update workprofile TabLayout for Material Next style" into tm-dev
2022-03-02 02:28:03 +00:00
menghanli
ba498a8205
Show different tooltips for QS features auto-added and non-auto-added
...
- Update the illustration
- Update the subtext
Bug: 220655084
Bug: 218968108
Test: manual testing
Change-Id: I01fb191d1a39d15d7dda0eef67459005887f5a77
2022-03-02 02:01:31 +00:00
Colin Cross
334746f8e6
Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102
am: e23884eed9
am: f21625fe80
am: 54a9fd4e17
am: a80704330d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011
Change-Id: I5f797b570ec9d3f03a8dc3684c1275f49b78f501
2022-03-02 01:40:51 +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
a80704330d
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: I7fa42478632ded03fc576a87a3b48d54094c00c2
2022-03-02 01:19:36 +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
Colin Cross
9c59242102
Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions"
2022-03-02 00:01:05 +00:00
Adam Bookatz
604045b50b
Merge "Fallback Home doesn't restart on keyboard change" into tm-dev am: f886179845
am: 059b74f60c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17009044
Change-Id: I401d38563989eddf28adf7ae62895c328ae5ec19
2022-03-01 23:41:05 +00:00
Adam Bookatz
059b74f60c
Merge "Fallback Home doesn't restart on keyboard change" into tm-dev am: f886179845
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17009044
Change-Id: I4fe00a1b4de7af3f5af95dc4d563cc4c82767075
2022-03-01 23:18:20 +00:00
Adam Bookatz
74f60b3e3f
Merge "Fallback Home doesn't restart on keyboard change" into tm-dev am: f886179845
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17009044
Change-Id: I1ddd80925bcf2bc1dbafca1bbfcf12620c3476de
2022-03-01 23:17:57 +00:00
Adam Bookatz
f886179845
Merge "Fallback Home doesn't restart on keyboard change" into tm-dev
2022-03-01 22:51:27 +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
Evan Laird
b46b7b1d4a
[automerger skipped] Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev am: 15a87a86bb
-s ours am: 3a46e06c41
-s ours am: 90aabce9b4
-s ours am: 3283e20fe7
-s ours
...
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 16148d2c8c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932463
Change-Id: Iaf6a12d8591bb05f68be00aebd95c48c60036b70
2022-03-01 17:07:40 +00:00
Yuri Ufimtsev
a980343ccc
Merge "Provide data for BiometricsSafetySource" into tm-dev am: abc541d56d
am: ac13628a14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987673
Change-Id: I3b4a7ccb564af3f26183d7d768120332de044b6f
2022-03-01 17:06:24 +00:00
Evan Laird
3283e20fe7
[automerger skipped] Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev am: 15a87a86bb
-s ours am: 3a46e06c41
-s ours am: 90aabce9b4
-s ours
...
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 16148d2c8c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932463
Change-Id: I71ea3d4fd2de9387ef3a5b5d7971a7d44c2fe430
2022-03-01 17:06:14 +00:00
Yuri Ufimtsev
884674ff3c
Merge "Add warning card for Safety Center when no screen lock is set" into tm-dev am: 530e967ac4
am: 7f11e71f1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002664
Change-Id: I228627812347266ca725ccae867bcfd50c9ffa98
2022-03-01 17:05:46 +00:00
Evan Laird
90aabce9b4
[automerger skipped] Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev am: 15a87a86bb
-s ours am: 3a46e06c41
-s ours
...
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 16148d2c8c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932463
Change-Id: Ia3919d432c81dced9012c556b9c1dacd393725a2
2022-03-01 17:05:36 +00:00
Yuri Ufimtsev
ac13628a14
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: I3c2de7d8633bb45cfed0af4165495e24d09e14a4
2022-03-01 17:05:08 +00:00
Evan Laird
9c464b037a
[automerger skipped] Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp am: 39c4d8b827
-s ours am: 9aba5cfec7
-s ours am: db837c042f
-s ours
...
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 4871b2cf6a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932463
Change-Id: Id88a00ed0a883075e26b38fd0d893bf81974bff9
2022-03-01 17:04:50 +00:00
Presubmit Automerger Backend
d6f17285a6
[automerger skipped] [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c
am: 0b843be422
-s ours am: cf59b35348
-s ours am: 3be6183595
-s ours
...
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 4871b2cf6a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932463
Change-Id: I4e43af475b82720dc35d43aca731dff8481a2e12
2022-03-01 17:04:49 +00:00
Jan Tomljanovic
3c8ecfe6d4
Merge changes from topics "facesettingchange", "presubmit-am-1a8eb017a271444b896f19197b617d62" into tm-dev am: 66a3b3a927
am: a9f0e99ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002665
Change-Id: I75d438e19adfb4efc15a9d297ec5269300de00bc
2022-03-01 17:04:30 +00:00
Yuri Ufimtsev
7f11e71f1e
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: I332bc6a8f3f4add4a3b593d957be95d8d01e4122
2022-03-01 17:04:29 +00:00
Jan Tomljanovic
67694d2e8a
Trigger SafetyCenter update on each Fingerprint settting change. am: 51b6eb3260
am: e560fac0de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16993804
Change-Id: I276cfc1b38682db3f92c877b66b5990d454f9e36
2022-03-01 17:04:28 +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