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
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
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
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
TreeHugger Robot
f73af73a1a
Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev
2022-02-28 22:46:22 +00:00
Yuri Ufimtsev
2b5bf34eda
Provide data for BiometricsSafetySource
...
Test: atest SettingsUnitTests
Bug: 215517420
Bug: 221449065
Change-Id: Id635a02443295757aab277971c4d95a9a62f5576
2022-02-28 21:27:54 +00:00
TreeHugger Robot
046da2b819
Merge "Change dream icon color to be the same as the text color." into tm-dev am: 090e1d395a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015305
Change-Id: I76f5e2980989eba92a48972f3f2abc87247bdf61
2022-02-28 21:12:35 +00:00
TreeHugger Robot
090e1d395a
Merge "Change dream icon color to be the same as the text color." into tm-dev
2022-02-28 20:41:56 +00:00
Joe Bolinger
9b6402b1f2
Merge "Persist state of no thanks button." into tm-dev am: 72f84a96d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17016922
Change-Id: I1727426ef3b8533ee72290120cc529016345f43a
2022-02-28 18:20:41 +00:00
Joe Bolinger
72f84a96d8
Merge "Persist state of no thanks button." into tm-dev
2022-02-28 18:02:28 +00:00
Marie Matheson
9f7374b045
On Settings lockscreen changes send new safety status to Safety Center.
...
Bug: 215518847
Test: atest SettingsUnitTests
Test: make RunSettingsRoboTests
Change-Id: Id8e957e58c45195260157b2b61b93ecbc203164b
2022-02-28 16:36:46 +00:00
Evan Laird
38770319fd
Merge "Add setting for showing the vibrate icon in status bar" into tm-dev am: 969625bc8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986239
Change-Id: I6b8767252a2de9a3b07bac16ea1b18379fd01eb4
2022-02-28 15:35:39 +00:00
Evan Laird
969625bc8e
Merge "Add setting for showing the vibrate icon in status bar" into tm-dev
2022-02-28 15:10:23 +00:00
Joe Bolinger
017545c6d1
Persist state of no thanks button.
...
Fix: 207724636
Test: manual (scroll to bottom and rotate device)
Change-Id: I5ef486dc49abd22387b5f6edf67eedaacc9ded4a
2022-02-25 21:42:36 +00:00
TreeHugger Robot
39697f86e7
Merge "[Panlingual] Fix duplicated locale show on suggested group" into tm-dev am: cfd4c68d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005475
Change-Id: Ie3dda91506593620e0de659793924d9669536813
2022-02-25 19:42:06 +00:00
Menghan Li
2e35afa0ba
Merge "Refine A11y Tile Service javadoc" into tm-dev am: d3a7ec88a0
am: 8743339526
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932278
Change-Id: I3512b51a95237859f131921233dcc2709fc0eefe
2022-02-25 19:14:40 +00:00
Lucas Silva
9548af2cc8
Change dream icon color to be the same as the text color.
...
Bug: 220120729
Test: locally on device
Change-Id: I60de6ba18c0ee46fa1e578e8a7b4c68206024913
2022-02-25 13:39:43 -05:00
Aaron Liu
7e24127f12
Merge "Home Controls: Add Device Controls settings" into tm-dev
2022-02-25 16:19:30 +00:00
Lucas Silva
4d8565dfa9
Merge changes from topic "dreams-oobe"
...
* changes:
[automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3
2p: c8c07f4ac7
[automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3
Allow other layouts to be passed into the dream view adatper.
2022-02-25 15:07:20 +00:00
Lucas Silva
7565dfb999
Merge "Allow other layouts to be passed into the dream view adatper." into tm-dev
2022-02-25 15:07:20 +00:00
tom hsu
62a8514d1b
[Panlingual] Fix duplicated locale show on suggested group
...
- When User select 2 same locale but different region, current logic
will also check 2 times and add these same results into cache.
- Use hashSet to resolve this problem
Bug: 220804297
Test: local
Test: atest pass
Change-Id: I60c63a1eb570373fd714cf9b29ed926d15b2daa7
2022-02-25 09:35:51 +00:00
Jan Tomljanovic
aad5f295b0
Trigger SafetyCenter update on each Face setting change.
...
Test: atest SettingsUnitTests
Bug: 215518850
Change-Id: I7a55fd5368c9aad5329448732125d4e43688eced
2022-02-24 23:46:21 +00:00
Menghan Li
d3a7ec88a0
Merge "Refine A11y Tile Service javadoc" into tm-dev
2022-02-24 21:22:18 +00:00
Lucas Silva
bafbbf4fdc
Merge "Add dream descriptions to dream settings UI." into tm-dev am: 4b6efee1a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989262
Change-Id: I2dac154f7a7b45dd1c7843193c4a22880a596b7a
2022-02-24 20:39:52 +00:00
Julia Reynolds
f56aa26b2e
Disable app toggle for some T+ apps
...
Specifically, apps that haven't requested the notif permission
in their manifest, as we cannot grant/revoke the permission unless
they do
Test: NotificationBackendTest, AppStateNotificationBridgeTest
Fixes: 218315122
Change-Id: Icd936de806d7642809ef6c79d2d169bd673c2659
2022-02-24 14:48:39 -05:00