Commit Graph

84119 Commits

Author SHA1 Message Date
PETER LIANG
97b448424e Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551

Change-Id: Ia79c77dd380df5c19458491b507d8692ba4cfcb3
2021-06-23 14:37:03 +00:00
PETER LIANG
a458f9cdea Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev 2021-06-23 14:22:09 +00:00
Jeremy Goldman
e0cb5e6c51 Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I0fcc70fb8de50c9479233e99a02b71af4a5c860a
2021-06-23 10:30:23 +00:00
Jeremy Goldman
e68805950d Merge "Null check added when updating the roaming status." into sc-dev 2021-06-23 10:27:32 +00:00
TreeHugger Robot
bffc06f40d Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I96c848014cfa89891063f6d96c1adae4028b8f4f
2021-06-23 10:26:46 +00:00
TreeHugger Robot
c4501805c9 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I6f829f5473ddf9ec3181dc4fc021aa0d58fa1579
2021-06-23 10:26:23 +00:00
TreeHugger Robot
a4b5ecc5f9 Merge "Fix the NPE issue" into sc-dev am: 74babf6e91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: I0af12140f7906e6e7da55af995ccd32a868b0272
2021-06-23 10:26:05 +00:00
TreeHugger Robot
b86f0c0472 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev 2021-06-23 10:19:04 +00:00
TreeHugger Robot
d26416ce81 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev 2021-06-23 10:11:33 +00:00
TreeHugger Robot
74babf6e91 Merge "Fix the NPE issue" into sc-dev 2021-06-23 10:10:22 +00:00
Peter_Liang
e9d0590b24 Fixing the SettingsRoboTest failure of the AnimatedImagePreference.
Root cause:
Seem to need lottie raw resource when inflating the LottieAnimationView.

Action:
Use the mock for LottieAnimationView to avoid init when inflating the layout.

Bug: 191251677
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AnimatedImagePreferenceTest
Change-Id: I0197442e5a65b40142b128f28a1c6bcd7cd3a0bd
2021-06-23 18:03:11 +08:00
Weng Su
362bf07919 [Provider Model] Add Wi-Fi toggle in internet panel
- Add a new slice row for Wi-Fi toggle in the network lists

- Increase the maximum number of network lists to 6

Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Ie25e108573f264ab3a94fc6804b9d46d855eeea1
2021-06-23 17:19:34 +08:00
Weng Su
627efc46a2 [Provider Model] Show carrier network to internet preference
- If the connected network is the merged carrier Wi-Fi, then show
carrier network to internet prefernce.

Bug: 191091045
Test: manual test
atest -c InternetUpdaterTest

Change-Id: Iad3869f086ea0a4d0607691c6709ee12567831c7
2021-06-23 15:55:24 +08:00
Jason Hsu
c8e72bb75e Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev am: 200bc6e161
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067018

Change-Id: If6a532f3dd8fa6cefe669f9308184ef3396e99dc
2021-06-23 06:24:58 +00:00
TreeHugger Robot
2686aa70c6 Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev am: 94bc9d4c31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048199

Change-Id: If6ea7985dc870865ae6db1950814260d35e9f5f7
2021-06-23 06:24:52 +00:00
TreeHugger Robot
f791f3b988 Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028

Change-Id: I810aaf8bdc71dc41ff0badaa1c1e2452976f46d2
2021-06-23 06:24:03 +00:00
Jason Hsu
200bc6e161 Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev 2021-06-23 06:04:01 +00:00
TreeHugger Robot
94bc9d4c31 Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev 2021-06-23 04:24:29 +00:00
jasonwshsu
aab1b7412a Fix "Dark theme" can not be searched by keywords
Root cause: Misadded into night display

Solution: Add them back into dark ui

Fix: 191828775
Test: manual test
Change-Id: I93cc0dd6231602f4705a894a86dbf4cc278766d6
2021-06-23 12:09:58 +08:00
TreeHugger Robot
60b63d549a Merge "Fix missing share context option in settings app" into sc-dev 2021-06-23 03:47:39 +00:00
Stanley Wang
0f97f4c75c Merge "Refine the About phone page." into sc-dev am: 95f2a11593
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056865

Change-Id: I06af409c31e22b854cfcc13805d12b8b54807fa6
2021-06-23 03:17:03 +00:00
Stanley Wang
95f2a11593 Merge "Refine the About phone page." into sc-dev 2021-06-23 03:00:19 +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
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
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
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
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
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
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
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
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
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
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
05e21445b8 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: Iea48cb1d04c4d2f2c3afe00fb1f0f2da7809d1a0
2021-06-21 19:55:32 +00:00
Joe Bolinger
69291542a5 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: Idb2045adfc3d220555330ea735fc4b04719c5976
2021-06-21 19:53:49 +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