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
Treehugger Robot
8fc4828ad2
Merge "Adding notification team members to notification directory" am: f290b00125
am: 1d7e8ae790
am: dbf857e2c7
am: e5313e42cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I296d9933a284ce1ccbd1ec01c9bd4f641d0b825f
2021-02-24 06:58:11 +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
Treehugger Robot
e5313e42cc
Merge "Adding notification team members to notification directory" am: f290b00125
am: 1d7e8ae790
am: dbf857e2c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6306474d5ac4eb50686da75fc85aa15418be03f
2021-02-24 05:54:51 +00: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
dbf857e2c7
Merge "Adding notification team members to notification directory" am: f290b00125
am: 1d7e8ae790
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I32c192b2d4dfe390243a477b51ff807dced229fb
2021-02-24 05:08:28 +00:00
Treehugger Robot
1d7e8ae790
Merge "Adding notification team members to notification directory" am: f290b00125
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba4fb1061bbc4036b3166f8ddc3d9836f10078a1
2021-02-24 04:26:10 +00:00
Treehugger Robot
69fcca2971
Merge "Owners updates" am: 395caa5fa6
am: c309ada683
am: 9aa1396e61
am: aff1b740fb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597956
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8f9eef724459f3b4bc876e0f407041a7cbfc60fc
2021-02-24 03:06:01 +00:00
Treehugger Robot
aff1b740fb
Merge "Owners updates" am: 395caa5fa6
am: c309ada683
am: 9aa1396e61
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597956
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia171da64408594c083538b047ee509dfe7d8fb20
2021-02-24 02:48:45 +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
Treehugger Robot
9aa1396e61
Merge "Owners updates" am: 395caa5fa6
am: c309ada683
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597956
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib105c249882f83e1789812031ac06fad66e7025b
2021-02-24 01:50:50 +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
Treehugger Robot
c309ada683
Merge "Owners updates" am: 395caa5fa6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597956
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4e1aff62b059325bf4069f4bbca35b074dabe976
2021-02-24 01:22:19 +00:00
Julia Reynolds
f2a444328c
Adding notification team members to notification directory
...
Change-Id: Ie51b4b4ac69843b3a68957e03462d1b226abbdc0
2021-02-23 18:54:59 +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
3a678ef6ab
Remove "Battery optimization" from Special app access page am: 3e31334065
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13660505
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3ef3a47aa11b69eae928a01ed386a3991c81d160
2021-02-23 07:04:05 +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
548e03d072
Merge "Fix broken test" into sc-dev am: efbf7d4f07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13639636
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9608ec27e95f7866bbef8a0facc76d0f405e7a01
2021-02-23 04:32:57 +00:00
Colin Cross
c43e00d1d0
Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev am: e1cd3ba760
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630935
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id60f70d7f132eda83d5670387aed6cb80b338588
2021-02-23 04:32:19 +00:00
TreeHugger Robot
efbf7d4f07
Merge "Fix broken test" into sc-dev
2021-02-23 04:19:24 +00:00
Colin Cross
e1cd3ba760
Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev
...
* changes:
[automerge] Build Settings-robo-testutils for use by SettingsGoogleRoboTests 2p: dc7bc483a3
Build Settings-robo-testutils for use by SettingsGoogleRoboTests
2021-02-23 04:12:51 +00:00
Colin Cross
d7f340d5b2
Merge "Build Settings-robo-testutils for use by SettingsGoogleRoboTests" into rvc-qpr-dev-plus-aosp
2021-02-23 04:12:50 +00:00
Mingguang Xu
37ccd2355b
Merge "Set Wifi scoring status when Adaptive Connectivity toggle status changes" into sc-dev am: 9a46cfcfa0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13486381
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id97a09f88b1480500e267456e6e8727a2c7e4865
2021-02-23 03:09:52 +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
Manish Singh
a80c9c396a
Merge "Introduce controller for transcode notifications" into sc-dev am: 4b0a19f44e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13556052
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I59140ece443a8d0f12629d2d2a4b5f57aa2be5da
2021-02-22 18:01:36 +00:00
Manish Singh
4b0a19f44e
Merge "Introduce controller for transcode notifications" into sc-dev
2021-02-22 17:39:43 +00:00
Ben Murdoch
f9f346e4a7
Merge "Correctly select peak refresh rate." into sc-dev am: a9f0903581
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630151
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d18a7a2e3e57c06f3e2d3b0e887237eda483da6
2021-02-22 13:05:35 +00:00
Ben Murdoch
a9f0903581
Merge "Correctly select peak refresh rate." into sc-dev
2021-02-22 12:43:08 +00:00