Commit Graph

38441 Commits

Author SHA1 Message Date
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
jackqdyulei
114cf2a1a7 Never store battery stats for cache
In PowerUsageBase, it will store battery stats if it has a configuration
change, which will make BatteryStatsLoaderHelper never get the correct
battery stats because it uses Bundle.EMPTY as the bundle message.

This cl:
1. Remove the store action even though it is configuration change.
2. Always use null to get battery stats
3. Always start a battery status check in register()

Bug: 63658232
Test: RunSettingsRoboTests
Change-Id: Ifbf970c63378ed66dddcdae4d952b7d1fd84216a
2017-07-14 15:36:40 -07: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
Rajeev Kumar
739836883b Merge "Cleanups in XmlParserUtils." 2017-07-14 21:16:07 +00:00
Doris Ling
b9e256a908 Merge "Fix left aligned "Wi-Fi" category title in data usage page." into oc-dr1-dev am: cccd78ee69
am: 546a7a468d  -s ours

Change-Id: I6348e37f2a1adf526f86372a253599106714dc74
2017-07-14 21:10:58 +00:00
Doris Ling
546a7a468d Merge "Fix left aligned "Wi-Fi" category title in data usage page." into oc-dr1-dev
am: cccd78ee69

Change-Id: Iadd785980f64eab3b350354092f0be0d62ac06a1
2017-07-14 21:05:01 +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
TreeHugger Robot
cccd78ee69 Merge "Fix left aligned "Wi-Fi" category title in data usage page." into oc-dr1-dev 2017-07-14 20:51:09 +00: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
Doris Ling
b94727de0c Fix left aligned "Wi-Fi" category title in data usage page.
Set thee category title text view to align at the start position.

Change-Id: I9a297588e2f742d20b0d07bd6979e0378e41cb71
Merged-In: Iff5fbc595ec16396043d64a1ceb0fa81e874ea48
Merged-In: I9f0f51a9d070191f5bf8f3315fef4d997d6213c3
Fix: 63399239
Test: visual
2017-07-14 11:41:35 -07: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
Jeff Sharkey
fc5a1740be Merge "Move "metered" persistence to WifiConfiguration." 2017-07-14 17:47:54 +00:00
Lei Yu
70966973a1 Merge "Add metric action for bt rename dialog" into oc-dr1-dev am: 8e1f509b5d
am: 23de6959af

Change-Id: I68b23030c05e9d0949675dc158f8fb7dd8ab6479
2017-07-14 17:38:25 +00:00
Lei Yu
23de6959af Merge "Add metric action for bt rename dialog" into oc-dr1-dev
am: 8e1f509b5d

Change-Id: If1fe01a9839c1c59ae02cd3c4cbea665ef6f1f3b
2017-07-14 17:31:00 +00:00
Salvador Martinez
8ccb5a4698 Fix enhanced estimate discharge text showing while charging
In the PowerUsageAdvanced screen the text showing whether your time
remaining information is enhanced or not should not show when the
device is plugged in. This CL fixes a bug in that logic that would
show the text when it wasn't supposed to.

Test: robotests still pass, manual verification
Bug: 63176050
Change-Id: I33fb31671cd9c29aed20483301e51ae1ded1f1b6
2017-07-14 10:30:29 -07:00
Lei Yu
8e1f509b5d Merge "Add metric action for bt rename dialog" into oc-dr1-dev 2017-07-14 17:19:32 +00:00
Julia Reynolds
153578ebc3 Merge "Remove automatic rule icons" into oc-dr1-dev am: 0ed32cae99
am: 1f14e49fa5

Change-Id: I16bf3668f5ba49d7ff471322bd68937c6da23d0d
2017-07-14 16:54:58 +00:00
Julia Reynolds
1f14e49fa5 Merge "Remove automatic rule icons" into oc-dr1-dev
am: 0ed32cae99

Change-Id: I195fbd43befb0945fe0db6ec891a1781a3f31119
2017-07-14 16:51:26 +00:00
TreeHugger Robot
0ed32cae99 Merge "Remove automatic rule icons" into oc-dr1-dev 2017-07-14 16:45:49 +00:00