Yi Jiang
d27a09ed94
Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584
am: 966beb8255
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779
Change-Id: I93c73f81aa0bfe736078571b08a57d5f14a42e56
2021-06-22 17:06:22 +00:00
Yi Jiang
966beb8255
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: Iddf713f724ba0effd20ad61331cf2af5bd5e1512
2021-06-22 17:02:46 +00:00
Matt Pietal
b854d06a08
Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee
am: 0f45813339
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627
Change-Id: I9a0717fcbe2fc1fd36b7c94a1bec3bcf4bae68f6
2021-06-22 17:02:11 +00:00
Arc Wang
a40924f815
Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95
am: a3ca0a08d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055
Change-Id: I5a053d3500b6789a995ed004ce3896ebc80f0fa1
2021-06-22 17:01:47 +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
Quang Luong
82934c57e7
Merge "Add WifiTrackerLib as separate dependency from SettingsLib"
2021-06-22 16:47:56 +00:00
Matt Pietal
0f45813339
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: Iafd2896177f4b9ed67fd0bdb978c363e92fad7ed
2021-06-22 16:44:55 +00:00
Arc Wang
a3ca0a08d6
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: If349df73c14815307b9dbb38aef776ad58f8f386
2021-06-22 16:44:47 +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
83969a4ffd
Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15
am: e79286902d
am: e41ce63337
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866
Change-Id: I27a7623c4bd1f531cd6820b46f6ae4a4ea8222b3
2021-06-22 16:20:17 +00:00
TreeHugger Robot
a6a7882891
Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c
am: 765dfcb761
am: 6b0b634636
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681
Change-Id: I3f1c190d8f38349b7a3463bf2993721c47f8f1c3
2021-06-22 16:20:11 +00:00
tim peng
15aa65d63f
Merge "Not support group volume control" into sc-dev am: 49bf60df47
am: a59db06434
am: bd4f684127
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137
Change-Id: I7f0c343eb11ebb2bc7395ae5a1703f72409a2db6
2021-06-22 16:20:05 +00:00
TreeHugger Robot
6450b3a3d2
Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b
am: 6d459fbfee
am: 0b7755b40a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686
Change-Id: If8a2b79a48e8277d7bc18ebf6282f38d5e500ab6
2021-06-22 16:19:45 +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
fd04b52e27
Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541
am: 6ca804bea3
am: a37c193300
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458
Change-Id: I810f0896b2795998b2701922806da24734cd5c04
2021-06-22 15:24:51 +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
0007a99fa6
Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15
am: 8d72155a07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866
Change-Id: I813c2f7fe3918109719992302f908f6d17ae30d0
2021-06-22 14:35:04 +00:00
TreeHugger Robot
8d72155a07
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: I0d50fc118e4ea54eba2a2165bbe643731cff2487
2021-06-22 14:21:15 +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
ae2793958d
Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c
am: ed23563724
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681
Change-Id: I28e9ef93d74c6063545fac0b6be940f4991d61e8
2021-06-22 13:05:19 +00:00
TreeHugger Robot
ed23563724
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: I121b07f984f672944ea5ea6daad84b22ce377a2c
2021-06-22 12:49:39 +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
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
tim peng
406b95300d
Merge "Not support group volume control" into sc-dev am: 49bf60df47
am: 933779af30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137
Change-Id: I38d2b6ae8f8eca00e8a2819648e8afef75e1d43d
2021-06-22 07:57:37 +00: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
933779af30
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: I61a2d15f26c46594b390d84349f25d8b6df7d93f
2021-06-22 07:39:53 +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
Syaoran Kuo
b1d2e82bc3
Merge "Add testcase: Add multiple user and delete."
2021-06-22 02:49:37 +00:00
TreeHugger Robot
1e1b5fe32b
Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b
am: b2aa3a2c8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686
Change-Id: If0fdfa105c06a2b84e61f3e7e37cd109cfa78fcf
2021-06-22 02:11:59 +00:00
TreeHugger Robot
b2aa3a2c8e
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: If083327a5bee129ce4c0bee11646667b7b5e9be9
2021-06-22 01:52:25 +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
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
5fe9ace936
Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541
am: 306642fc38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458
Change-Id: I59a11fe53492c096c5aaf59157f48f8bc44551a9
2021-06-21 21:03:09 +00:00
Joshua Mccloskey
306642fc38
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: If66320c54e0e23a8cda5a1b57cb209236ef34499
2021-06-21 20:52:12 +00:00
Joshua Mccloskey
be845d1541
Merge "Added fp_bad_calibration to fp enrollment." into sc-dev
2021-06-21 20:41:01 +00:00
TreeHugger Robot
dc08ae4b61
Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb
am: f26cd7a11e
am: 25a3914e9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196
Change-Id: Ia1016ff53e0fb0e16cd8e5da4317e8e0daf35481
2021-06-21 20:36:34 +00:00
Joe Bolinger
38c477f704
Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b
am: 32b8330f35
am: bade9c3558
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503
Change-Id: If2ed548b007be221043ea9da0b2c1251685dd3a3
2021-06-21 20:36:09 +00:00
Joe Bolinger
efc6e4eb46
Add handoff activity to parental consent flow. am: fb515ed608
am: 94add587c4
am: 620e2eedd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584
Change-Id: I1fa3abdbadec8716c042ba75003d2d581f28d51b
2021-06-21 20:36:07 +00:00