Stanley Wang
95f2a11593
Merge "Refine the About phone page." into sc-dev
2021-06-23 03:00:19 +00:00
Yi Jiang
5bfb7f9380
Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584
am: 708845caca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779
Change-Id: Ic83a0e6f253ca22474addfd35b93d44f2245480f
2021-06-23 00:18:46 +00:00
Matt Pietal
3947c8852c
Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee
am: 7922f41d88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627
Change-Id: I9fa2597b8c9d4f6e5963288bb6f453e2d87d9d7a
2021-06-23 00:18:38 +00:00
Arc Wang
5e7a242c8f
Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95
am: 9c30b55beb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055
Change-Id: I5938a686365ce08d392565c6cddcc8401bbc384e
2021-06-23 00:18:30 +00:00
TreeHugger Robot
e97da100dd
Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15
am: e62bae21db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866
Change-Id: I2c7c2727dd932ee4d6d344810275993eb25c8e7a
2021-06-23 00:18:01 +00:00
TreeHugger Robot
a623c1cd41
Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c
am: 4b13bd3517
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681
Change-Id: Id37d1a8d8121c4be13c29dc666260e5124eeb2ed
2021-06-23 00:15:28 +00:00
tim peng
151025ead2
Merge "Not support group volume control" into sc-dev am: 49bf60df47
am: e74aa45c72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137
Change-Id: I53e3cef45ace41cba2655fb31af106795b768e91
2021-06-23 00:15:06 +00:00
TreeHugger Robot
518c3ce3c5
Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b
am: 88cbac1ac9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686
Change-Id: Id3f08764b4f6b068869c614b20ef8087c25a8028
2021-06-23 00:01:55 +00:00
Joshua Mccloskey
8ac7902d78
Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541
am: 894e209275
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458
Change-Id: I1bb4004caadadaf54f33c365814e09ac6e13aaa3
2021-06-22 23:34:12 +00:00
Yi Jiang
63b698bfba
Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584
am: aee4809820
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779
Change-Id: I257e6a6ca5347e3ff47688d3189fb70bd2c5fbc7
2021-06-22 17:06:50 +00:00
Yi Jiang
aee4809820
Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779
Change-Id: I22c6386b7c25d761b9d01a66788dd9d25643e21c
2021-06-22 17:03:15 +00:00
Matt Pietal
3ae1519d2d
Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee
am: 4176d9fe01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627
Change-Id: I6c7b56ccdc4d0dab978c11b584345f5575fc0a10
2021-06-22 17:02:41 +00:00
Arc Wang
8b070042fc
Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95
am: af29784f34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055
Change-Id: Iea9a08f0c74c6b423e46a1530ea3792d62791356
2021-06-22 17:02:33 +00:00
Yi Jiang
708845caca
Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779
Change-Id: I88fd8f9e99d55f1e036a3d6c23a25b32cb30a1d3
2021-06-22 17:02:13 +00:00
Yi Jiang
2de946e584
Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev
2021-06-22 16:59:20 +00:00
Matt Pietal
4176d9fe01
Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627
Change-Id: Ia6f7c24b2d93426366ac031ae766e78db678e5d9
2021-06-22 16:45:50 +00:00
Arc Wang
af29784f34
Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055
Change-Id: I022679cace9a3edf7da86fca4711bbdc48ec0536
2021-06-22 16:45:45 +00:00
Matt Pietal
7922f41d88
Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627
Change-Id: Ie0de066052b3492695841d3d1a77018d29631681
2021-06-22 16:44:49 +00:00
Arc Wang
9c30b55beb
Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055
Change-Id: Icd0ad261e41ef6ee563e43aff91edd26a7feb93d
2021-06-22 16:44:43 +00:00
Matt Pietal
c07d6ba8ee
Merge "Restore lockdown setting" into sc-dev
2021-06-22 16:41:44 +00:00
Arc Wang
b0e55afc95
Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev
2021-06-22 16:25:13 +00:00
TreeHugger Robot
e41ce63337
Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15
am: e79286902d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866
Change-Id: I78abd84fb8819e406fadd5254ad79da7436391e9
2021-06-22 16:15:44 +00:00
TreeHugger Robot
6b0b634636
Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c
am: 765dfcb761
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681
Change-Id: I6e64f897d3d6fabfd6e322e59e285a1c9bc24543
2021-06-22 16:15:38 +00:00
tim peng
bd4f684127
Merge "Not support group volume control" into sc-dev am: 49bf60df47
am: a59db06434
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137
Change-Id: If5be317d3357d1920603cd8c73b7ba5c9f32f54d
2021-06-22 16:15:21 +00:00
TreeHugger Robot
0b7755b40a
Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b
am: 6d459fbfee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686
Change-Id: I12c2db968e0ffc8eb2246bea524b5d71da196a1a
2021-06-22 16:05:01 +00:00
Joshua Mccloskey
a37c193300
Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541
am: 6ca804bea3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458
Change-Id: I815dfc484a96618d7c0b02c955c212cdbf36287b
2021-06-22 15:12:34 +00:00
TreeHugger Robot
e79286902d
Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866
Change-Id: If4c82a4c6d23e06d3b6351fee45109c3631a46ae
2021-06-22 15:11:38 +00:00
TreeHugger Robot
765dfcb761
Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681
Change-Id: Ied5371f7d59f521720634ff53ed7d6c77ddabf5e
2021-06-22 15:11:25 +00:00
tim peng
a59db06434
Merge "Not support group volume control" into sc-dev am: 49bf60df47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137
Change-Id: I1381127514e3f091cec72b799e7e46364ad12352
2021-06-22 15:08:57 +00:00
TreeHugger Robot
6d459fbfee
Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686
Change-Id: I09003d3d58b1afe63d02155fc9e77d9f9e9a5a69
2021-06-22 15:06:19 +00:00
Joshua Mccloskey
6ca804bea3
Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458
Change-Id: Iffa32888446502dbfbc5fe057a399611c77f8de4
2021-06-22 14:57:14 +00:00
Matt Pietal
7cfd8e3cec
Restore lockdown setting
...
This was removed in error while adding wallet/controls options in
ag/14353975
Bug: 190800943
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: Id73a584d7016cf1e649dcbceeba4e81aaa2370cc
2021-06-22 10:56:20 -04:00
TreeHugger Robot
e62bae21db
Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866
Change-Id: I31c21a8fc88dde07afd2ffe99c682b18703963c7
2021-06-22 14:22:23 +00:00
TreeHugger Robot
20faa89e15
Merge "Revert transition codes from the base activity" into sc-dev
2021-06-22 14:11:28 +00:00
TreeHugger Robot
4b13bd3517
Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681
Change-Id: Ic78285b59ac096ee7a986a1817f915944f19dec0
2021-06-22 12:48:30 +00:00
TreeHugger Robot
dbd5c9cc7c
Merge "Rollback the See More Intent for non-provider model design" into sc-dev
2021-06-22 12:39:05 +00:00
Weng Su
ebcfa17353
Fix the NPE issue
...
Bug: 190938633
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I249d701abfa79872a331c071116d2db0bfdcced6
2021-06-22 18:20:55 +08:00
Yi-Ling Chuang
2a5553707e
Revert transition codes from the base activity
...
Bug: 191335572
Test: robotest
Change-Id: Iaf0c3086586affb091f38097df19e68b7e49e19a
2021-06-22 17:37:37 +08:00
Weng Su
4f1ebfdc55
Rollback the See More Intent for non-provider model design
...
Bug: 191055897
Test: manual test
atest -c InternetConnectivityPanelTest
atest \
CtsProviderTestCases:android.provider.cts.SettingsPanelTest#internetPanel_seeMoreButton_launchesIntoSettings -- --abi arm64-v8a
Change-Id: Iad57dd6a9cdbc4b33f80255bdb4758f80f9f2151
2021-06-22 09:31:32 +00:00
Stanley Wang
0c5bc76208
Refine the About phone page.
...
- Add the following categories
Basic info
Legal & regulatory
Device details
Device identifiers
- Remove the dividers
Fix: 179649869
Test: robotest and see the UI
Change-Id: Iecd49442cff164eb73f65f6b41fb18af9cadf8a4
2021-06-22 16:35:52 +08:00
Yi Jiang
ca6c548a67
Hides Screen Attention setting when AttentionService isn't installed.
...
Bug: 191696609
Test: make RunSettingsRoboTests
Change-Id: I5a38b023db91202801a8a3e975f562ddcfe6696e
2021-06-22 00:54:10 -07:00
tim peng
e74aa45c72
Merge "Not support group volume control" into sc-dev am: 49bf60df47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137
Change-Id: Ia3279bc91de4646a8863dc7f67f1d5a34ad1b83b
2021-06-22 07:41:47 +00:00
tim peng
49bf60df47
Merge "Not support group volume control" into sc-dev
2021-06-22 07:24:43 +00:00
Arc Wang
4a97095e36
Fix 'No Apps' UI issues of ManageApplications
...
Fixes below UI issues
- "No Apps" may not show in fragments of profile tab.
Fix it by using ConstraintLayout to specify alignments
of each view and removing extra padding.
-- "No Apps" may flicker by moving position.
The flicker is from unnecessary visibility changes.
This change integrates empty view visibility
control in LoadingViewController to simplify code
and avoid unnecessary visibility changes.
Bug: 189390795
Bug: 183398721
Test: atest com.android.settings.deviceinfo
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
Manual visual, observe UI
Settings -> Storage -> Games
Settings -> Notifications -> App Settings
Settings > Apps > Special app access > Media management apps
Change-Id: I9a2500f2fd1dd073ab88f26187541964719523d0
2021-06-22 11:04:24 +08:00
TreeHugger Robot
88cbac1ac9
Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686
Change-Id: Ib3a82269aeebe5a4752a44584dc7c8bda29d1bee
2021-06-22 01:53:22 +00:00
TreeHugger Robot
b96246196b
Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev
2021-06-22 01:26:59 +00:00
Mill Chen
546dd8724d
Suppress the action bar in SetupChooseLockGeneric
...
The collapsing toolbar is introduced on S, which caused the Choose a
screen lock page has two different header. This CL is to supress the
collapsing toolbar from this page and also apply color extraction to the
page.
Bug: 190499041
Test: manual test
Make sure there's no collapsing toolbar in the page.
Change-Id: I8b7ea089bd9e9e7acdf0236099b1eb6270f0a816
2021-06-22 08:10:30 +08:00
Mill Chen
3f8f0a4356
Dissable scrolling behavior for collapsing toolbar
...
We intended to make subsetting pages disable the scrolling behavior
within the collapsing toolbar area. The collapsing toolbar is still
able to be expanded/collapsed depending on the content of page.
Fix: 191614437
Fix: 189003332
Test: manual test
Cannot scroll/drag with the collapsing toolbar area
Change-Id: I6755268781b8b3d1a76bf71f9e39e6de4eeb76e3
2021-06-22 05:30:01 +08:00
Joshua Mccloskey
894e209275
Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458
Change-Id: I93daa5a94413a7bdf2b80d97a32bbdfaa1f446f3
2021-06-21 20:51:15 +00:00
Joshua Mccloskey
be845d1541
Merge "Added fp_bad_calibration to fp enrollment." into sc-dev
2021-06-21 20:41:01 +00:00