Pavel Grafov
444989ad35
Merge "Respect DISALLOW_UNIFIED_PASSWORD in Settings."
2017-12-15 13:47:48 +00:00
Philip P. Moltmann
146e245ac8
Merge "Switch to modern ArgumentMatchers" am: b8bf3bbc72 am: ced2263d48
...
am: e360d51476
2017-12-15 12:00:25 +00:00
Philip P. Moltmann
e360d51476
Merge "Switch to modern ArgumentMatchers" am: b8bf3bbc72
...
am: ced2263d48
2017-12-15 11:04:48 +00:00
Philip P. Moltmann
ced2263d48
Merge "Switch to modern ArgumentMatchers"
...
am: b8bf3bbc72
2017-12-15 10:48:38 +00:00
Treehugger Robot
b8bf3bbc72
Merge "Switch to modern ArgumentMatchers"
2017-12-15 10:33:13 +00:00
TreeHugger Robot
ce2b7fe988
Merge "Clarify secondary dnd media text."
2017-12-14 22:04:11 +00:00
Beverly
40bcefc0bb
Clarify secondary dnd media text.
...
Bug: 63077372
Test: manual
Change-Id: I38f249851fc5122e89dd3cc33124068598475751
2017-12-14 15:29:28 -05:00
TreeHugger Robot
91ffc73152
Merge "Hide Location Mode from search results if it's not available."
2017-12-14 18:08:44 +00:00
Lei Yu
4df0963385
Merge "Add PowerUsageSummaryLegacy to Restricted list."
2017-12-14 18:05:11 +00:00
Philip P. Moltmann
a56f6c5bdb
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-14 09:48:33 -08:00
TreeHugger Robot
c87e5a3609
Merge "Add developer option control for GNSS duty cycling."
2017-12-14 15:49:17 +00:00
Peter Visontay
7ca6649566
Merge "Add a unit test for the AppOps permission for displaying UI overlays."
2017-12-14 13:49:18 +00:00
TreeHugger Robot
7498b79569
Merge "Add preference controller for app action buttons."
2017-12-14 02:07:39 +00:00
gomo
e17c9406f0
Add developer option control for GNSS duty cycling.
...
Duty Cycling control is one of the Android-P features. In Android-P the
feature will be controlled via a Developer Options button with no
public API. This CL adds the button and connect it to be read via the
GnssLocationProivder to control the feature. Also Roboelectric test
added.
Bug: 64009176
Test: Tested on Android-P build and works as expected. Also Robolectric test added.
Change-Id: Icc0d259719cf9034caf2c78c790b914ab4292597
2017-12-13 17:29:23 -08:00
Ben Lin
d11d08658f
Hide Location Mode from search results if it's not available.
...
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LocationModeTest all
passes.
Bug: 70283459
Change-Id: Id99d4a8f694b6f223ee8ead9701569840e333a9e
2017-12-13 16:03:27 -08:00
Philip P. Moltmann
bfaec28943
Merge "Switch to modern ArgumentMatchers"
2017-12-13 23:40:08 +00:00
TreeHugger Robot
17006451fb
Merge "Add Slices Data object and DB Contract"
2017-12-13 23:01:36 +00:00
TreeHugger Robot
d6d292554c
Merge "Simplify DND Behavior secondary text"
2017-12-13 22:59:43 +00:00
Doris Ling
70aaa94bb2
Add preference controller for app action buttons.
...
- move code related to initializing/refreshing the action buttons from
AppInfoDashboardFragment into a new controller.
Bug: 69384089
Test: make RunSettingsRoboTests
Change-Id: I8eb5f42a1b6d3c35f5a9e1356a9e5e31f643d5d3
2017-12-13 14:44:38 -08:00
TreeHugger Robot
aceacf5d43
Merge "Move AppInfoDashboardFragment into appinfo package."
2017-12-13 21:22:36 +00:00
Beverly
69294a5d5c
Simplify DND Behavior secondary text
...
Bug: 63077372
Change-Id: I0ac305ff429de27a65667441703b938305d8a03f
Fixes: 70627215
Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests -j40
2017-12-13 15:23:03 -05:00
James Lemieux
d9d4fda9fe
Merge "Adopt robolectric 3.5.1"
2017-12-13 19:31:37 +00:00
Matthew Fritze
7fddfebf6c
Add Slices Data object and DB Contract
...
Add in a Data object used to represent one row
in a new SQLite database used for building Slices.
The database has the following schema:
- Key
- Title
- Subtitle
- Screentitle
- Icon
- Fragment
- Controller
The key is the preference key.
Title, subtitle and Icon are for UI info.
Screentitle and fragment are for the intent.
Controller is used to get dynamic ui info (like summary),
and to take actions on the slice (like a toggle).
The actual indexing and a Slice will be handled in a subsquent CL,
but a prototype can be found here: ag/3324435
Test: robotests
Bug: 67996923
Change-Id: Id91deb58a3ab89ce1dab5a3f34cdb9ade6263aa8
2017-12-13 10:59:47 -08:00
Peter Visontay
11bfef660c
Add a unit test for the AppOps permission for displaying UI overlays.
...
The test logic is the same as ExetrnalSourcesSettingsTest but I moved/renamed some methods so both AppOps tests can use them.
Test: make -j32 SettingsUnitTests && adb install -r out/target/product/marlin/data/app/SettingsUnitTests/SettingsUnitTests.apk && adb shell am instrument -w -e class com.android.settings.applications.ExternalSourcesSettingsTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: same as above, but for DrawOverlaySettingsTest
Change-Id: Ifc0f0985a4cb4a82a00839aeb4cd4216c777250e
2017-12-13 18:54:53 +00:00
Jordan Liu
567493a35c
Merge "Add signal strength customization"
2017-12-13 18:20:08 +00:00
jackqdyulei
73abbc19c3
Add PowerUsageSummaryLegacy to Restricted list.
...
Then in guest/secondary user it is also possible to show
battery settings.
Bug: 70606597
Test: Manual
Change-Id: I7993abbf988926d0890229e9c14c779906be6e23
2017-12-13 10:19:47 -08:00
Robin Lee
3637f7a6b3
Merge "Handle getActiveAdmins() == null safely." am: d46153c3d3 am: 70a6dfd647
...
am: df5053e85b
2017-12-13 17:31:16 +00:00
Robin Lee
df5053e85b
Merge "Handle getActiveAdmins() == null safely." am: d46153c3d3
...
am: 70a6dfd647
2017-12-13 17:28:34 +00:00
Robin Lee
70a6dfd647
Merge "Handle getActiveAdmins() == null safely."
...
am: d46153c3d3
2017-12-13 17:24:00 +00:00
Treehugger Robot
d46153c3d3
Merge "Handle getActiveAdmins() == null safely."
2017-12-13 17:16:38 +00:00
Android Build Merger (Role)
4b721bc91d
Merge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev am: ad44ea442b -s ours
...
am: 937902f2f5
2017-12-13 13:25:18 +00:00
Bill Yi
76068a3a0a
Import translations. DO NOT MERGE am: e30af484ff -s ours
...
am: b63129a388
2017-12-13 13:24:40 +00:00
Android Build Merger (Role)
937902f2f5
Merge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev
...
am: ad44ea442b
2017-12-13 13:23:07 +00:00
Bill Yi
b63129a388
Import translations. DO NOT MERGE
...
am: e30af484ff
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
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
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
2017-12-13 02:25:04 +00:00
Hemant Gupta
40069b5ee2
Merge "Bluetooth: Add support for PBAP UI preference" am: f689d1aaa7
...
am: 0b4c0ebbe4
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
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
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
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
