Commit Graph

42306 Commits

Author SHA1 Message Date
Android Build Merger (Role)
937902f2f5 Merge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev
am: ad44ea442b  -s ours

Change-Id: I8d26666caaa62bb95fed60d484368fc5b191bdcd
2017-12-13 13:23:07 +00:00
Bill Yi
b63129a388 Import translations. DO NOT MERGE
am: e30af484ff  -s ours

Change-Id: If2100d09d2f2c16f27e3c77ecaeded8fee5ebc90
2017-12-13 13:22:04 +00:00
Android Build Merger (Role)
ad44ea442b Merge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev 2017-12-13 13:19:40 +00:00
Bill Yi
ae0da91c1c Import translations. DO NOT MERGE
am: 1d6d60f251  -s ours

Change-Id: I3a20f9e9061dbaf15f5f61a3f5f0a146c128ff2e
2017-12-13 13:19:06 +00:00
TreeHugger Robot
8412f70f6c Merge "Fix crashes related to ExternalSourcesDetails." 2017-12-13 07:02:07 +00:00
TreeHugger Robot
10a1602421 Merge "Add power save action to BatteryBroadcastReceiver" 2017-12-13 02:54:59 +00:00
Hemant Gupta
6a386dc6c1 Merge "Bluetooth: Add support for PBAP UI preference" am: f689d1aaa7 am: 0b4c0ebbe4
am: 40069b5ee2

Change-Id: I57de94d04d73ed1af24a15b36a73ea0692ad9815
2017-12-13 02:26:01 +00:00
Wang wenrui
f5c8c66b76 Merge "Fix screen freeze when changing display size in Multi-Window mode" am: 2051822bb9 am: b2a6489139
am: 9b3b72f6b2

Change-Id: I4d3e3ef484d93535eb599104330048e1610cb370
2017-12-13 02:25:04 +00:00
Hemant Gupta
40069b5ee2 Merge "Bluetooth: Add support for PBAP UI preference" am: f689d1aaa7
am: 0b4c0ebbe4

Change-Id: I5419efe379ee5bf0622ac8070b6ef3886d277bdf
2017-12-13 01:57:51 +00:00
Wang wenrui
9b3b72f6b2 Merge "Fix screen freeze when changing display size in Multi-Window mode" am: 2051822bb9
am: b2a6489139

Change-Id: I791f25687e37448659b3e0d91ad35f28dca0fed6
2017-12-13 01:56:50 +00:00
James Lemieux
9453999e6f Adopt robolectric 3.5.1
Bug: 70581603
Test: make RunSettingsRoboTests
Change-Id: I21dba3381ae62ee12de1ce29bea473b3d0f069c0
2017-12-12 17:31:47 -08:00
Hemant Gupta
0b4c0ebbe4 Merge "Bluetooth: Add support for PBAP UI preference"
am: f689d1aaa7

Change-Id: Ic4ffc6a26b11cdf0a937402c3bdcd68441fe4aed
2017-12-13 01:27:46 +00:00
Wang wenrui
b2a6489139 Merge "Fix screen freeze when changing display size in Multi-Window mode"
am: 2051822bb9

Change-Id: I974abe3dd2114aa439c0db46fa4930a947912de6
2017-12-13 01:26:52 +00:00
Lei Yu
15b8b27646 Merge changes Ie1f934b4,Ic3b045a6
* changes:
  Create BluetoothSwitchPreference
  Add ConnectedUsbDeviceUpdater
2017-12-13 01:06:14 +00:00
Doris Ling
a0006d93bd Move AppInfoDashboardFragment into appinfo package.
- update all references to AppInfoDashboardFragment
- removed PackageUtil inner class and change the corresponding function
to be a simple method.

Bug: 69384089
Test: make RunSettingsRoboTests
Change-Id: Ief067e25a303ef16db20b2ca1d8840cb06eff5f9
2017-12-12 16:58:17 -08:00
TreeHugger Robot
fb72d22784 Merge "Add controllers for iinstant app related preferences." 2017-12-13 00:56:56 +00:00
jackqdyulei
5393991573 Add power save action to BatteryBroadcastReceiver
This cl makes BatteryBroadcastReceiver also listen to update about
battery saver.

Bug: 70530651
Test: RunSettingsRoboTests
Change-Id: I76b2f1b1047aa195ee9d8ff2a8a330cea31039d4
2017-12-12 16:56:22 -08:00
Treehugger Robot
f689d1aaa7 Merge "Bluetooth: Add support for PBAP UI preference" 2017-12-13 00:30:42 +00:00
Bill Yi
1d6d60f251 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If249fffda6df063fd39ec95e4ba04b412a1ea9e1
2017-12-12 16:25:18 -08:00
Bill Yi
e30af484ff Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I37fb135ddf373093ede9b1d56bf6452ea52ef093
2017-12-12 16:19:14 -08:00
TreeHugger Robot
84e8c795b1 Merge "Add PrefController in XML support" 2017-12-13 00:02:35 +00:00
Treehugger Robot
2051822bb9 Merge "Fix screen freeze when changing display size in Multi-Window mode" 2017-12-12 23:59:23 +00:00
Adam Lesinski
6cbb463d18 Merge "Update the way OMS records details about overlays" into oc-mr1-dev am: 15b42b89b8
am: 11ab7f7b82  -s ours

Change-Id: I91e9d37fb5b4024f3272a7f968d7885ea88a2244
2017-12-12 23:35:34 +00:00
Adam Lesinski
11ab7f7b82 Merge "Update the way OMS records details about overlays" into oc-mr1-dev
am: 15b42b89b8

Change-Id: I15809e100fc46691f0f60ed2729c18a07d904313
2017-12-12 23:16:37 +00:00
Jeffrey Huang
de98ec50ec Merge "Do not show advanced dropdown if only one setting" 2017-12-12 22:27:05 +00:00
Doris Ling
e29587e334 Fix crashes related to ExternalSourcesDetails.
- ExternalSourcesSettingsTest crashes due to the package moved of
ExternalSourcesDetails. Corresponding xml has been updated in previous
CLs. So, reverting the suppress tag for the test class.
- ExternalSourcesDetails can be launched directly with
MANAGE_UNKNOWN_APP_SOURCES intent, and client can pass in invalid
package while launching ExternalSourcesDetails. Need to check whether
the app info is invalid before we try to launch the fragment.
- also fix test failure for not founding the app list as list object
type and id had been changed.

Change-Id: Id7787ca889f770e10d7a8e9fbf8dc79c9d6e884d
Fixes: 70383636
Test: make RunSettingsRoboTests, make SettingsUnitTests
2017-12-12 22:21:20 +00:00
Matthew Fritze
7d2b4f5fc7 Add PrefController in XML support
Add the ability to define a Preference Controller
in xml using the 'controller' tag.

This is useful for two reasons:
- It allows the controllers to be instantiated via
reflection for Slices and Dashboard fragment
- Removes the requirement that controllers be defined manually
in Fragments

In order to be instantiable, they must have a unified construction
following either:

  ClassName(Context)
  ClassName(Context, String)

Also added a robotest that verifies that all controllers defined
in XML follow the constructor schema, and extend
BasePreferenceController.

Test: robotests
Bug: 67996923
Change-Id: I304b35dc666daebecf0c9e286696f3f2a510704a
2017-12-12 14:21:12 -08:00
TreeHugger Robot
15b42b89b8 Merge "Update the way OMS records details about overlays" into oc-mr1-dev 2017-12-12 21:48:17 +00:00
Philip P. Moltmann
d27fe3275f Switch to modern ArgumentMatchers
Test: adb shell am instrument -w -e class com.android.settings.vpn2.PreferenceListTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner

Change-Id: Id2e4684f6d3048cfb60fee1f747d0796c157a3da
2017-12-12 13:07:21 -08:00
Doris Ling
6e447d69bc Add controllers for iinstant app related preferences.
For AppInfoDashboardFragment:
- add app installer preference into the preference screen
instead of creating it dynamically.
- add controller for the App Installer, Instant App buttons, and instant
app domains preferences.

Bug: 69384089
Test: make RunSettingsRoboTests
Change-Id: I8d362cacb78077c173130018c33c4d00abfe9843
2017-12-12 12:32:19 -08:00
Jordan Liu
3040fde446 Add signal strength customization
Also add default behavior in case carrier config bundle is null.

Bug: 69730732
Test: manual and new unit test
Change-Id: Ia38462a7e1b6f2e27ff45d93beef09465a68ae5c
2017-12-12 11:51:32 -08:00
jeffreyhuang
251407a3a4 Do not show advanced dropdown if only one setting
Change-Id: I56eff1198636d0f0b95f4aa58eb90efc346c3f65
Fixes: 69402845
Test: make RunSettingsRoboTests -j40
2017-12-12 10:32:58 -08:00
Pavel Grafov
924e0e2154 Respect DISALLOW_UNIFIED_PASSWORD in Settings.
Bug: 63909482
Test: make ROBOTEST_FILTER=SecuritySettingsTest RunSettingsRoboTests
Test: make cts-verifier
Change-Id: Ia89501d5d5339c1340bee36a9bfb8ef72c4ee9b1
2017-12-12 18:20:20 +00:00
Lei Yu
30ba48c540 Merge "Add device name preference in pairing page" 2017-12-12 18:05:34 +00:00
Tony Mak
99a3a2f205 Update the usage of quiet mode @hide API
BUG:70212757

Test: Settings -> Work profile settings -> Toggle work mode
Test: Turn off work mode -> Settings -> Turn on work mode in the suggestion

Change-Id: Ic5c2c5b141fb8be365c07c70ad1d0291342d7106
2017-12-12 13:03:13 +00:00
TreeHugger Robot
2f7240ceb5 Merge "Update package name for PictureAndPictureSettings" 2017-12-12 01:05:33 +00:00
jackqdyulei
be555e2dad Add device name preference in pairing page
Also refactor the preference controller
1. Extend from BasePreferenceController.
2. pass in the preference key. Then it could be reused in different
places with different key.

Bug: 69333961
Test: Screenshot | RunSettingsRoboTests
Change-Id: I773ca022baa326481045c1659565c9a21111200a
2017-12-11 15:52:57 -08:00
Doris Ling
a8472007a7 Update package name for PictureAndPictureSettings
- also need to update the reference in the special app access xml page.

Change-Id: I1199f70adf18d3f0e21a946848239526d9c8b3c8
Fixes: 70491786
Test: make SettingsUnitTests
2017-12-11 14:54:37 -08:00
TreeHugger Robot
65b18ae67e Merge "Delete about phone v1 code" 2017-12-11 22:51:42 +00:00
TreeHugger Robot
854e3e8266 Merge "Update the way OMS records details about overlays" 2017-12-11 21:51:35 +00:00
jackqdyulei
d055937664 Create BluetoothSwitchPreference
In the new design, bluetooth preference is not MasterSwitchPreference
any more. This cl creates BluetoothSwitchPreference while reuse the
BluetoothEnabler.

Future cl will remove the BluetoothMasterSwitchPreference when P
feature is finalized.

Bug: 69333961
Test: RunSettingsRoboTests
Change-Id: Ie1f934b4e93a6758a1b0cf83bb5098585a635c2a
2017-12-11 13:05:01 -08:00
TreeHugger Robot
ae1011ee5d Merge "Add icons for color inversion and daltonizer" 2017-12-11 21:01:32 +00:00
TreeHugger Robot
50635c7aa3 Merge "Update package name for PictureAndPictureSettings" 2017-12-11 20:59:58 +00:00
TreeHugger Robot
a706583e79 Merge "Disable crashing ExternalSourcesSettingsTest#testManageExternalSourcesForApp" 2017-12-11 20:33:48 +00:00
Robin Lee
1aeca095d3 Handle getActiveAdmins() == null safely.
Test: adb install -r $OUT/system/priv-app/Settings/Settings.apk && adb shell am start -n com.android.settings/.DeviceAdminAdd --es android.app.extra.DEVICE_ADMIN_PACKAGE_NAME com.example.nonexistent
Change-Id: I1e3cf406e8053f6dbf99669f33b7c16648c9c8f8
Fix: 70491813
2017-12-11 21:01:58 +01:00
TreeHugger Robot
834ce49dd9 Merge "Fix assertion in VisibilityPreferenceControllerTest." 2017-12-11 19:19:33 +00:00
Doris Ling
ebf8843840 Update package name for PictureAndPictureSettings
- the settings have been moved into the appinfo package, but the path
has not been updated properly in the android manifest.

Change-Id: I3a00a187bd2fdbeb926e2bb8cc1c4ab720ccd72a
Fixes: 70491786
Test: manual
2017-12-11 11:18:10 -08:00
Phil Weaver
0db26b3a87 Add icons for color inversion and daltonizer
For accessibilty settings, both on the main page
and the shortcut picker.

Also now observing settings that could be toggled
by the shortcut, so changes can be reflected immediately
in the settings ui.

Bug: 34621067
Fixes: 70335904
Test: Observe icons in settings and shortcut picker.
Toggling color inversion and color correction now changes
the setting ui immediately.

Change-Id: Id27b6471376059288ff971e5aea72d76078bef36
2017-12-11 10:59:34 -08:00
jeffreyhuang
7ef47a9c5d Delete about phone v1 code
Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Ib8f420a86caa1da0165aa5c161eb584a009ed2b9
2017-12-11 10:57:37 -08:00
TreeHugger Robot
d3d1cf75cb Merge "Fix VisibilityPreferenceControllerTest." 2017-12-11 18:45:33 +00:00