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
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
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)
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
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
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
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
2051822bb9
Merge "Fix screen freeze when changing display size in Multi-Window mode"
2017-12-12 23:59:23 +00:00
Adam Lesinski
11ab7f7b82
Merge "Update the way OMS records details about overlays" into oc-mr1-dev
...
am: 15b42b89b8
2017-12-12 23:16:37 +00: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
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
Bill Yi
9840c89235
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 814fb3b7a1
2017-12-08 06:01:46 +00:00
TreeHugger Robot
814fb3b7a1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-12-08 05:52:37 +00:00
Bill Yi
5811075aeb
Import translations. DO NOT MERGE am: 3ed385256a -s ours
...
am: 14c47203b3
2017-12-08 05:42:43 +00:00
Bill Yi
14c47203b3
Import translations. DO NOT MERGE
...
am: 3ed385256a
2017-12-08 05:39:41 +00:00
Bill Yi
3ed385256a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I35a94b9a271e88bf4f0384d5619c59661516131d
2017-12-07 17:08:40 -08:00
Bill Yi
3ea52be26d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I59dde21252b7681bb6dfcf9dae1f27192a3cd19e
2017-12-07 17:08:11 -08:00
Fan Zhang
ed6805142f
Merge "Update asset for no search result image" into oc-mr1-dev
...
am: afa1efabad
2017-12-08 00:25:31 +00:00
TreeHugger Robot
afa1efabad
Merge "Update asset for no search result image" into oc-mr1-dev
2017-12-08 00:19:09 +00:00
Adam Lesinski
9e19121a00
Update the way OMS records details about overlays
...
Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.
Bug: 69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586
2017-12-07 19:40:19 +00:00
Xin Li
a038fb9044
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4 -s ours
...
am: 4f83509810
2017-12-07 15:23:18 +00:00
Xin Li
4f83509810
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
...
am: cb1056f9b4
2017-12-07 15:17:25 +00:00
Xin Li
82c94efa69
DO NOT MERGE: Merge Oreo MR1 into master am: 7b017d5a2f -s ours
...
am: 2ba6a22abb
2017-12-07 07:05:14 +00:00
Xin Li
2ba6a22abb
DO NOT MERGE: Merge Oreo MR1 into master
...
am: 7b017d5a2f
2017-12-07 04:36:38 +00:00
Hemant Gupta
13197bcc1e
Bluetooth: Add support for PBAP UI preference
...
Usecase:
1) Connect with carkit that supports PBAP/MAP
2) Try to uncheck the checkbox for contact sharing from device sub
settings menu
Expected Result:
1) DUT should display "Connected (No Media or Phone)"
1) Should be able to disconnect when checkbox moves from selected->unselected,
and carkit should be able to connect when checkbox is selected again
Observation:
1) No UI updates when PBAP/MAP are connected.
2) On unchecking Contact sharing checkbox nothing happens. PBAP connection
remains active and user is not asked to disconnect profile level connection.
Fix:
Add support for PBAP UI preference in SettingsLib. Also Fix issues related to MAP
profile addition/removal.
Test: Connect from carkit, try disconnecting from sub settings menu by unchecking
Contact Sharing checkbox and check if PBAP is successfully disconnected.
Bug: 35014213
Change-Id: I4981aa063b2541b58ce1d36e3576578cbeb02acc
2017-12-07 09:31:03 +05:30
Xin Li
cb1056f9b4
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
2017-12-06 23:18:29 +00:00
Xin Li
7b017d5a2f
DO NOT MERGE: Merge Oreo MR1 into master
...
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Iab7fd863c422780055277093cb9621197e09d969
2017-12-06 14:24:54 -08:00
Wang wenrui
09c44bf78d
Fix screen freeze when changing display size in Multi-Window mode
...
The device screen freezes when launching two Display size settings
screen and changing display size in Multi-Window mode.
To fix this issue, OnSeekBarChangeListener should be set in onStart() to
avoid onProgressChanged() is called during onRestoreInstanceState which
is caused by display size change.
Fixes: 70253030
Test: manual - open two Display size settings in Multi-Window mode.
Change-Id: I779954aeeb1da526ba1b0fac2676e2f7d8289352
2017-12-06 07:01:56 +00:00
Antony Sargent
5f4e32ae5f
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9 am: 26e5f828f7 am: fe20f69e3f
...
am: 51950965e9
2017-12-05 23:23:05 +00:00
Antony Sargent
51950965e9
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9 am: 26e5f828f7
...
am: fe20f69e3f
2017-12-05 23:17:11 +00:00
Antony Sargent
fe20f69e3f
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9
...
am: 26e5f828f7
2017-12-05 23:10:05 +00:00
Antony Sargent
26e5f828f7
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1
...
am: db6e747ab9
2017-12-05 17:36:29 +00:00
Antony Sargent
db6e747ab9
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
...
am: acacd658f1
2017-12-05 17:32:41 +00:00
Antony Sargent
acacd658f1
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407
...
am: 9867a3ef85
2017-12-05 17:28:54 +00:00
Antony Sargent
9867a3ef85
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
...
am: 3d7dbd6407
2017-12-05 17:26:51 +00:00
Antony Sargent
3d7dbd6407
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1
...
am: 24f063a207
2017-12-05 17:24:48 +00:00
Antony Sargent
24f063a207
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
...
am: 9cf1fc73f1
2017-12-05 17:21:14 +00:00
Antony Sargent
9cf1fc73f1
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
...
am: eee62e1846
2017-12-05 17:19:12 +00:00
Antony Sargent
eee62e1846
Reword bluetooth confirmation dialog am: e14d38a383
...
am: b2b401b5f3
2017-12-05 17:17:08 +00:00
