Phil Weaver
e5cd8ef7b9
Merge "Migrate to new overlay-stopping flag"
2017-07-06 20:07:33 +00: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
TreeHugger Robot
860dc6d448
Merge "Change storage migration to use quota APIs."
2017-07-06 19:33:53 +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
TreeHugger Robot
0002680697
Merge "Fix race condition and optimize categoryUpdater refresh"
2017-07-06 18:54:43 +00: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
aadd26e335
Merge "Check non-indexable keys for raw data" into oc-dr1-dev am: 24ba2fbdb9
...
am: dc2005eb6a
Change-Id: Ibcefe758e9524ae810234212ac83d385bd03d09e
2017-07-06 17:39:25 +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
Jeff Sharkey
fc522c677d
Change storage migration to use quota APIs.
...
New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.
Bug: 36056324
Test: builds, boots
Change-Id: Icdf774cff520a4b7ca6ec210b34a1c5ff85f8110
2017-07-06 11:29:26 -06:00
Daniel Nishi
842bcf5081
Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db
...
am: a223ee4890
Change-Id: I4a4dbe87c52a2c53abd2489143d9183c72d2c4cf
2017-07-06 17:27:05 +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
Fan Zhang
aeb94f0e5c
Fix race condition and optimize categoryUpdater refresh
...
- In SettingsActivity, do not call updateCategories() if nothing
changed.
- In SummaryLoader, create a mapping between tile key and summary. This
is necessary to handle a race condition where category is refreshed
after summary load.
- In DashboardSummary, refresh Tile's summary to latest cache value
everytime category is refreshed.
Change-Id: I61389b8ba614ba7e34939325bada6e1bd6fa6709
Fix: 63149109
Test: robotests
2017-07-06 10:13:58 -07: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
7ef10c410b
Merge "Render enhanced battery projection curves." into oc-dr1-dev am: 32812e6121
...
am: d69f7cddb6
Change-Id: Id226cd9d3c2ea5bbbbc1dcedfbd273938ac477ef
2017-07-06 14:10:06 +00: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
Philipp Weiß
7072a82a3e
Merge "When Remove Account is disallowed, show dialog"
2017-07-06 08:08:43 +00:00
Lorenzo Colitti
ad25a47e92
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf
...
am: 413d0ac41e
Change-Id: I1521f1a914b7d8514d9eb976f56d5b856caa2a83
2017-07-06 06:36:46 +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
Jack He
bbe2cf45ac
Bluetooth: Use string in remote device summary am: 04f5967c95
...
am: d79f6af9ae
Change-Id: If95cf2c89469d5b9220e3f2741e8c7f9288b655a
2017-07-06 03:29:58 +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
Daniel Sheng
9e958b6dfc
Merge "Removed camera lift gesture settings UI."
2017-07-06 02:56:12 +00:00
TreeHugger Robot
6e6d775c1b
Merge "Follow framework change."
2017-07-06 02:02:16 +00:00
Alex Kulesza
f30915e860
Make utility methods static. am: 43d4fefb36
...
am: cc56b1aa04
Change-Id: Ia1ebdff4fcd82f829e90f76bf7d49b0adbc8febc
2017-07-06 01:36:33 +00: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
Rajeev Kumar
e72113a5a8
Merge "Some cleanups in DataUsageSummary class: 1. Get rid of unused constants. 2. Fix typo in instance variable name. 3. Convert an instance variable to a local variable. 4. Use Java8 lambda for SummaryProviderFactory instance."
2017-07-06 01:20:45 +00:00
Daniel Sheng
11d240c300
Removed camera lift gesture settings UI.
...
Bug: 37154489
Test: make + manual + unit tests
Change-Id: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 18:04:10 -07: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
Daniel Sheng
77ba611ac0
Merge "Added suggestions for gestures."
2017-07-06 00:34:06 +00:00
Android Build Merger (Role)
e9e5978576
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496 am: 5438319677"
2017-07-05 23:21:57 +00:00
TreeHugger Robot
e0f8691abf
Merge "Fix alignment for build number preference in RTL."
2017-07-05 23:21:44 +00:00
Rajeev Kumar
8f425680ae
Some cleanups in DataUsageSummary class:
...
1. Get rid of unused constants.
2. Fix typo in instance variable name.
3. Convert an instance variable to a local variable.
4. Use Java8 lambda for SummaryProviderFactory instance.
Test: make RunSettingsRoboTests -j40
Change-Id: I6cae055d6efd5e724bdd46e04b7077df610a72e9
2017-07-05 16:18:19 -07:00
Antony Sargent
c73c4b4055
Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496
...
am: 5438319677
Change-Id: I1595e3c80b731a4c7f86faa198f2cc6e7f05d710
2017-07-05 23:15:53 +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
2d1e8a736e
Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev am: 09229abbf2
...
am: 4fd8528c2f
Change-Id: Ie183a68e7ae944bad8a2ca3782522afd7f78b74f
2017-07-05 22:43:16 +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