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
Jeremy Goldman
b8f05956ed
HardwareRevisionPreferenceControllerTest converted to JUnit.
...
Diff: https://diff.googleplex.com/#key=Snb7bwFLO81L
Test: atest -c HardwareRevisionPreferenceControllerTest
Change-Id: I85e8fb02f5ac213f04912026e74dfaae92a2decd
2021-02-23 08:42:43 +00: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
d552011b7c
SerialNumberPreferenceControllerTest converted to JUnit
...
The biggest difference is that an argumentcaptor is used for the
ClipboardManager, rather than inspecting the primary clip.
Diff: https://diff.googleplex.com/#key=X1WHfEzPhfuY
Test: atest -c SerialNumberPreferenceControllerTest
Change-Id: I84c2abd0d53dde22c90b0967f6884bc590181f7c
2021-02-23 07:42:31 +00: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
Jeremy Goldman
a8bf939d41
DeviceModelPreferenceControllerTest converted to JUnit.
...
Test: atest -c DeviceModelPreferenceControllerTest
Change-Id: Ibdf3a86fb7f77a40844b62980e4e3f1f7e9a5bd8
2021-02-23 15:00:08 +08: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
Thiebaud Weksteen
5227a76ef3
Merge "Add onPreferenceChange_update tests" into sc-dev am: 10ebd252e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13580622
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iadc4f55aef42ade37dba915b41bc2a332ecadd64
2021-02-22 08:33:33 +00:00
Thiebaud Weksteen
10ebd252e0
Merge "Add onPreferenceChange_update tests" into sc-dev
2021-02-22 08:10:10 +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
Tom Hsu
543d46be36
Merge "[Provider model] Show a string on internet picker when mobile data off" into sc-dev am: a2b98fe18a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13627530
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieae780dde69ab48db48042bc0e241f8802d570cb
2021-02-22 06:57:23 +00:00
Tom Hsu
a2b98fe18a
Merge "[Provider model] Show a string on internet picker when mobile data off" into sc-dev
2021-02-22 06:46:36 +00:00
Manish Singh
cbbe9da1ad
Introduce controller for transcode notifications
...
This is to provider users with control over whether to show transcoding
notifications or not.
By default we show the notifications.
The controller resides within the Media transcoding settings under
Developer Options.
BUG: 170973510
Test: manual. unit test added.
Change-Id: I7172f583ce4c1a53e5d5ccc07625f201852db43a
2021-02-21 18:31:06 +00:00
Xin Li
ad3fa60e26
Merge ab/7061308 into stage.
...
Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
2021-02-21 09:25:11 -08:00
Bob Badour
0e73d05c74
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings
...
Added SPDX-license-identifier-Apache-2.0 to:
Android.bp
protos/Android.bp
tests/anomaly-tester/Android.bp
tests/perftests/Android.bp
tests/robotests/Android.bp
tests/uitests/Android.bp
tests/unit/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I81f11a66b5977cb5096e262819084706af5fa54c
Merged-in: I81f11a66b5977cb5096e262819084706af5fa54c
2021-02-21 08:50:16 -08:00
Weng Su
880e2ab494
Owners updates
...
- Add wengsu to network path for provider model feature implementation
- Add wifi/OWNERS to tests/unit/src/com/android/settings/wifi/OWNERS
Bug: 180778022
Test: N/A, just owners update
Change-Id: I9255fb4980dbbe163850be2459528a3380c15d76
2021-02-20 12:58:25 +00:00
tom hsu
00798a5902
[Provider model] Show a string on internet picker when mobile data off
...
- https://screenshot.googleplex.com/6JE9ma6UZmGCNFQ
Bug: 178680922
Test: Manual test passed
Test: atest passed
Change-Id: Id276e3f97b4380f648eb9e35ca7780a0ba32bdb2
2021-02-20 15:03:47 +08: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
Presubmit Automerger Backend
50374e9fca
[automerge] Build Settings-robo-testutils for use by SettingsGoogleRoboTests 2p: dc7bc483a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630935
Change-Id: Ia09bd6400d821df84e72d00b8cc312edbee425ea
2021-02-19 19:08:26 +00:00
Colin Cross
dc7bc483a3
Build Settings-robo-testutils for use by SettingsGoogleRoboTests
...
This relands I385629c5c958e94ea289e88b0e65eb005006f4e3.
Bug: 175124789
Change-Id: Ib2cb9f4e080f4de6313d7dba3185709fd60130b7
Test: m RunSettingsGoogleRoboTests
2021-02-19 19:08:17 +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
SongFerng Wang
851a2f8557
Merge "Can't show 5GE at summary" into sc-dev
2021-02-19 09:24:12 +00:00
Thiébaud Weksteen
203b5203d9
Add onPreferenceChange_update tests
...
Bug: 180688212
Test: atest -c Enable2gPreferenceControllerTest
Change-Id: Ie7bc7a49f2ce4d5e8b8d75914fa46b613569566f
2021-02-19 09:24:02 +00:00
SongFerngWang
35b4725975
Can't show 5GE at summary
...
The 5GE has HTML tag, so it should do transformation by Html.fromHtml.
Bug: 180053606
Test: atest ProviderModelSliceHelperTest.java
Change-Id: I32ac255d50c52ce853f686ac22572fa1cb44e9cd
2021-02-19 15:57:19 +08: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
Bob Badour
cfcf58354c
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5
am: 358e0966fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1588487
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b93f42c5d78ce53819da38574f3b0433cc0efe6
2021-02-19 02:25:25 +00:00