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
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
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
20faa89e15
Merge "Revert transition codes from the base activity" into sc-dev
2021-06-22 14:11:28 +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
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
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
be845d1541
Merge "Added fp_bad_calibration to fp enrollment." into sc-dev
2021-06-21 20:41:01 +00:00
TreeHugger Robot
25a3914e9a
Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb
am: f26cd7a11e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196
Change-Id: Ie4ca9e1cf1feefcb7e3c2469390dbae50ca71b01
2021-06-21 20:17:26 +00:00
Joe Bolinger
bade9c3558
Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b
am: 32b8330f35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503
Change-Id: Id922e75e70ed4af6b97aa3904f1a7a1739dacb40
2021-06-21 20:17:04 +00:00
Joe Bolinger
620e2eedd8
Add handoff activity to parental consent flow. am: fb515ed608
am: 94add587c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584
Change-Id: Ib68d1ec712a4eb6a73b22aac663e465cf0bac02f
2021-06-21 20:17:02 +00:00
TreeHugger Robot
7752a8be44
Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb
am: fa6829a065
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196
Change-Id: If3ad3d7c6d85f557fb2644640f68e757b254e29d
2021-06-21 20:16:43 +00:00
Joe Bolinger
88fc8f817a
Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b
am: d932268510
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503
Change-Id: I20bf2c44877c2ce19d3092b40893998823b6473c
2021-06-21 20:15:00 +00:00
Joe Bolinger
872bc56abf
Add handoff activity to parental consent flow. am: fb515ed608
am: f7ee87c992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584
Change-Id: I919ec7762bdfe3de75ed7a0153d3781e0905a899
2021-06-21 20:14:58 +00:00
TreeHugger Robot
f26cd7a11e
Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196
Change-Id: I2db1620d7a436d9370063217166ff9564b47323f
2021-06-21 19:58:20 +00:00
Joe Bolinger
32b8330f35
Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503
Change-Id: I6915f90eea8c58c3fbdbb380b5c93ec73db90d8c
2021-06-21 19:57:09 +00:00
Joe Bolinger
94add587c4
Add handoff activity to parental consent flow. am: fb515ed608
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584
Change-Id: Ia81d929181c4820ef55b4663f9807597e05ae040
2021-06-21 19:57:07 +00:00
TreeHugger Robot
fa6829a065
Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196
Change-Id: Ie481fef6a8015206ffd822a6177e1b453cf41fb9
2021-06-21 19:57:02 +00:00
Joe Bolinger
d932268510
Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503
Change-Id: If97be85445da06264840e618efc23dd1c194e1d5
2021-06-21 19:55:03 +00:00
Joe Bolinger
f7ee87c992
Add handoff activity to parental consent flow. am: fb515ed608
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584
Change-Id: Ia92797aaa897b0a31caf5d21b67ee05dd28ce6d4
2021-06-21 19:55:00 +00:00
TreeHugger Robot
65220e5cdb
Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev
2021-06-21 18:46:23 +00:00
Joe Bolinger
daeda0525b
Merge changes from topic "unicorn-hand" into sc-dev
...
* changes:
Add new enum for parental consent UI.
Add handoff activity to parental consent flow.
2021-06-21 17:06:29 +00:00
Jason Hsu
0ee314b055
Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4
am: 6581df598f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190
Change-Id: Id3b9d0be0c71ebe3dda3fb0e12eeaf2e2e022607
2021-06-21 16:27:50 +00:00
TreeHugger Robot
1f7161ec35
Merge "Clean up unused code" into sc-dev am: 3928e0b4f1
am: d56cb9842f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689
Change-Id: I9e8d800efa5633f86617116e08fdcdf01e38b30b
2021-06-21 16:27:44 +00:00
YUKAI HUNG
fcbdc57177
Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a
am: b0930acede
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683
Change-Id: Ib908d9fa283b40f208f097b5ffd1b8eb69cfe133
2021-06-21 16:27:39 +00:00
TreeHugger Robot
8e1b7f8ddb
Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316
am: 04d77c008d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685
Change-Id: Ib5c8b99c1d796d6e189714dc6086a390e7f60def
2021-06-21 16:27:34 +00:00
TreeHugger Robot
9cab75d4a7
Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12
am: 6f2ed120b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578
Change-Id: I9db4033ca4eba0ca8fb4eb99d167540461c74acf
2021-06-21 16:27:29 +00:00
TreeHugger Robot
9d84b54ac0
Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d
am: 3909722588
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682
Change-Id: I5d4f78e1f8e1881184ee3d8da87835d8a80c2ef9
2021-06-21 16:24:23 +00:00
TreeHugger Robot
0f7c1467a9
Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1
am: 9346fb4474
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652
Change-Id: If27d839528ca109cbdcef7d00f60be222c877226
2021-06-21 16:18:58 +00:00
TreeHugger Robot
11c55d019d
Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85
am: 32a55b93f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755
Change-Id: If329d76496c2a921754fe9cf0499960001b2a4ce
2021-06-21 16:18:51 +00:00
Xin Li
41ea853ca2
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d
-s ours am: 4d789befc6
-s ours am: 845c880234
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1741495
Change-Id: I792fb187e40341054129156cdf52b7762be60a30
2021-06-21 16:14:37 +00:00
Edgar Wang
9bac8ec684
Adjust bubbles avatar icon size to align left icon
...
Bug: 185596897
Test: robotest & visual
Change-Id: I5d283db7e6b7f0d8cda9689c1ead2fdd318cc8ab
2021-06-21 23:59:45 +08:00