Commit Graph

1036 Commits

Author SHA1 Message Date
TreeHugger Robot
b4645cf3de Merge "Add summary provider for Cast Setting (WifiDisplaySettings)" 2017-02-07 23:58:16 +00:00
Junda Liu
bd051dcad5 Ignore orientation change to preserve ApnEditor. am: 76ad635ef7
am: d7a13ef2b6

Change-Id: I98c554d475ba3bdd24dfd3bcb6d4597f514b440c
2017-02-07 20:43:05 +00:00
Junda Liu
d7a13ef2b6 Ignore orientation change to preserve ApnEditor.
am: 76ad635ef7

Change-Id: Ic32658c295821565d1c20245d0f8cb99942639e6
2017-02-07 20:40:11 +00:00
Fan Zhang
5561543a27 Add summary provider for Cast Setting (WifiDisplaySettings)
Change-Id: Ieaf413e3d698a9cbcb0560bfa65f380675677a74
Fix: 34976128
Test: make RunSettingsRoboTests
2017-02-07 12:05:29 -08:00
Doris Ling
34cfd2e24f Combine Language & region and Input & gestures in System settings.
Merge preferences into one page, and update test.

Bug: 34976047
Test: make RunSettingsRoboTests
Change-Id: I5f15192e42f6054c02d4c8ffa9f25db3075da409
2017-02-06 11:46:48 -08:00
Junda Liu
76ad635ef7 Ignore orientation change to preserve ApnEditor.
Test: manually w/ Vzw and Tmo SIM on marlin. UI rotates while preserving
all values
Bug: b/34956985
Change-Id: I1db34893fd91f99e38913565e7b67ccbfdcb0c93
2017-02-06 19:14:42 +00:00
Robin Lee
806fbef0c6 Merge "Revert "Change launcher icons to MaskableIconDrawable Test: manual test"" 2017-02-02 14:52:16 +00:00
Robin Lee
728d0bc4a0 Revert "Change launcher icons to MaskableIconDrawable Test: manual test"
This reverts commit a8bd6c1bb8.

Change-Id: Iad92e544854776dcb9c4d7d3feeb2ac1b2a411d9
2017-02-02 11:33:37 +00:00
TreeHugger Robot
0d07305ca0 Merge "Change launcher icons to MaskableIconDrawable Test: manual test" 2017-02-01 18:57:54 +00:00
Hyunyoung Song
a8bd6c1bb8 Change launcher icons to MaskableIconDrawable
Test: manual test

b/34853793

Change-Id: I3376c03e84a0a9d94190b930f16596b3e48e9a9d
2017-01-31 17:57:33 -08:00
Marie Janssen
bb10fda3b9 Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am: fb0ab547c2 am: e10af2add7 am: 5741187f31
am: 43e2d0a759

Change-Id: I227d5c656c6079b5bcbfcee7c1028fcaf2a8d083
2017-01-31 19:28:46 +00:00
Marie Janssen
43e2d0a759 Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am: fb0ab547c2 am: e10af2add7
am: 5741187f31

Change-Id: I7ecebb4aebb9755571baebf00718156d28415f3e
2017-01-31 19:24:12 +00:00
Marie Janssen
e10af2add7 Merge "Bluetooth: remove unused SINK_STATE_CHANGED action"
am: fb0ab547c2

Change-Id: Ib054cb7d23a28d45345ef680247b5788fbc989f4
2017-01-31 19:14:47 +00:00
Doris Ling
7247d45e1c Merge "Make UsersDashboardAlias primary profile controlled." 2017-01-31 18:14:41 +00:00
Stephen Chen
9d2712cd78 Move AdvancedWifiSettings into ConfigureWifiSettings.
Bug:34719854
Test: make -j40 RunSettingsRoboTests
clicked on preferences and made sure functionality did not change.

Change-Id: Ia5f0c7f5ea0f88d1322008ab58ca79028cc1a2bb
2017-01-30 12:43:08 -08:00
Marie Janssen
eb6c51543d Bluetooth: remove unused SINK_STATE_CHANGED action
android.bluetooth.a2dp.action.SINK_STATE_CHANGED is unused.

Test: compiles
Bug: 34395439
Change-Id: I5c347886fdf9dbdf15feb82f2a9622dd22f010b6
2017-01-30 19:29:54 +00:00
Marie Janssen
9787d19947 resolve merge conflicts of 1c98d85cf6 to master
Change-Id: Ie4401bf35d4a56865faa5476b86b2a384ad21231
2017-01-30 10:21:05 -08:00
Marie Janssen
1c98d85cf6 Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am: 1ad23a71e4 am: 184506a710
am: 83fb10ae1e

Change-Id: Ib7a51c9cae91202087bfcc11e6eb18b219e84d36
2017-01-30 18:02:01 +00:00
Marie Janssen
184506a710 Merge "Bluetooth: remove BluetoothDiscoveryReceiver"
am: 1ad23a71e4

Change-Id: I045b82e81d1fdd3d8844efbd2c79d41fdd6d8aa6
2017-01-30 17:51:50 +00:00
Anton Philippov
adfec5563e Add a screen to show OEM backup settings.
Moves the backup settings logic to BackupSettingsHelper and
BackupSettingsActivity:
- If the manufacturer provides the intent and the label for their backup
settings in the config.xml, a new intermediate fragment is shown for
Backup settings to let the user pick either standard backup settings or
OEM provided backup settings.
- If config.xml doesn't contain the intent, BackupSettingsActivity is
used as a trampoline activity to launch backup settings provided by the
backup transport of the default backup settings activity, i.e.
PrivacySettingsActivity.

Bug: 34700410
Bug: 33655074
Bug: 33654991
Test: make RunSettingsRoboTests
Change-Id: I78e340fbf926b2a9dc2c4e3942f9337c3c7a933c
2017-01-30 16:17:28 +00:00
Doris Ling
31921dfa82 Make UsersDashboardAlias primary profile controlled.
Add PRIMARY_PROFILE_CONTROLLED metadata to UsersDashboardAlias and
add it to the Settings list for restricted user, so that it will be
shown to other users.

Change-Id: I9c090b15c3dced75eb7a405bd109ca7fb51807ab
Fix: 34194505
Test: Visual
2017-01-27 13:13:17 -08:00
Marie Janssen
683528db8b Bluetooth: remove BluetoothDiscoveryReceiver
Use new function getDiscoveryEndMillis() to replace use of shared preferences
and intents.

Test: scan recently, then connect from external BT device
Bug: 34395439
Change-Id: Ia498b3bb4868b656cbbb9fbdc607a49af948343b
2017-01-26 15:38:05 -08:00
TreeHugger Robot
71b98744f1 Merge "Update Network & internet->Wi-Fi to use MasterSwitchPreference." 2017-01-26 02:09:53 +00:00
Doris Ling
c4c9f4d50e Update Network & internet->Wi-Fi to use MasterSwitchPreference.
- Add a preference controller for Network & internet->Wi-Fi to control
  the preference toggling and summary update.
- Refactor WifiSettings and WifiEnabler to share code between the new
  wifi preference controller and the wifi setting.
- Refactor BluetoothSummaryHelper to have a common base class with the
  WifiSummaryHelper.
- Rename the summary helper to summary updater.

Bug: 34280769
Test: make RunSettingsRoboTests
Change-Id: I00ebfc161bcef89331bb41ba405ed8cb8232d248
2017-01-25 10:43:01 -08:00
Julia Reynolds
694928883d Let extra apps launch channel settings.
Test: manual
Change-Id: I689c0b35224dffc306ecbfa6f25ad3f072cd4dba
2017-01-25 12:43:29 -05:00
TreeHugger Robot
2a7c6bd840 Merge "Adding settings for managing auto-enter picture-in-picture." 2017-01-24 18:38:54 +00:00
Winson Chung
0a0d95a05a Adding settings for managing auto-enter picture-in-picture.
- Add per-app setting for users to control whether an app can
  enter picture-in-picture when it is hidden.

Bug: 34520451
Test: make -j40 RunSettingsRoboTests
Change-Id: I182d6069ad01e42f1d3d6623ea21362ce802efba
Signed-off-by: Winson Chung <winsonc@google.com>
2017-01-24 09:04:46 -08:00
Gustav Sennton
4d3334c50b Update WebView implementation Dev Setting - new looks + descriptions.
Now that we are changing the WebView package mechanism so that a package
can only be used as WebView implementation if that package is enabled
for all users of the device we need to tell the user why a package can't
be chosen as WebView implementation.
With this CL we do so in the 'Set WebView Implementation' Developer
Setting.

We code for the WebView implementation Developer Setting is now based on
the same code as that of the Debug App Developer Setting.

Bug: 32894154
Test: Ensure WebView Implementation setting shows correct packages.
Test: Ensure WebView Implementation setting shows correct descriptions
for why a package is not usable - including the case where packages are
disabled/uninstalled for a second user.
Test: Ensure the summary for the WebView Implmentation setting is
updated after changing WebView package.
Test: Ensure the WebView package Activity
(Settings.ACTION_WEBVIEW_SETTINGS) is similar to the Dev Setting.
Test: ensure non-admin user cannot start WV-picker activity through
'adb shell am start -n com.android.settings/.WebViewImplementation'

Change-Id: Ia6e6e9e12ce8f8f45ec539807cd0c6479acb8ecb
2017-01-23 18:34:11 +00:00
TreeHugger Robot
fac57416b8 Merge "Misc fix on settings themes." 2017-01-21 21:17:49 +00:00
Fan Zhang
92f1e942da Misc fix on settings themes.
- Use dark status bar for confirmDeviceCreditials theme to match dark
  window background
- Remove SubSettingsDialogWhenLarge theme in favor of full screen
  settings for O.
- Update font/dize preview text color to match light background

Bug: 33558692
Test: visual

Change-Id: Id8704c96e2ce35247e80e50eefd531786479b193
2017-01-21 11:10:06 -08:00
TreeHugger Robot
32bc813f04 Merge "Add new preference class MasterSwitchPreference." 2017-01-21 02:00:06 +00:00
Doris Ling
1432cb8529 Add new preference class MasterSwitchPreference.
- Add a new preference type that has Title and optional summary on the
  left, and a toggle switch on the right. Clicking the left part of the
  preference will open a settings screen.
- Update Connected devices->Bluetooth to use this new preference.
- Refactor BluetoothSettings and BluetoothEnabler to share code between
  the new bluetooth preference controller and the bluetooth setting.

Bug: 34280769
Test: make RunSettingsRoboTests
Change-Id: I109ecdba640ecdd4748a6e5b2b4f4c47cbf653fd
2017-01-20 16:19:00 -08:00
TreeHugger Robot
60c7f095d5 Merge "Adding Manage External Sources Settings" 2017-01-20 12:08:20 +00:00
TreeHugger Robot
98df9a43c5 Merge "Permission changes for scoring in Wifi Picker." 2017-01-20 02:03:33 +00:00
Suprabh Shukla
57d92315a4 Adding Manage External Sources Settings
Added a settings fragment to manage external sources. It lists all
applications that have either requested REQUEST_INSTALL_PACKAGES or have
their app op changed from default.

Test: Will include in follow-up CL. Tracked in b/33792674

Bug: 31002700
Change-Id: Ibd2a1922be214b62aec4eefa45f7b9691256b205
2017-01-18 21:00:30 -08:00
Daniel Nishi
8a2ff52e61 Merge "Update StorageSettings to use StorageDashbordFragment." 2017-01-13 22:06:46 +00:00
Sundeep Ghuman
c164ad02ff Permission changes for scoring in Wifi Picker.
In ag/1727148 we introduce requesting of network scores into the
WifiTracker, in order to arrange access points based on 'ranking score.'
This permission is required for WifiSettings to be able to request those
scores.

Bug: 33041117
Test: Built and ran with wifi picker changes. Unit tests for WifiTracker
in corresponding CL.

Change-Id: Ie7d22d98d15f5b3269bb55e5a64a2dae9a53b625
2017-01-12 17:27:06 -08:00
TreeHugger Robot
489cbb2ad8 Merge "Update icons for IA." 2017-01-13 00:13:33 +00:00
Doris Ling
d258626c88 Update icons for IA.
- in homepage: Connected devices, Apps & notifications, Support
- in Network & internet: Airplane mode, Cellular networks, Tethering,
  VPN, Network reset
- in Connected devices: NFC, Android beam, USB
- in Apps & notifications: Apps, Notifications, Default apps

Bug: 34205154
Test: Visual

Change-Id: I11c72ccbc85d68ed61476f6629dae862abee42fc
2017-01-12 12:51:10 -08:00
Amin Shaikh
3aa547b50d Add activity action for Configure Wi-Fi settings.
Bug: 34135303
Test: make -j40 RunSettingsRoboTests
Change-Id: Ieec7a1aa913553c74c6ebf9fb3d868e03e0c3bf6
2017-01-11 18:40:32 +00:00
Daniel Nishi
769d16ed65 Update StorageSettings to use StorageDashbordFragment.
It previously was set to use the PrivateVolumeSettings. By
swapping it with the new view, we can retain the existing
behavior for external storage (PublicVolumeSettings).

This also restores the summary text to the main Settings
screen.

Bug: 34197071, 34195303
Test: Verified locally that StorageDashboardFragment is started
      instead of the PrivateVolumeSettings.

Change-Id: I5de0ea8de799d758272a1406856ae7de9b6fcc8e
2017-01-10 14:22:12 -08:00
Daniel Nishi
bfd11313cb Update the Storage settings text.
The mocks used to say "Phone Storage" but that change in the
mocks was reverted.

Bug: 33199077
Test: None
Change-Id: I36bbb7d01a9598c92ec777905ae260fdc411b338
2017-01-10 13:59:57 -08:00
Fan Zhang
408c6a3e87 Set parent activity for search.
This enables the nav up button from actionbar.

Fix: 34176247
Test:  runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/search/SearchActivityTest.java

Change-Id: I28ef9f1270f5a178346ff9bd9148f7f2035858b2
2017-01-09 16:39:25 -08:00
Fan Zhang
c54503d9e1 Update tile color from using accent to colorControlNormal.
Also remove some unused code
Bug: 33759208
Test: visual

Change-Id: I0a019bf6b514564f9e6e844de8a6b75b2ca69cc7
2017-01-05 16:47:59 -08:00
Daniel Nishi
b2531ebda4 Merge "Add first pass at a new Storage screen." 2017-01-05 22:35:39 +00:00
Daniel Nishi
ec89a3f57f Add first pass at a new Storage screen.
This patch begins setting up the structure for the screen.
The functionality for populating the data in the preferences
is coming in a later patch.

Bug: 33199077
Test: Settings Robo Tests
Change-Id: I9ebad9d3896501e31ac715704ca986eceb36877d
2017-01-05 11:54:56 -08:00
Sunny Goyal
9445d36eea Merge "Adding a customizable development mode tile" 2017-01-05 19:41:15 +00:00
Sunny Goyal
bf9f2d2698 Adding a customizable development mode tile
User can configure the active state for development mode
which would allow enabling multiple options at once

Test: make -j40 RunSettingsRoboTests
Change-Id: I545b790f8c7097945f39ca003e5985b23cb53636
2017-01-05 10:16:18 -08:00
Jeremy Klein
7dbad8ceb5 Exclude the TetherProvisioningActivity from recents.
This is just a proxy activity for launching the provisioning app.

Bug: 34067614
Test: manual
Change-Id: I8bdf75a7761199d026ef64d6671abc1165879e6b
2017-01-03 21:29:28 -08:00
Youhan Wang
70b47859fa DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu.
am: d9b3709fc1

Change-Id: I4f10d79d7dcd29a59c1ac0823f394cbb3e76256d
2016-12-21 00:37:24 +00:00