Commit Graph

38218 Commits

Author SHA1 Message Date
Rajeev Kumar
a2425603d9 Merge "Stop showing Picture in Picture for Android Go." 2017-07-17 23:41:58 +00:00
Kevin Chyn
8a2e755e3c Merge "Add setShouldBlink method to get SeekBarPreference" into oc-dr1-dev am: 69eeb6c3d9
am: f07c2e8b98

Change-Id: If027a21fb316fe40157acf7c7bb8259bb3e82a9e
2017-07-17 23:17:11 +00:00
Michael Wachenschwanz
1d820308b6 Merge "Update FakeUid to implement getForegroundServiceTimer" 2017-07-17 22:59:41 +00:00
Kevin Chyn
f07c2e8b98 Merge "Add setShouldBlink method to get SeekBarPreference" into oc-dr1-dev
am: 69eeb6c3d9

Change-Id: Ia491e4215100221e475a139afcebd91521bcfaa4
2017-07-17 22:55:27 +00:00
TreeHugger Robot
69eeb6c3d9 Merge "Add setShouldBlink method to get SeekBarPreference" into oc-dr1-dev 2017-07-17 22:49:09 +00:00
Doris Ling
00de10c32b Merge "Add background color to suggestion/condition view." into oc-dr1-dev am: edad87c4b0
am: e8d37d9d75

Change-Id: I546eabf134f90c0002a010590edfbefa68c34216
2017-07-17 22:26:49 +00:00
Doris Ling
e8d37d9d75 Merge "Add background color to suggestion/condition view." into oc-dr1-dev
am: edad87c4b0

Change-Id: I612dbb1e3347e2052eec5df9b10b43d679b8585b
2017-07-17 22:24:53 +00:00
TreeHugger Robot
edad87c4b0 Merge "Add background color to suggestion/condition view." into oc-dr1-dev 2017-07-17 22:18:31 +00:00
xiaocheng.x.wang
de27818e11 Merge "Black screen appears after tapping the back key" am: abcd256842 am: 8ef6f6c839 am: 21b97c074f
am: c2448ed53d

Change-Id: I3c8c4132eee66b0cd2fcb7a6c94114b9789155f2
2017-07-17 21:54:47 +00:00
xiaocheng.x.wang
c2448ed53d Merge "Black screen appears after tapping the back key" am: abcd256842 am: 8ef6f6c839
am: 21b97c074f

Change-Id: I66f530f7b1d2d9b824c6852e5e612adb1b17989f
2017-07-17 21:51:48 +00:00
xiaocheng.x.wang
21b97c074f Merge "Black screen appears after tapping the back key" am: abcd256842
am: 8ef6f6c839

Change-Id: I0958426aae1d69552e42c903edb4d1b6e89fe390
2017-07-17 21:49:17 +00:00
xiaocheng.x.wang
8ef6f6c839 Merge "Black screen appears after tapping the back key"
am: abcd256842

Change-Id: I2deeaed21b9452933e25a324e420c1cacfcfb395
2017-07-17 21:46:47 +00:00
Rajeev Kumar
ebf850ed0a Stop showing Picture in Picture for Android Go.
Bug: 63715748
Test: visual, and runtest --path ManagedAccessSettingsLowRamTest.java
Change-Id: I65836c5d94d425ec6120572a1c27cd8a8d69cd69
2017-07-17 14:44:51 -07:00
Treehugger Robot
abcd256842 Merge "Black screen appears after tapping the back key" 2017-07-17 21:39:29 +00:00
TreeHugger Robot
602905bc43 Merge "Print system APIs require a permission" 2017-07-17 20:27:54 +00:00
Tony Mantler
158d10c21b Merge "Add ADB enable/disable PreferenceController" 2017-07-17 20:26:33 +00:00
TreeHugger Robot
fe1b8f9017 Merge "update the string for bt disable" 2017-07-17 20:02:45 +00:00
Fan Zhang
4ff09a2eec Merge "Misc search fix" 2017-07-17 19:01:08 +00:00
Matthew Fritze
d88a768152 Add gestures as inline actions for Phone Buddy am: 469e4ea228
am: c44f8c8256

Change-Id: Ic3d11679a7b87c429b3cdb8eeba3c5d208cd5866
2017-07-17 17:48:59 +00:00
Matthew Fritze
c44f8c8256 Add gestures as inline actions for Phone Buddy
am: 469e4ea228

Change-Id: I1effb7de88e56bb95b19ab6b6d008ee736046d7b
2017-07-17 17:46:32 +00:00
Eric Schwarzenbach
8bca687691 Merge "Make "Add Network" dialog fullscreen." 2017-07-17 17:42:49 +00:00
Eric Schwarzenbach
c86f5bbd00 Make "Add Network" dialog fullscreen.
Bug: 35324632
Test: manual

Change-Id: Ideac214eb97d774878ee772daca2b7efceba95b4
2017-07-17 08:56:57 -07:00
Matthew Fritze
469e4ea228 Add gestures as inline actions for Phone Buddy
Add the following gestures as inline:
- Assist gesture
- Double tap power
- Double tap screen
- Pickup
- Swipe for notification

Bug:62022517
Test: make RunSettingsRoboTests
Change-Id: Ib246b97a0b924bf18f464d3548b7e4c393fc1931
2017-07-17 08:48:42 -07:00
TreeHugger Robot
8a5a1b7419 Merge "Iterate NetworkPolicy towards SubscriptionPlan." 2017-07-15 19:57:01 +00:00
Kevin Chyn
8b99c8cfa3 Add setShouldBlink method to get SeekBarPreference
Bug: 63642792

Test: make -j && make -j RunSettingsRoboTests
Change-Id: I92bb34282fe2b89644a3e004ec0da7d3c1f3db43
2017-07-14 22:45:01 -07:00
Kevin Chyn
c457f58b90 Merge "Fix assist gesture keyword" into oc-dr1-dev am: 4b4ad6efc2
am: 14f8431a9f

Change-Id: I37e5bcbcf77661d49d4209d258820fad2faf5aaf
2017-07-15 04:18:53 +00:00
Kevin Chyn
14f8431a9f Merge "Fix assist gesture keyword" into oc-dr1-dev
am: 4b4ad6efc2

Change-Id: I03ffaa0f14257d64293434c9fc12a389c83ceed0
2017-07-15 04:14:21 +00:00
TreeHugger Robot
4b4ad6efc2 Merge "Fix assist gesture keyword" into oc-dr1-dev 2017-07-15 04:11:04 +00:00
Tarandeep Singh
f29b32b4ce Merge "Show keypad while setting PIN in setup wizard" into oc-dr1-dev am: 0288cf34f4
am: c61fc4a6bc

Change-Id: I7dc293be5cd7028131e3bb5f7f81d515a4231cc5
2017-07-15 02:11:42 +00:00
Tarandeep Singh
c61fc4a6bc Merge "Show keypad while setting PIN in setup wizard" into oc-dr1-dev
am: 0288cf34f4

Change-Id: Ibd45c218f842ea622558bf0df6dd33c16d522f9a
2017-07-15 02:06:43 +00:00
TreeHugger Robot
0288cf34f4 Merge "Show keypad while setting PIN in setup wizard" into oc-dr1-dev 2017-07-15 01:59:39 +00:00
Doris Ling
87eb423564 Merge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev am: ef8e2db876
am: fb64a7f74c

Change-Id: Ib3d86ef233acea8b2f090941a8bc11480ed78ef0
2017-07-15 01:17:18 +00:00
Doris Ling
fb64a7f74c Merge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev
am: ef8e2db876

Change-Id: I4f7ea7436b684cc29cc8f922523b15cd89182250
2017-07-15 01:12:53 +00:00
TreeHugger Robot
ef8e2db876 Merge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev 2017-07-15 01:05:41 +00:00
TreeHugger Robot
5d3c81ae69 Merge "Remove extra newline in AndroidManifest." 2017-07-15 01:00:32 +00:00
Rajeev Kumar
663f2a90eb Merge "Refactor few public static methods." 2017-07-14 23:31:35 +00:00
Philip P. Moltmann
5929b133e6 Print system APIs require a permission
Test: Checked that enabling and disabling a print service is still
      observed by the Settings app
Bug: 62350107
Change-Id: I12ed72767127c2ee2a9266140807ed1bd55800c3
2017-07-14 16:16:13 -07:00
Kevin Chyn
431ce43357 Fix assist gesture keyword
Bug: 63544783

Test: make -j RunSettingsRoboTests
Change-Id: Ief33fa9c556cc5a328401573459c7cbdd0053260
2017-07-14 16:10:12 -07:00
Eric Schwarzenbach
fbc3eee32a Merge "Change wifi detail buttons to match App buttons." 2017-07-14 23:09:23 +00:00
Doris Ling
1b6685f4a4 Add background color to suggestion/condition view.
- also remove "new_ui" from the condition tile and suggestion tile
layout file name.

Change-Id: I2a1fe4ea2ed69768f6e7c464608039c9c962c9f1
Fix: 63674319
Test: visual
2017-07-14 15:34:42 -07:00
Fan Zhang
4e7bd693b2 Misc search fix
- Remove incorrect summary from set date/time
- Remove some unused resources
- Remove ability to clear individual search history
- Add remove all query history menu item

Change-Id: I4383d075310297163fd2206d1a5b9c8f4ed94078
Fix: 62741488
Fix: 31589605
Test: robotests
2017-07-14 15:29:57 -07:00
Doris Ling
04b0e48d59 Merge "Fix crash on expanding settings conditions." into oc-dr1-dev am: 77a34f69c6
am: 5436dacf2c  -s ours

Change-Id: I6e0b5aa0cef66d109d445ea8cfd38a1f1bbb1b30
2017-07-14 22:28:24 +00:00
Doris Ling
5436dacf2c Merge "Fix crash on expanding settings conditions." into oc-dr1-dev
am: 77a34f69c6

Change-Id: Ibfd77b5c2ab16dbc55f0874350bd6025fee463f7
2017-07-14 22:23:36 +00:00
TreeHugger Robot
77a34f69c6 Merge "Fix crash on expanding settings conditions." into oc-dr1-dev 2017-07-14 22:18:26 +00:00
Malcolm Chen
6fef2fff5e Remove extra newline in AndroidManifest.
Remove extra newline in AndroidManifest which caused
android.settings.MOBILE_DATA_USAGE not received.

Bug: b/63670955
Test: testcase MobileDataUsageActivityTest
Change-Id: I4a4178141010b128e3d9c8c9721a51b81cbdffff
2017-07-14 15:05:20 -07:00
Salvador Martinez
e15cee7ecf Merge "Fix enhanced estimate discharge text showing while charging" into oc-dr1-dev am: 4d3b534325
am: 1cd965b519

Change-Id: Ie86a201b9fabcda0d10cdc0c738f51e28fda5a1b
2017-07-14 22:04:53 +00:00
Salvador Martinez
1cd965b519 Merge "Fix enhanced estimate discharge text showing while charging" into oc-dr1-dev
am: 4d3b534325

Change-Id: Ief931efc6ecad6e878015b22dea113f0ca0c99fe
2017-07-14 21:56:53 +00:00
TreeHugger Robot
4d3b534325 Merge "Fix enhanced estimate discharge text showing while charging" into oc-dr1-dev 2017-07-14 21:47:50 +00:00
TreeHugger Robot
d75a692793 Merge "Use app context to init WifiP2pManager." 2017-07-14 21:46:56 +00:00
Jeff Sharkey
47f51fac35 Iterate NetworkPolicy towards SubscriptionPlan.
As part of getting Settings ready to roll towards SubscriptionPlan,
reduce references to NetworkPolicy internal fields.  All usage cycle
details are now obtained from an Iterator which converts to
SubscriptionPlan under the hood.

Bug: 63391323
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: I0e1357eef092a328c05f6a709aba0f106554631e
2017-07-14 15:17:42 -06:00