Commit Graph

41933 Commits

Author SHA1 Message Date
android-build-team Robot
4fc31dea69 Snap for 4500033 from 10a1602421 to pi-release
Change-Id: I8314e2a3831fe83b5c1d3a272832f55757a09544
2017-12-13 08:20:27 +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
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
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
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
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
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
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
Lei Yu
30ba48c540 Merge "Add device name preference in pairing page" 2017-12-12 18:05:34 +00:00
android-build-team Robot
39772714ae Snap for 4498106 from 2f7240ceb5 to pi-release
Change-Id: I24d368edbebee7c1ac3cf74959fc5e8e341148ba
2017-12-12 08:22:40 +00:00
android-build-team Robot
c9ac6b60db Merge cherrypicks of [3349132, 3348744, 3349021, 3348480, 3349133, 3349134, 3348513, 3348514] into pi-release
Change-Id: I3c71dda304fb440b64c18e8068671d5dd12ddfb4
2017-12-12 02:42:33 +00:00
Doris Ling
cddb308efe 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
(cherry picked from commit a8472007a7)
2017-12-12 02:41:41 +00:00
Doris Ling
bbc79a2e1e 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
(cherry picked from commit ebf8843840)
2017-12-12 02:41:28 +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
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
TreeHugger Robot
bbdeafe58b Merge "Remove Slice getter from BasePreferenceController" 2017-12-11 17:40:05 +00:00
Tobias Thierer
9d01fe6823 Fix assertion in VisibilityPreferenceControllerTest.
The test was asserting that VISIBILIY_NO_OVERRIDE (an int)
is not contained in a List<String> (*), which is (trivially)
true but doesn't test what the test intends to test.

(*) or a List<CharSequence>, which is similarly wrong /
  meaningless, prior to the base CL http://ag/3345932

VisibilityPreferenceController uses Integer.toString() to
construct corresponding String values, so the test should
be checking for that String value. For consistency with
  testUpdateState_noGlobalRestriction()
this CL uses the equivalent (and slightly shorter)
String.valueOf(int) instead of Integer.toString().

Test: EXPERIMENTAL_USE_OPENJDK9=1.8 make RunSettingsRoboTests \
   ROBOTEST_FILTER=VisibilityPreferenceControllerTest

Change-Id: I48644729d3e0f29d7ffcc981aeef650f2b1426ef
2017-12-11 17:36:40 +00:00
Sunny Goyal
0d2518ba97 Merge "Clearing task when opening home settings in case it is already in the same task" 2017-12-11 17:36:31 +00:00
Tobias Thierer
8f68856823 Fix VisibilityPreferenceControllerTest.
The test was expecting an ArgumentCaptor for RestrictedDropDownPreference
(extends ListPreference).setEntryValues(CharSequence[]) to be passed an
array of Strings, when actually it should have expected an array of
CharSequences.

This CL fixes the test to use CharSequence. Since CharSequence.equals()
is not guaranteed to be in terms of value equality of the characters,
a private static helper method:

  List<String> toStringList(CharSequence[] charSequences) { ... }

is used.

Bug: 70504129
Test: EXPERIMENTAL_USE_OPENJDK9=1.8 make -j30 showcommands dist \
  RunSettingsRoboTests RunSettingsRoboTests-jacoco \
  RunSettingsLibRoboTests RunSettingsLibRoboTests-jacoco \
  RunSettingsGoogleRoboTests RunSettingsGoogleRoboTests-jacoco \
  RunSuwRoboTests RunSuwRoboTests-jacoco \
  RunTurboRoboTests \
  RunStorageManagerRoboTests \
  RunTvSettingsRoboTests RunTvSettingsRoboTests-jacoco

Change-Id: I347b03e6cb01715cd1c7f50b5f36567e5f375ad7
2017-12-11 17:03:35 +00:00
android-build-team Robot
0478e8265a Snap for 4496165 from 2f7fd8c592 to pi-release
Change-Id: I7d053a387f04c5ab536b44bb8337a6bba5d8e5a7
2017-12-11 12:20:54 +00:00
Aurimas Liutikas
6df7a52011 Disable crashing ExternalSourcesSettingsTest#testManageExternalSourcesForApp
Bug: 70383636
Change-Id: If542ef48d54959b3cc6c9fb07ddf07977fe40a8b
2017-12-09 19:03:43 +00:00
Paul Duffin
2f7fd8c592 Merge "Stop statically including legacy-android-test" 2017-12-09 11:18:13 +00:00
Sunny Goyal
ea63e4c6c6 Clearing task when opening home settings in case it is already in the same task
Test: Manually tested on device
Bug: 69960568
Change-Id: If9de28936a7156c4d9c68c85c168ff4aa7492151
2017-12-08 16:12:34 -08:00
Paul Duffin
2baf72190c Stop statically including legacy-android-test
Statically including legacy-android-test leads to duplicate classes
which causes build time problems (with Proguard) and runtime problems on
older SDK versions. This change:
* Stops statically including legacy-android-test.
* Adds compile time dependencies on andoid.test.base, android.test.mock
  and android.test.runner where necessary.
* Adds <uses-library android:name="android.test.runner"/> to any
  affected package to ensure that the classes that were included by
  legacy-android-test are still available at runtime. That also adds a
  dependency on android.test.base and android.test.mock.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/unit/Android.mk
    Added 'android.test.base' and 'android.test.mock' to
    LOCAL_JAVA_LIBRARIES because SettingsUnitTests's source depends on
    their classes and because of these changes they are no longer
    present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in SettingsUnitTests
    results in duplicate classes which leads to build time and compile
    time issues.

Bug: 30188076
Test: make checkbuild
Change-Id: I191a72e50017213df6ad04f32aa660e8028720e2
2017-12-08 23:43:33 +00:00
jackqdyulei
988199e202 Add ConnectedUsbDeviceUpdater
The usb updater listens to usb update and notify
ConnectedDeviceGroupController to add/remove
preference.

This cl:
1. Add ConntectedusbDeviceUpdater
2. Extract the UsbConnectionBroadcastReceiver since it would be
used both in controller and updater.
3. Add tests

Bug: 69333961
Test: RunSettingsRoboTests

Change-Id: Ic3b045a6faa4eba57d9b0c089ea1656141cc0220
2017-12-08 13:42:37 -08:00