Commit Graph

12970 Commits

Author SHA1 Message Date
TreeHugger Robot
05089a9491 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: Id519f9512b113f30b8a45a11dbae8f773826a0ad
2021-02-23 04:33:54 +00:00
Colin Cross
f7a19e77a4 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: I30fbb0441ccb95c13818385a240da92c3e167ea3
2021-02-23 04:33:20 +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
Mingguang Xu
94ab80cdbc 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: I4d529edbe6cb1d46a1a7b2132b783c4265278465
2021-02-23 03:11:00 +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
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
06732582ff 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: I39e21d46537a06d273230da9dcdac3ec844f657d
2021-02-22 18:02:11 +00:00
Manish Singh
4b0a19f44e Merge "Introduce controller for transcode notifications" into sc-dev 2021-02-22 17:39:43 +00:00
Ben Murdoch
6309c48439 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: If6791071c8934ee1e0a819f777907bd1b26a2f9c
2021-02-22 13:06:00 +00:00
Ben Murdoch
a9f0903581 Merge "Correctly select peak refresh rate." into sc-dev 2021-02-22 12:43:08 +00:00
Thiebaud Weksteen
b8754ba9df 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: Id1adf75da4f35e8da621853d5dbceeec9fba5e5a
2021-02-22 08:33:31 +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
221fb4a7fc 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: Ie9f96ad4906ecc9573b6cb9aa3bf5118c4787493
2021-02-22 06:57:22 +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
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
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
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
d558605aeb Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1593774

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I216766fc245cdefacda920dcdde56c0d50f6d6b6
2021-02-18 17:09:56 +00:00
Lorenzo Colitti
927ff0169f Stop using ConnectivityManager for VPNs. am: 1434c08600 am: cd7a7d20a1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie612e6ca5f73330b99f64054a718500647100f42
2021-02-18 17:09:55 +00:00
TreeHugger Robot
cdcd94919c Merge "Fix broken tests" into sc-dev 2021-02-18 16:27:10 +00:00
Lorenzo Colitti
65128bab08 Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
It is only used in GlobalHttpPreferenceController. Move it there.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
Merged-In: I62c589679052b276927d057d3d5d084bbfb57626
2021-02-18 23:51:11 +09:00
Lorenzo Colitti
1434c08600 Stop using ConnectivityManager for VPNs.
These methods have all moved to VpnManager.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
Merged-In: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
2021-02-18 23:50:59 +09: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
Tsung-Mao Fang
772477af1c Fix broken tests
1) Remove AssistantFeedbackPreferenceController since it didn't use.
2) Refine the AssistantFeedbackPreferenceControllerTest, we need to use
vpn manager object now. (See ag/13519006)

Test: Run robo test
Fix: 180576544
Change-Id: I719711d83201d571427b9f46a6026e0831cddab6
2021-02-18 10:23:25 +00:00
Weng Su
a4fa394b07 Merge "Fix WiFi show "Not connected" always issue" into sc-dev 2021-02-18 09:55:18 +00:00
Lorenzo Colitti
cacf9aa485 Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
It is only used in GlobalHttpPreferenceController. Move it there.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
2021-02-18 16:44:53 +09:00
Lorenzo Colitti
5c9a042370 Stop using ConnectivityManager for VPNs.
These methods have all moved to VpnManager.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
2021-02-18 16:02:08 +09:00
Abel Tesfaye
ed7673eadd Check for available rotation resolver service and camera permission before showing setting for face based auto-rotation
Test: locally with crosshatch & make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.display.SmartAutoRotateControllerTest"

Bug: 172857585
Change-Id: I825b0c2471c71a3de59532b39a47c5442f234fb5
2021-02-18 00:18:47 +00:00
Yomna Nasser
977513924c Merge "Adds Enable2gPreferenceController and unit tests." into sc-dev 2021-02-17 23:44:43 +00:00
Yomna Nasser
6d65cb995b Adds Enable2gPreferenceController and unit tests.
Adds (1) Enable2gPreferenceController, the controller for the
"Enable 2G" toggle, and (2) Enable2gPreferenceControllerTest,
the corresponding unit tests.

Test: manul & atest -c Enable2gPreferenceControllerTest
Bug: b/163168917
Change-Id: Ib827cfcfd96fdea77b586c92ae0ec5b2bd5818c3
2021-02-17 20:08:41 +00:00
Julia Reynolds
6c70707655 Merge "Add filtering to notification channel settings" into sc-dev 2021-02-17 14:12:04 +00:00