Wesley Wang
892cf9808e
Merge "Update Battery Settings main page (1/2)" into sc-dev am: 783f1b1b56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13698745
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib43d0b03cf4f9618a45b154eea51d21c0de46227
2021-03-05 11:55:47 +00:00
Wesley Wang
783f1b1b56
Merge "Update Battery Settings main page (1/2)" into sc-dev
2021-03-05 11:23:39 +00:00
TreeHugger Robot
96324ec3a3
Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev am: 2aa8d2b437
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769527
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec5873050d56edd21763a467766a80e844ba7dfe
2021-03-05 10:15:32 +00:00
TreeHugger Robot
2aa8d2b437
Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev
2021-03-05 09:53:05 +00:00
Jason Hsu
c022defb32
Merge changes I135e5218,I1efd9760,Ia3d03054,I1fbe3157,Ic206a940, ...
...
* changes:
Add seekBar properties 'tickMark' to LabeledSeekBarPreference
Add the preference controller to control accessibility button fade preference
Add the preference controller to control accessibility button preview preference
Add the preference controller to control accessibility button opacity preference
Add the preference controller to control accessibility button size preference
Add the preference controller to control accessibility button location preference
Setup basic layout and resources for the accessibility button settings page
2021-03-05 06:40:06 +00:00
Wesley.CW Wang
280e3639cd
Update Battery Settings main page (1/2)
...
- Rollback ag/13413813 to meet the design change
- Regrouping the index
Screenshots:
https://screenshot.googleplex.com/85aPq9ArJMWjJV2.png
https://screenshot.googleplex.com/8uiZ9KLKAHoJyrP.png
Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: Ic3c16d985b7c5e98e6d1bbe4481c48eadd3e4078
2021-03-05 06:03:42 +00:00
TreeHugger Robot
ef509128d5
Merge changes from topic "jr_device" into sc-dev am: dd6255a653
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774765
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I89c3f66711f680ad87fdef74835df607410d2460
2021-03-05 04:50:43 +00:00
Jeremy Goldman
576009adeb
Merge "StorageProfileFragmentTest converted to JUnit"
2021-03-05 03:24:17 +00:00
jasonwshsu
f9fdedaafe
Add the preference controller to control accessibility button fade preference
...
* Opacity preference will be disabled when fade is disabled
Bug: 173940869
Test: atest AccessibilityButtonFadePreferenceControllerTest AccessibilityButtonOactiyPreferenceControllerTest
Change-Id: I1efd9760aa0287899cddd10ddd9a88a81ccc39ba
2021-03-05 10:27:39 +08:00
jasonwshsu
603014760f
Add the preference controller to control accessibility button preview preference
...
* Create FloatingMenuLayerDrawable class to handle the preview layer drawable
Bug: 173940869
Test: atest AccessibilityButtonPreviewPreferenceControllerTest FloatingMenuLayerDrawableTest
Change-Id: Ia3d030547b377e87c505b2310f559f7f3876ecd5
2021-03-05 10:27:34 +08:00
TreeHugger Robot
dd6255a653
Merge changes from topic "jr_device" into sc-dev
...
* changes:
Update NLS listing page
Add device list to NLS pages
Add icons to NLS mgmt page
2021-03-05 01:02:02 +00:00
Julia Reynolds
ddf1958bdc
Update NLS listing page
...
- Organized by allowed/not allowed
- Include paired devices if there are any
Test: settings robotests
Fixes: 181125174
Change-Id: Id64ee0ebd9b40a92d54a03d92fec3ff0bb3b926d
2021-03-04 20:54:10 +00:00
Yi Jiang
05a310b89b
Merge "Adds 'more details' hyper link." into sc-dev am: c08943784c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769106
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3da3a8ced8594349dd7e01063b0d2f3cae253883
2021-03-04 18:58:16 +00:00
Yi Jiang
c08943784c
Merge "Adds 'more details' hyper link." into sc-dev
2021-03-04 18:11:11 +00:00
Yi Jiang
bc6ec17120
Adds 'more details' hyper link.
...
Adds a 'more details' hyper link in the footer when options are disabled
by admin.
Test: make ROBOTEST_FILTER=ScreenTimeoutSettingsTest RunSettingsRoboTests
Bug: 180314728
Change-Id: I880ccd73f4b2ef0b695619ef42ec87559dc2b65b
2021-03-04 01:19:50 -08:00
Hugh Chen
50fc7d15ef
Fix "USB tethering" doesn't work after reconnecting USB
...
Before this CL, if users selects usb tethering option and
reconnects usb it would not start entitlement check.
Because we only start entitlement checks when users select it.
This CL will start entitlement checks when usb tethering option
is selected and reconnects usb.
Bug: 176037347
Test: make -j42 RunSettingsRoboTests
Change-Id: I3a2ad392a1cae9cf97355ef3cd4fb8c23de18673
2021-03-04 15:31:11 +08:00
Jeremy Goldman
859fc2bc15
Merge "HardwareRevisionPreferenceControllerTest converted to JUnit."
2021-03-04 01:22:49 +00:00
Jeremy Goldman
7f98211d08
Merge "DeviceModelPreferenceControllerTest converted to JUnit."
2021-03-04 01:22:33 +00:00
Yu-Han Yang
ec189cc0da
Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev am: d0267d5f8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732560
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia69d0da674cd6e5ba2331cf6a593366747e5d4e4
2021-03-03 21:41:50 +00:00
Yu-Han Yang
d0267d5f8d
Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev
2021-03-03 20:45:29 +00:00
jasonwshsu
c497c7aabe
Add the preference controller to control accessibility button opacity preference
...
Bug: 173940869
Test: atest FloatingMenuOpacityPreferenceControllerTest
Change-Id: I1fbe3157c93fef4611c3b9b13569c9b339e2898a
2021-03-04 01:19:30 +08:00
jasonwshsu
04955b96ae
Add the preference controller to control accessibility button size preference
...
Bug: 173940869
Test: atest FloatingMenuSizePreferenceControllerTest
Change-Id: Ic206a940abde90641442df37a634c8cb3a345597
2021-03-04 01:19:30 +08:00
jasonwshsu
123464429d
Add the preference controller to control accessibility button location preference
...
Bug: 173940869
Test: atest AccessibilityButtonLocationPreferenceControllerTest
Change-Id: I49a23b2eb4e07e79afcefc5a148c23b06396ec1c
2021-03-04 01:19:19 +08:00
TreeHugger Robot
10c997f5bb
Merge "Refactor Usb settings" into sc-dev am: decaeda453
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13736527
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb5da138a1dbdd6fde3daf48c2a4de0988505297
2021-03-03 13:03:27 +00:00
TreeHugger Robot
decaeda453
Merge "Refactor Usb settings" into sc-dev
2021-03-03 12:12:24 +00:00
TreeHugger Robot
65046b06a3
Merge "[Fix]Test cast fail at BaseBluetoothDialogPreferenceTest" into sc-dev am: d1718c3a15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746319
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bfb4405902d4a11100a8302345b23468637f7c2
2021-03-03 10:54:49 +00:00
Hugh Chen
0091ae6142
Refactor Usb settings
...
1. Rename ShouldIgnoreClickEvent() to isClickEventIgnored().
2. Use TetheringManager instead of ConnectivityManager.
Bug: 175651578
Test: make -j42 RunSettingsRoboTests
Change-Id: I37c49694257b7575550b5a905e293b5d056ba1bf
2021-03-03 18:13:17 +08:00
TreeHugger Robot
d1718c3a15
Merge "[Fix]Test cast fail at BaseBluetoothDialogPreferenceTest" into sc-dev
2021-03-03 10:10:41 +00:00
Tim Peng
d6eb5237e2
[Fix]Test cast fail at BaseBluetoothDialogPreferenceTest
...
Bug: 181740451
Test: make -j50 RunSettingsRoboTests
Change-Id: I8b786272f50680e9e388ca64bb8d3410b85b327a
2021-03-03 17:02:07 +08:00
Minche Li
d8b3c23f77
Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev am: ecf1c07e63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8f08f51b0ff9df1ef9a1b4c609155fdd102cef80
2021-03-03 03:00:54 +00:00
Yu-Han Yang
f7513d9821
Add showSystem to RecentLocationAccess (Settings)
...
Bug: 180533061
Test: on device
Change-Id: Ie232bc84d7875897316e978ed3deac9656ebec5f
2021-03-02 14:05:35 -08:00
mincheli
3d41fe560b
Hides the settings entry in Magnification Settings if device is not supported
...
If the device doesn't support magnification area, we should hide the
settings entry in mangification settings
Bug: 177371954
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I41fc3177f86c6a19e3ef0d2fbe5e052d77c1cb47
2021-03-02 06:56:59 +00:00
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
jasonwshsu
93ef33655c
Setup basic layout and resources for the accessibility button settings page
...
Bug: 173940869
Test: atest AccessibilityButtonFragmentTest
Change-Id: I3f1d8b161d1baadeead36f49f18f00a91fd40b4c
2021-02-26 18:32:28 +08:00
Bob Badour
82798df54a
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings am: a73a67240c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13701598
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iada5fa90a369fc0476be9a58facf465778622f20
2021-02-26 02:45:14 +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
Bob Badour
a73a67240c
[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/componenttests/Android.bp
tests/legacy_unit/InstrumentedEntitlementApp/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: I58a85aced69923fa9a8e5a2b89ecfdd33de5e05c
2021-02-25 15:05:14 -08:00
Bob Badour
18e9723489
Revert "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings"
...
This reverts commit 0e73d05c74 .
Change-Id: I627be6c5355eda9602b1cb201806fce4548fc951
2021-02-25 11:52:32 -08:00
Jeremy Goldman
5a36305aae
StorageProfileFragmentTest converted to JUnit
...
Looper and UIThreadTest added.
Test: atest -c StorageProfileFragmentTest
Change-Id: Ib561a0e87a0b5034f7692f2567c8617e7f5f763e
2021-02-25 15:20:12 +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