Commit Graph

10581 Commits

Author SHA1 Message Date
Janis Danisevskis
3ac41cc279 Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into sc-dev am: e067adcce7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13702356

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I268cbf5ec0d25f86e4614fafd1f3edd5ea261d79
2021-02-26 16:58:15 +00:00
Janis Danisevskis
e067adcce7 Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into sc-dev 2021-02-26 16:05:13 +00:00
Janis Danisevskis
93af3137fc Keystore 2.0: Update Wifi settings to use mostly public keystore API.
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
Change-Id: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
2021-02-25 17:40:19 -08:00
Jeremy Goldman
47e1c78343 Merge "PrivateVolumeOptionMenuControllerTest converted to JUnit" 2021-02-25 05:43:56 +00:00
Jeremy Goldman
3098ea1274 Merge "BrandedAccountPreferenceControllerTest converted to JUnit" 2021-02-25 05:43:29 +00:00
Paul Hu
dbcd0ba8c8 Merge "Replace ConnectivityManager hidden symbols on Settings" into sc-dev am: e6f2889e01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13668411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib93bbaa05a9ddf13a6dc45ea06883544ff0fb452
2021-02-25 04:30:38 +00:00
Paul Hu
e6f2889e01 Merge "Replace ConnectivityManager hidden symbols on Settings" into sc-dev 2021-02-25 03:43:50 +00:00
Jeremy Goldman
9ec80bb8b0 Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" 2021-02-25 01:31:20 +00:00
Suprabh Shukla
9f566fe469 Merge "Adding alarms and reminders activity" into sc-dev am: a78849982d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13633051

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic41874282654b015c7fa450af9b3066b19c72e1a
2021-02-24 21:18:15 +00:00
Suprabh Shukla
a78849982d Merge "Adding alarms and reminders activity" into sc-dev 2021-02-24 20:06:56 +00:00
TreeHugger Robot
43490276ac Merge "Revert "Revert "Use location access for recent location apps.""" into sc-dev am: 69fab4bdaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13679462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaedd2ae21c4308504ed4d17d62da3b0b9a6dc726
2021-02-24 18:28:14 +00:00
TreeHugger Robot
69fab4bdaa Merge "Revert "Revert "Use location access for recent location apps.""" into sc-dev 2021-02-24 18:06:41 +00:00
TreeHugger Robot
e2e8219452 Merge "Fix the higlighted settings not work properly from search" into sc-dev am: 3e2a7f6186
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13495590

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67ff291f78c9cbc0322a98cae9797b782dad5111
2021-02-24 15:58:07 +00:00
Tsung-Mao Fang
ef87755c34 Fix the higlighted settings not work properly from search
Since the Andorid S, we introduce the CollapsingToolbarLayout
, the highlighted funcation might break for unkown reason.
I observed that broken cases with overlapping issue on tool bar.
The possible root cause is the interation bwtween
CoordinatorLayout v.s CollapsingToolbarLayout v.s Recycler
view.

This cl is definetly a workaround to prevent this issue.
I try to collapse the tool bar with an animation before
we start to scroll the list. This makes the overall transition smooth
but always collapse the tool bar.

Fix: 177968297
Test: Click a lot of search results, and screen should highlight
settings correctly.

Change-Id: Id9c32b642433dcc39c179a2cc83a06e77cc47888
2021-02-24 16:46:08 +08:00
Jeremy Goldman
899eb7282d TopLevelStoragePreferenceControllerTest converted to JUnit
Helper function composed to return thread future, to guarantee
concurrent function finishes before test condition is checked.
Additionally a @VisibleForTesting helper function is used rather than
robolectric reflection helpers to set a class variable.

Test: atest -c TopLevelStoragePreferenceControllerTest
Change-Id: Ia22ebac4baec60f72b8516e9e79998cd788266ab
2021-02-24 16:24:19 +08:00
Wei Wang
22399153dc Revert "Revert "Use location access for recent location apps.""
This reverts commit 5da4f381a6.

Reason for revert: Fixed the crash and roll forward

Test: Manual - tested with work profile.
Change-Id: I8b500b8fddc58cc0d0e5e7f4e54d8bb5cb6b3022
2021-02-24 00:08:04 -08:00
Stanley Wang
6c45d16509 Merge "Replace the SwitchBar with MainSwitch." into sc-dev am: beefb25b48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13472947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5378d834b478d5abec20d9cc1b25d0c52fbe0c7b
2021-02-24 07:00:04 +00:00
Suprabh Shukla
c8b9240535 Adding alarms and reminders activity
Adding a settings screen to control the permission SCHEDULE_EXACT_ALARM.
Apps can start this by starting a newly introduced API intent
REQUEST_SCHEDULE_EXACT_ALARM.

Test: make -j RunSettingsRoboTests
Manually by UI inspection:
Settings -> Apps -> Special App access -> Alarms and Reminders
or by running:
adb shell am start -a android.settings.REQUEST_SCHEDULE_EXACT_ALARM

Bug: 171306433
Bug: 171305516
Change-Id: I1293d38fc50a22b2af46f80ab24f676ed632f964
2021-02-23 22:32:24 -08:00
paulhu
6151c227e0 Replace ConnectivityManager hidden symbols on Settings
Connectivity is becoming a mainline module in S, so
ConnectivityManager hidden symbols can not be used for outside
components. Besides, most Tethering relevant methods or variables
on CM are migrated to TetheringManager. So replace all these
methods or variables from ConnectivityManager to TetheringManager
on Settings.

Bug: 180693313
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<Modified Test>
Change-Id: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
2021-02-24 06:17:17 +00:00
Stanley Wang
beefb25b48 Merge "Replace the SwitchBar with MainSwitch." into sc-dev 2021-02-24 06:04:03 +00:00
Jeremy Goldman
d2a5331711 PrivateVolumeOptionMenuControllerTest converted to JUnit
ArgumentCaptor used to verify which activity is started by the context.
Additionally, spy of application runtime context used instead of a
robolectric shadowActivity

Test: atest -c PrivateVolumeOptionMenuControllerTest
Change-Id: I5afd83cc09d57150661b22156a2fb06e1f09ea0b
2021-02-24 13:59:13 +08:00
Jeremy Goldman
b277923e56 BrandedAccountPreferenceControllerTest converted to JUnit
Resource determining controller availability is mocked, rather than
using robolectric device config.

Diff: https://diff.googleplex.com/#key=JywCGq1rz3Pb
Test: atest -c BrandedAccountPreferenceControllerTest
Change-Id: I14e6db63af29479cb663895f9d9259bff0df43b7
2021-02-24 05:41:03 +00:00
TreeHugger Robot
df2fb91fd1 Merge "Move LocationServicePreference to Location > LocationServices" into sc-dev am: 6731f0eb7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13605909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28967dd9c7981c60d21c30a08cc7c8d8ef03af3d
2021-02-24 02:40:07 +00:00
Jeremy Goldman
eb86ccbf6b Merge "BuildNumberPreferenceControllerTest converted to JUnit" 2021-02-24 01:44:55 +00:00
TreeHugger Robot
6731f0eb7a Merge "Move LocationServicePreference to Location > LocationServices" into sc-dev 2021-02-24 01:41:25 +00:00
Jeremy Goldman
22241eb25f BuildNumberPreferenceControllerTest converted to JUnit
UserManager spy used instead of ShadowUserManager.
ArgumentCaptor used for ClipData rather than getting the primary clip.
Test: atest -c BuildNumberPreferenceControllerTest

Change-Id: Idd9e93371f1abda7bf9169ee86116fb7efb9ca09
2021-02-23 17:15:24 +08:00
Stanley Wang
86cc0579f3 Replace the SwitchBar with MainSwitch.
- Update wi-fi calling switch.
- Update the switches in Accessibility

Fix: 178673860
Fix: 177968565
Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: Id10e6a110f418ea500a2eaf3c54752bef4f36507
2021-02-23 16:21:52 +08:00
Jeremy Goldman
e8dba387f6 Merge "HardwareInfoPreferenceControllerTest migrated to JUnit." 2021-02-23 07:11:25 +00:00
Wesley.CW Wang
3e31334065 Remove "Battery optimization" from Special app access page
Bug: 179459867
Test: make RunSettingsRoboTests -j40
Change-Id: I715694289f4d893c4606446c0bc9a0bd21bafe7b
2021-02-23 06:10:51 +00:00
Jeremy Goldman
6bccd36399 HardwareInfoPreferenceControllerTest migrated to JUnit.
ResourcesUtils used to get boolean resource id.

Test: atest -c HardwareInfoPreferenceControllerTest
Change-Id: I55aad63d8fbab5a70dafd49f2f79965dce5049b6
2021-02-23 14:00:23 +08:00
TreeHugger Robot
efbf7d4f07 Merge "Fix broken test" into sc-dev 2021-02-23 04:19:24 +00:00
Mingguang Xu
9a46cfcfa0 Merge "Set Wifi scoring status when Adaptive Connectivity toggle status changes" into sc-dev 2021-02-23 02:31:41 +00:00
Yu-Han Yang
e93c1298fc Move LocationServicePreference to Location > LocationServices
Bug: 180533061
Test: manual on device
Change-Id: Idd700f5c530af67f4936e207e42988267185f256
2021-02-22 11:49:14 -08:00
Mingguang Xu
107baf6216 Set Wifi scoring status when Adaptive Connectivity toggle status changes
Bug: 177440342

Test: make RunSettingsRoboTests
Test: manual

Signed-off-by: Mingguang Xu <mingguangxu@google.com>
Change-Id: Ic0a3ce834c9a55a8eab702b82adb4d27642ca543
2021-02-22 10:57:30 -08:00
Ben Murdoch
a9f0903581 Merge "Correctly select peak refresh rate." into sc-dev 2021-02-22 12:43:08 +00:00
Tsung-Mao Fang
8e25dcaece Fix broken test
- Remove a test which is a non-public method.
- Re-implemented the test.

Fix: 180874869
Test: Run robo test
Change-Id: Ic9716278653c874a8f7d98b56b7e32f19d157382
2021-02-22 07:34:30 +00:00
Ben Murdoch
38567b98d4 Correctly select peak refresh rate.
Currently we will get an arbitrary value that is greater than the
default depending on the order returned by the Display.

Bug: 180723012
Test: make RunSettingsRoboTests
      ROBOTEST_FILTER="com.android.settings.display.PeakRefreshRatePreferenceControllerTest"
Change-Id: Id2c99f2bea9c6b2814d82a9db3a417e4a93ee06d
2021-02-19 22:31:12 +00:00
Fan Zhang
cb2c6bf3fa Merge "Use EmergencyNumberUtils to get/set emergency settings." into sc-dev 2021-02-19 21:59:16 +00:00
Julia Reynolds
44e53efb52 Merge "Fix exception sorting conversations" into sc-dev 2021-02-19 19:43:01 +00:00
Julia Reynolds
85511dbef8 Fix exception sorting conversations
Test: robotests
Fixes: 178618139
Change-Id: I524187a5840163d65dce35827785f3139b6fede7
2021-02-19 13:22:31 -05:00
Wesley.CW Wang
f4bc35333b Update battery percentage column to UsageProgressBarPref (1/2)
- Change battery percentage column to new design
 - Remove debug info case
 Screenshots:
   https://screenshot.googleplex.com/9rvRfK3wBtpnarZ.png
   https://screenshot.googleplex.com/5iAjNXTptDechAm.png

Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: I5d046be29a036910036e72edb677b69bc2c0a03f
2021-02-19 10:23:53 +00:00
Fan Zhang
f5819fc80c Use EmergencyNumberUtils to get/set emergency settings.
EmergencyNumberUtils now contains centralized logic for interacting with
emergency gesture settings. Settings UI does not need to pay attention
to underlying data access, permission controler, etc etc.

Bug: 180236600
Test: robotests

Change-Id: If641ee36f237d153f1d790251af408969379a57a
2021-02-19 05:43:49 +00:00
TreeHugger Robot
188061ba81 Merge "Begin transition from BatteryStatsHelper to BatteryUsageStats API." into sc-dev 2021-02-19 01:31:18 +00:00
TreeHugger Robot
bb9f578c9b Merge "Revert "Use location access for recent location apps."" into sc-dev 2021-02-19 00:56:15 +00:00
Dmitri Plotnikov
97b3325ece Begin transition from BatteryStatsHelper to BatteryUsageStats API.
For now, keep both BatteryStatsHelper and BatteryUsageStats in play.
The plan is to transition from the former to the latter, one usage
at a time.  When all is said and done, all references to
BatteryStatsHelper will be gone.

Bug: 173745486
Test: atest --host SettingsRoboTests

Change-Id: I37e1dfff0043b1845992f18d72067bb547bb69ff
2021-02-18 11:56:00 -08:00
Alex Salo
a1615409c7 Merge "Check for available rotation resolver service and camera permission before showing setting for face based auto-rotation" into sc-dev 2021-02-18 18:11:33 +00:00
Wei Wang
5da4f381a6 Revert "Use location access for recent location apps."
This reverts commit f383cb44b4.

Reason for revert: crashes on work profiles (http://b/180516388)

Change-Id: Iff499e6a1439b6ecb524a61a9a88fe253799a131
2021-02-18 17:18:20 +00:00
TreeHugger Robot
cdcd94919c Merge "Fix broken tests" into sc-dev 2021-02-18 16:27:10 +00:00
Lorenzo Colitti
693fcb5913 Merge "Remove ConnectivityManager from EnterprisePrivacyFeatureProvider." into sc-dev 2021-02-18 10:45:22 +00:00
TreeHugger Robot
c9197ec51b Merge "Stop using ConnectivityManager for VPNs." into sc-dev 2021-02-18 10:28:19 +00:00