Commit Graph

18373 Commits

Author SHA1 Message Date
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
8ef6f6c839 Merge "Black screen appears after tapping the back key"
am: abcd256842

Change-Id: I2deeaed21b9452933e25a324e420c1cacfcfb395
2017-07-17 21:46:47 +00:00
Treehugger Robot
abcd256842 Merge "Black screen appears after tapping the back key" 2017-07-17 21:39:29 +00:00
Tony Mantler
158d10c21b Merge "Add ADB enable/disable PreferenceController" 2017-07-17 20:26:33 +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
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
Rajeev Kumar
663f2a90eb Merge "Refactor few public static methods." 2017-07-14 23:31:35 +00: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
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
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
Rajeev Kumar
739836883b Merge "Cleanups in XmlParserUtils." 2017-07-14 21:16:07 +00:00
Rajeev Kumar
9664c1a55e Refactor few public static methods.
Move public static methods from DataUsageSummary to DataUsageBase.

Bug: 62349208
Test: make RunSettingsRoboTests -j40
Change-Id: I632f75f4c4f370fb225a9787267043fec20994e5
2017-07-14 14:01:02 -07:00
Tarandeep Singh
b0bcbed372 Show keypad while setting PIN in setup wizard
Currently The activity not requesting showSoftInput() and hence keypad
doesn't show up.
Activity.onResume(), we should call ImeAwareEditText.scheduleSoftInput()
to request schedule ShowSoftInput() when EditText gains focus.

Fixes: 63582564
Test: Manually launch com.google.android.setupwizard/.SetupWizardTestActivity

Change-Id: Ib75ba0f361b8b46c3b717cc1ffb864726958ed82
2017-07-14 13:42:11 -07:00
TreeHugger Robot
6ce4220862 Merge "Move Apps & Notifications -> Notifications out from Advanced." 2017-07-14 20:26:44 +00:00
TreeHugger Robot
09304ec2fd Merge "Hide memory setting in app detail unless dev option is on." 2017-07-14 20:09:30 +00:00
Fan Zhang
53bf174d30 Use app context to init WifiP2pManager.
Change-Id: Ib1a2ef1c0b8c3e72557aafb68b8b5e8677fbacc7
Fix: 32767308
Test: heapdump
2017-07-14 13:05:23 -07:00
Doris Ling
01fe5b45b4 Fix crash on expanding settings conditions.
Check for non-empty suggestions instead of non-null suggestions when
trying to determine whether to show conditions or suggestions list.

Change-Id: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Merged-In: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Fix: 63674269
Test: make RunSettingsRoboTests
2017-07-14 13:04:30 -07:00
Doris Ling
a54ebe87f2 Merge "Fix crash on expanding settings conditions." 2017-07-14 19:53:39 +00:00
Rajeev Kumar
0ac6f8f4b9 Merge "Recycle TypedArray in ConversationMessageView." 2017-07-14 19:51:24 +00:00
Doris Ling
0018f1680f Update spacing in suggestion/condition header and footer.
Adjust the top/bottom padding for the header and footer so that the
content is center-aligned.

Change-Id: I01c0baf770abf3a8767a016a758ee1794403598b
Fix: 63670820
Test: Visual
2017-07-14 12:31:12 -07:00
Rajeev Kumar
cbbc28006f Cleanups in XmlParserUtils.
1. Get rid of redundant toString call from getData method.
2. Recycle TypedArray.

Test: make RunSettingsRoboTests -j40
Change-Id: Id7e9e442aaf449d46131fa4f3d5a7f0457069159
2017-07-14 12:25:54 -07:00
Rajeev Kumar
82bbdfecab Merge "Recycle TypedArray in SpacePreference." 2017-07-14 19:14:16 +00:00
Rajeev Kumar
6f89fc05c4 Merge "Recycle TypedArray in UsageView." 2017-07-14 19:13:57 +00:00
TreeHugger Robot
f7921b12be Merge "Load only unique dictionary words" 2017-07-14 18:59:41 +00:00
TreeHugger Robot
becd4e689c Merge "Fix PIN/password lock UI update when locked out." 2017-07-14 18:25:03 +00:00
Doris Ling
cf01a0d0a9 Move Apps & Notifications -> Notifications out from Advanced.
Increase the tile limit from 2 to 3, since there is now a divider
above Notifications which also counts towards the item limit.

Change-Id: Id492fc7d8539a6ae62e6f1a7929aaa98b5287126
Fix: 63674733
Test: Visual
2017-07-14 11:14:09 -07:00
Fan Zhang
880e8c212c Hide memory setting in app detail unless dev option is on.
Change-Id: I785be8bc5228fa87e783f5ddbc41284346b8c8f1
Fix: 62059976
Test: robotests
2017-07-14 11:13:06 -07:00
Eric Schwarzenbach
4fefb21547 Merge "Change header of wifi detail page to "Network info"." 2017-07-14 18:06:24 +00:00