Commit Graph

37504 Commits

Author SHA1 Message Date
Matthew Fritze
3b32306c54 Merge "Add util method to get battery stats" into oc-dr1-dev
am: 55ad60d1ff

Change-Id: I02308e6829fbc1a3764efb8a09dfc9d576428775
2017-07-06 22:11:04 +00:00
Daniel Nishi
a22ecac2f9 Merge "Shrink the music icon." into oc-dr1-dev
am: e78190d124

Change-Id: I21af42927fa117c68a4979285213361a3c70fa56
2017-07-06 22:10:37 +00:00
Daniel Nishi
5f27569478 Merge "Update the Storage icons." into oc-dr1-dev
am: fa47cebd55

Change-Id: I2a393ea0aa4274c23cf9c75fdc655d7436d695d3
2017-07-06 22:10:18 +00:00
TreeHugger Robot
8218511fb7 Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev 2017-07-06 22:08:51 +00:00
TreeHugger Robot
55ad60d1ff Merge "Add util method to get battery stats" into oc-dr1-dev 2017-07-06 21:58:33 +00:00
Daniel Nishi
e78190d124 Merge "Shrink the music icon." into oc-dr1-dev 2017-07-06 21:58:01 +00:00
Ajay Nadathur
3d9fffed16 Screen lock type metrics are not reported if user goes back
bug: 63116381
Test: Manually tested and verified that metrics are passed back to
setupwizard. Also added robolectric tests
Change-Id: I9d095754addc34121a2a0a12b3e5d1479ff15a78
2017-07-06 14:56:34 -07:00
Daniel Nishi
fa47cebd55 Merge "Update the Storage icons." into oc-dr1-dev 2017-07-06 21:50:49 +00:00
Andrew Sapperstein
ccbb4cfc2c Use config_headlineFontFamily for password screens.
These screens are used whenever setting or confirming the
lockscreen PIN or password. Set them to a consistent textSize (24sp)
and a consistent fontFamily.

Would have set the fontFamily in the style, but unfortunately
setInputType is called on the TextViews after inflation which blows
away the fontFamily. Instead, we set it in code right after that
call.

Change-Id: I77c3f94e2b1ce6d1f19697394c5caa09aac423b0
Fixes: 62873478
Test: manual
2017-07-06 14:30:28 -07:00
Fan Zhang
4a1245e8c1 Fix a crash in AppInfoBase where appEntry is invalid
am: 2c6634a8a9

Change-Id: I6a3bc29c8a1863b320bfe3f07a40f85ddeb676fd
2017-07-06 19:58:06 +00:00
Antony Sargent
b6fc6e31a5 Add a confirmation dialog when forgetting BT device
This adds a confirmation dialog for when you hit the "Forget" button to
unpair with a device from the Bluetooth device details page.

Bug: 37955181
Test: make RunSettingsRoboTests
Change-Id: I7643ed09bf363c48078d6de8a47583bf91fc7729
2017-07-06 12:24:32 -07:00
Fan Zhang
2c6634a8a9 Fix a crash in AppInfoBase where appEntry is invalid
Change-Id: Ifbea967405ddc1e1bd069ddeab170bc67b1835b4
Fix: 63178369
Test: robotests
2017-07-06 17:56:47 +00:00
Matthew Fritze
dc2005eb6a Merge "Check non-indexable keys for raw data" into oc-dr1-dev
am: 24ba2fbdb9

Change-Id: Iab0cb32e75fabda8e2c411391d0693107fa9d2ed
2017-07-06 17:37:46 +00:00
TreeHugger Robot
24ba2fbdb9 Merge "Check non-indexable keys for raw data" into oc-dr1-dev 2017-07-06 17:31:29 +00:00
Android Build Merger (Role)
5fc76d5a89 Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp 2017-07-06 17:18:56 +00:00
Daniel Nishi
3c365e732e Merge "Unify storage calculations." into oc-dr1-dev
am: 947cb367db

Change-Id: Ia5e4650eb1922e59ee1e95b04df7377668f0538a
2017-07-06 17:17:27 +00:00
Daniel Nishi
a223ee4890 Merge "Unify storage calculations." into oc-dr1-dev
am: 947cb367db

Change-Id: I3923a04104b949281e487b0b8fc5a55601536e93
2017-07-06 17:15:40 +00:00
Daniel Nishi
947cb367db Merge "Unify storage calculations." into oc-dr1-dev 2017-07-06 17:04:53 +00:00
Matthew Fritze
bdd57aad3e Check non-indexable keys for raw data
Change-Id: I182f6757cae0ccdd07c2c38ea0f02bd4998f79be
Fixes: 63360455
Test: make RunSettingsRoboTests
2017-07-06 08:15:42 -07:00
Alex Kulesza
d69f7cddb6 Merge "Render enhanced battery projection curves." into oc-dr1-dev
am: 32812e6121

Change-Id: I9ad8579fd76516b2c3ab89571b20ac2b28a2d161
2017-07-06 14:07:47 +00:00
Alex Kulesza
32812e6121 Merge "Render enhanced battery projection curves." into oc-dr1-dev 2017-07-06 14:02:26 +00:00
Android Build Merger (Role)
27f1eedd19 Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf" into oc-dr1-dev-plus-aosp 2017-07-06 06:33:29 +00:00
Lorenzo Colitti
11c2ea3a96 Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
am: dcc15eabdf

Change-Id: I3e5eb9cbcd7cdee2f0ee28579fc8f9d707b8e471
2017-07-06 06:30:32 +00:00
Lorenzo Colitti
413d0ac41e Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
am: dcc15eabdf

Change-Id: I28e2de31fafa533e35655a2d5f2ec9b1e3554eee
2017-07-06 06:30:31 +00:00
TreeHugger Robot
dcc15eabdf Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev 2017-07-06 06:13:55 +00:00
Daniel Sheng
89efcf0c0b Removed camera lift gesture settings UI.
am: 9a16e473ab

Change-Id: I7fe06ff066878b725be5a8ac6132ee9fa9ff3a81
2017-07-06 05:39:34 +00:00
TreeHugger Robot
94714cf0c9 Change empty apn type in user entered APN to non-read-only types.
Test: Manually added APN and verified read-only and non-wildcardable
types are not included
Bug: 38186417

Change-Id: I07bcf1c2a950a1257446f0a7beb602fed79423b3
2017-07-05 21:46:43 -07:00
Daniel Sheng
34887c8355 Merge "Added suggestions for gestures." into oc-dr1-dev
am: f8e0963f78

Change-Id: If48fd6cbbc1e8a90afd12da39df8752c4ff301f4
2017-07-06 03:30:33 +00:00
Android Build Merger (Role)
05be6e07d9 Merge "Bluetooth: Use string in remote device summary am: 04f5967c95" into oc-dr1-dev-plus-aosp 2017-07-06 03:27:09 +00:00
Jack He
b3499f34cd Bluetooth: Use string in remote device summary
am: 04f5967c95

Change-Id: Idc084b72529a7408edf3ed7cb74496851e65d053
2017-07-06 03:25:08 +00:00
Daniel Sheng
9a16e473ab Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: Ifefa07d0e8e0de19d78303352c6f0e01dc1c52ab
Merged-In: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 20:24:12 -07:00
Jack He
d79f6af9ae Bluetooth: Use string in remote device summary
am: 04f5967c95

Change-Id: Ib8673c03e6875d4661015f9fa0eb25b658090ad2
2017-07-06 03:23:43 +00:00
Daniel Sheng
f8e0963f78 Merge "Added suggestions for gestures." into oc-dr1-dev 2017-07-06 03:19:57 +00:00
Lorenzo Colitti
03c4a7401e Add a developer offload for tethering hardware acceleration.
Bug: 32163131
Test: builds
Change-Id: Icca7bbd2bdd572b1328e7d0fecb663405b115fe1
2017-07-06 12:13:11 +09:00
Alex Kulesza
cc56b1aa04 Make utility methods static.
am: 43d4fefb36

Change-Id: If15b946499c572a693712607bc818d143875290f
2017-07-06 01:24:46 +00:00
Jack He
04f5967c95 Bluetooth: Use string in remote device summary
* Use String in connected device summary instead of resource id
* This allows dynamic strings to be built by CachedBluetoothDevice
  such as ones involve battery level percentages

Bug: 35874078
Test: make, unit test, test with Bluetooth devices
Change-Id: I583eac73280ca17387b215a4e7095e27de399998
2017-07-06 01:22:35 +00:00
Daniel Sheng
f7c459c9e5 Added suggestions for gestures.
Bug: 30986021
Test: manual + make RunSettingsRoboTests + adb shell am instrument -w
com.android.settings.tests.unit /android.support.test.runner.AndroidJUnitRunner
Change-Id: I7337a141cb21e5a1399aaca05ec1facd8629577b
Merged-In: I7aed110c81ca2fb6b90e2f359b4bb941c02bc1c3
2017-07-05 17:35:03 -07:00
Android Build Merger (Role)
6f48e921c4 Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496" into oc-dr1-dev-plus-aosp 2017-07-05 22:58:57 +00:00
Antony Sargent
f0bbab58e1 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev
am: 6d50576496

Change-Id: I91cedada5ebd6c77378d918b90440aca50f000a5
2017-07-05 22:56:11 +00:00
Alex Kulesza
82dbcd973d Render enhanced battery projection curves.
BatteryInfo now supplies standard linear or enhanced projection curves,
depending on the provider.

Note that the semantics of parsing have changed slightly in that the
value of endTime supplied to onParsingStarted is now the end time of the
historical data and does not include the projection. However, as far as
I can see there is no existing code that depends on the parsing
functionality besides BatteryInfo itself.

Also slightly optimizes the updating behavior of the UsageGraph, since
we are now reconfiguring it multiple times.

Bug: 38400320
Test: make RunSettingsRoboTests, manual on device
Change-Id: Ieff26d31356b34bb38e49f54f979fd80549864b2
2017-07-05 18:56:02 -04:00
Antony Sargent
5438319677 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev
am: 6d50576496

Change-Id: Ib35f0e2f74055b7c119f9fd9775c7299a6cc9e29
2017-07-05 22:55:51 +00:00
Alex Kulesza
43d4fefb36 Make utility methods static.
BatteryUtils.convertUsToMs and .convertMsToUs should be static, and now
they are.

Bug: 63347148
Test: make RunSettingsRoboTests
Change-Id: If652e2d3e1260df9a933805d7da670fbb26b2c25
2017-07-05 18:53:22 -04:00
Antony Sargent
6d50576496 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev 2017-07-05 22:49:04 +00:00
Sundeep Ghuman
4fd8528c2f Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev
am: 09229abbf2

Change-Id: I7a636c40515b24b7376b8ceadf969a257b2dc8d9
2017-07-05 22:30:22 +00:00
TreeHugger Robot
09229abbf2 Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev 2017-07-05 22:21:40 +00:00
Daniel Nishi
209bea5580 Shrink the music icon.
The icons on the ManageApplications screen are 42dp by default. By
pushing a big inset, we can shrink it to be appropriate.

Change-Id: Iadf9f9f708c7469f42559f88626789127f865543
Fixes: 62548746
Test: Manual
2017-07-05 14:57:12 -07:00
Matthew Fritze
bfe82cab89 Add util method to get battery stats
Bug:62271803
Test: make RunSettingsRoboTests
Change-Id: I91089c24c7cd5f7329be052c50859e049e70e9b1
2017-07-05 14:54:20 -07:00
Daniel Nishi
2872e2c6cc Update the Storage icons.
Change-Id: I10648df80566629c09d03211ed642516595e4b22
Fixes: 62548249
Test: Manual
2017-07-05 14:41:12 -07:00
Android Build Merger (Role)
5daad21245 Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp 2017-07-05 20:42:57 +00:00
Daniel Nishi
33c0f8888b Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
am: 37caf9c7da

Change-Id: I97bb447b0b2ce106bc87914bc2b10df6b7632a4c
2017-07-05 20:42:44 +00:00