Daniel Nishi
b41f08ce10
Merge "Update the Storage icons." into oc-dr1-dev am: fa47cebd55
...
am: 5f27569478
Change-Id: Ibd5bf197507154c7c45b875ab46350c70b6f3ee8
2017-07-06 22:30:55 +00:00
TreeHugger Robot
e663befae4
Merge "App header cleanup"
2017-07-06 22:22:52 +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
Daniel Nishi
fa47cebd55
Merge "Update the Storage icons." into oc-dr1-dev
2017-07-06 21:50:49 +00:00
Rajeev Kumar
190ec88a6f
Merge "1. Fix the apostrophe escaping for few strings in Settings app 2. Fix few indentation issues in strings.xml file"
2017-07-06 21:29:26 +00:00
Fan Zhang
3903e15de2
Fix a crash in AppInfoBase where appEntry is invalid am: 2c6634a8a9
...
am: 4a1245e8c1
Change-Id: Ibf609a79a19fca98554b3ec60940163674125af9
2017-07-06 20:36:05 +00:00
Fan Zhang
75bee9bf98
App header cleanup
...
- Refactor the entity header layout to use LinearLayout and add id to
content area
- Remove now unused AppHeader class
- Make entire icon+text area clickable and link to app info page
Refactor the binding logic from bindButton to its own method.
- Remove unused MultiLinePreference
Fix: 62705377
Test: make RunSettingsRoboTests
Change-Id: I6db554695410e71b669f6fdba29d98fedc3364b9
2017-07-06 13:23:38 -07:00
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
Rajeev Kumar
88f5dd165d
1. Fix the apostrophe escaping for few strings in Settings app
...
2. Fix few indentation issues in strings.xml file
Test: Manually tested it.
Change-Id: I8f3e7c213614c26fc835b646289ce7fd01d5b626
2017-07-06 12:32:11 -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
Android Build Merger (Role)
dcf46a89cf
Merge "Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp am: 5fc76d5a89"
2017-07-06 17:31:17 +00:00
Android Build Merger (Role)
587eafe5d8
Merge "Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp am: 5fc76d5a89"
2017-07-06 17:31:02 +00:00
Daniel Nishi
9a3388a998
Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp
...
am: 5fc76d5a89
Change-Id: Iae43593a56ce435759739ce16769fcbc3940ced4
2017-07-06 17:29:49 +00:00
Daniel Nishi
59e68a47e1
Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp
...
am: 5fc76d5a89
Change-Id: Ief44b840ccc0d2c9fbc3b0771950f2dbc6aefbf1
2017-07-06 17:29:39 +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
Android Build Merger (Role)
363a3374b8
Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db
am: a223ee4890"
2017-07-06 17:29:11 +00:00
Daniel Nishi
43433c2df0
Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db
...
am: a223ee4890
Change-Id: Iab9d00ff5ae668aff8475c4134bab8caeac7e651
2017-07-06 17:27:16 +00: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
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
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
Android Build Merger (Role)
08da5d84c0
Merge "Merge "Render enhanced battery projection curves." into oc-dr1-dev am: 32812e6121
am: d69f7cddb6"
2017-07-06 14:11:12 +00:00
Alex Kulesza
f85fcb9fe5
Merge "Render enhanced battery projection curves." into oc-dr1-dev am: 32812e6121
...
am: d69f7cddb6
Change-Id: Ib9a4b036a4e94d5bdbb0abf7ae1f78f03120351e
2017-07-06 14:10:49 +00: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
Android Build Merger (Role)
3c5a53752a
Merge "Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf" into oc-dr1-dev-plus-aosp am: 27f1eedd19"
2017-07-06 06:40:46 +00:00
Lorenzo Colitti
92efc7b861
Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf" into oc-dr1-dev-plus-aosp
...
am: 27f1eedd19
Change-Id: Id63799878efd885b16319abc7d9290d10dcab7ea
2017-07-06 06:40:31 +00:00
Android Build Merger (Role)
3771b93597
Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf
am: 413d0ac41e"
2017-07-06 06:40:27 +00:00
Lorenzo Colitti
8919fc1a09
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf
...
am: 413d0ac41e
Change-Id: Ia521baee61838cde773c38e2fe0ee03954a62a20
2017-07-06 06:37:29 +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
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
c059710378
Removed camera lift gesture settings UI. am: 9a16e473ab
...
am: 89efcf0c0b
-s ours
Change-Id: I75ac1a917b9c198cde18cdc704c76c6723f59471
2017-07-06 05:41:17 +00:00
Daniel Sheng
89efcf0c0b
Removed camera lift gesture settings UI.
...
am: 9a16e473ab
Change-Id: I7fe06ff066878b725be5a8ac6132ee9fa9ff3a81
2017-07-06 05:39:34 +00:00
Daniel Sheng
720dd1ec61
Merge "Added suggestions for gestures." into oc-dr1-dev am: f8e0963f78
...
am: 34887c8355
-s ours
Change-Id: I691786771b1ba32d6b804534880e65559431c168
2017-07-06 03:37:56 +00:00
Android Build Merger (Role)
45877c9952
Merge "Merge "Bluetooth: Use string in remote device summary am: 04f5967c95" into oc-dr1-dev-plus-aosp am: 05be6e07d9"
2017-07-06 03:35:43 +00:00
Jack He
8c744c3ec0
Merge "Bluetooth: Use string in remote device summary am: 04f5967c95" into oc-dr1-dev-plus-aosp
...
am: 05be6e07d9
Change-Id: Ic6d5c86151c221bc1bc94a5f348c8cfabab6892c
2017-07-06 03:33:39 +00:00