OSDN Git Service
Rajeev Kumar [Fri, 7 Jul 2017 00:19:50 +0000 (17:19 -0700)]
Some import cleanups.
1. Get rid of unused import.
2. Fix import order.
Change-Id: I278949d95242682fd277adc2c71bc892e58a8533
Android Build Merger (Role) [Thu, 6 Jul 2017 22:34:15 +0000 (22:34 +0000)]
Merge "Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am:
8218511fb7" into oc-dr1-dev-plus-aosp am:
7e410cc787"
Maurice Lam [Thu, 6 Jul 2017 22:33:59 +0000 (22:33 +0000)]
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am:
8218511fb7" into oc-dr1-dev-plus-aosp
am:
7e410cc787
Change-Id: Icec778e5dc5095ebeea441b75cc41a662f70cb32
Android Build Merger (Role) [Thu, 6 Jul 2017 22:33:51 +0000 (22:33 +0000)]
Merge "Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp am:
66037a6ae6"
Maurice Lam [Thu, 6 Jul 2017 22:33:30 +0000 (22:33 +0000)]
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am:
8218511fb7" into oc-dr1-dev-plus-aosp
am:
7e410cc787
Change-Id: Id5d5f187d588708394144eaf02004c584c97dbac
Matthew Fritze [Thu, 6 Jul 2017 22:33:16 +0000 (22:33 +0000)]
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp
am:
66037a6ae6
Change-Id: Ifeaeaf53a18932fcaa417fd97b69bf317e109a7b
Matthew Fritze [Thu, 6 Jul 2017 22:32:42 +0000 (22:32 +0000)]
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp
am:
66037a6ae6
Change-Id: I0319d997e7f7953b7aa757b217ff792ebcc19f2e
Matthew Fritze [Thu, 6 Jul 2017 22:32:01 +0000 (22:32 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff
am:
3b32306c54
Change-Id: Ibd2fc5828da10cfdc1356dcb19aa25c36565e1aa
Daniel Nishi [Thu, 6 Jul 2017 22:31:34 +0000 (22:31 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev am:
e78190d124
am:
a22ecac2f9
Change-Id: Ic5787c194d73c8de47f554f506c7601df00d55de
Daniel Nishi [Thu, 6 Jul 2017 22:30:55 +0000 (22:30 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev am:
fa47cebd55
am:
5f27569478
Change-Id: Ibd5bf197507154c7c45b875ab46350c70b6f3ee8
TreeHugger Robot [Thu, 6 Jul 2017 22:22:52 +0000 (22:22 +0000)]
Merge "App header cleanup"
Android Build Merger (Role) [Thu, 6 Jul 2017 22:12:03 +0000 (22:12 +0000)]
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am:
8218511fb7" into oc-dr1-dev-plus-aosp
Maurice Lam [Thu, 6 Jul 2017 22:11:52 +0000 (22:11 +0000)]
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
am:
8218511fb7
Change-Id: I48b40d6158f4ebeaaaef6b8d2baf72bf8edf226a
Android Build Merger (Role) [Thu, 6 Jul 2017 22:11:44 +0000 (22:11 +0000)]
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp
Matthew Fritze [Thu, 6 Jul 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
am:
55ad60d1ff
Change-Id: I6aa6178f142bcf0bb67957c459d86ec0618c7bd0
Matthew Fritze [Thu, 6 Jul 2017 22:11:04 +0000 (22:11 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
am:
55ad60d1ff
Change-Id: I02308e6829fbc1a3764efb8a09dfc9d576428775
Daniel Nishi [Thu, 6 Jul 2017 22:10:37 +0000 (22:10 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev
am:
e78190d124
Change-Id: I21af42927fa117c68a4979285213361a3c70fa56
Daniel Nishi [Thu, 6 Jul 2017 22:10:18 +0000 (22:10 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev
am:
fa47cebd55
Change-Id: I2a393ea0aa4274c23cf9c75fdc655d7436d695d3
TreeHugger Robot [Thu, 6 Jul 2017 22:08:51 +0000 (22:08 +0000)]
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 21:58:33 +0000 (21:58 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 21:58:01 +0000 (21:58 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 21:50:49 +0000 (21:50 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev
Rajeev Kumar [Thu, 6 Jul 2017 21:29:26 +0000 (21:29 +0000)]
Merge "1. Fix the apostrophe escaping for few strings in Settings app 2. Fix few indentation issues in strings.xml file"
Fan Zhang [Thu, 6 Jul 2017 20:36:05 +0000 (20:36 +0000)]
Fix a crash in AppInfoBase where appEntry is invalid am:
2c6634a8a9
am:
4a1245e8c1
Change-Id: Ibf609a79a19fca98554b3ec60940163674125af9
Fan Zhang [Fri, 30 Jun 2017 20:14:02 +0000 (13:14 -0700)]
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
Phil Weaver [Thu, 6 Jul 2017 20:07:33 +0000 (20:07 +0000)]
Merge "Migrate to new overlay-stopping flag"
Fan Zhang [Thu, 6 Jul 2017 19:58:06 +0000 (19:58 +0000)]
Fix a crash in AppInfoBase where appEntry is invalid
am:
2c6634a8a9
Change-Id: I6a3bc29c8a1863b320bfe3f07a40f85ddeb676fd
TreeHugger Robot [Thu, 6 Jul 2017 19:33:53 +0000 (19:33 +0000)]
Merge "Change storage migration to use quota APIs."
Rajeev Kumar [Thu, 6 Jul 2017 19:22:34 +0000 (12:22 -0700)]
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
TreeHugger Robot [Thu, 6 Jul 2017 18:54:43 +0000 (18:54 +0000)]
Merge "Fix race condition and optimize categoryUpdater refresh"
Fan Zhang [Wed, 5 Jul 2017 23:12:00 +0000 (16:12 -0700)]
Fix a crash in AppInfoBase where appEntry is invalid
Change-Id: Ifbea967405ddc1e1bd069ddeab170bc67b1835b4
Fix:
63178369
Test: robotests
Matthew Fritze [Thu, 6 Jul 2017 17:39:25 +0000 (17:39 +0000)]
Merge "Check non-indexable keys for raw data" into oc-dr1-dev am:
24ba2fbdb9
am:
dc2005eb6a
Change-Id: Ibcefe758e9524ae810234212ac83d385bd03d09e
Matthew Fritze [Thu, 6 Jul 2017 17:37:46 +0000 (17:37 +0000)]
Merge "Check non-indexable keys for raw data" into oc-dr1-dev
am:
24ba2fbdb9
Change-Id: Iab0cb32e75fabda8e2c411391d0693107fa9d2ed
TreeHugger Robot [Thu, 6 Jul 2017 17:31:29 +0000 (17:31 +0000)]
Merge "Check non-indexable keys for raw data" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 17:31:17 +0000 (17:31 +0000)]
Merge "Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp am:
5fc76d5a89"
Android Build Merger (Role) [Thu, 6 Jul 2017 17:31:02 +0000 (17:31 +0000)]
Merge "Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp am:
5fc76d5a89"
Daniel Nishi [Thu, 6 Jul 2017 17:29:49 +0000 (17:29 +0000)]
Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp
am:
5fc76d5a89
Change-Id: Iae43593a56ce435759739ce16769fcbc3940ced4
Daniel Nishi [Thu, 6 Jul 2017 17:29:39 +0000 (17:29 +0000)]
Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp
am:
5fc76d5a89
Change-Id: Ief44b840ccc0d2c9fbc3b0771950f2dbc6aefbf1
Jeff Sharkey [Thu, 6 Jul 2017 17:29:24 +0000 (11:29 -0600)]
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
Android Build Merger (Role) [Thu, 6 Jul 2017 17:29:11 +0000 (17:29 +0000)]
Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db am:
a223ee4890"
Daniel Nishi [Thu, 6 Jul 2017 17:27:16 +0000 (17:27 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db
am:
a223ee4890
Change-Id: Iab9d00ff5ae668aff8475c4134bab8caeac7e651
Daniel Nishi [Thu, 6 Jul 2017 17:27:05 +0000 (17:27 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db
am:
a223ee4890
Change-Id: I4a4dbe87c52a2c53abd2489143d9183c72d2c4cf
Android Build Merger (Role) [Thu, 6 Jul 2017 17:18:56 +0000 (17:18 +0000)]
Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp
Daniel Nishi [Thu, 6 Jul 2017 17:17:27 +0000 (17:17 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev
am:
947cb367db
Change-Id: Ia5e4650eb1922e59ee1e95b04df7377668f0538a
Daniel Nishi [Thu, 6 Jul 2017 17:15:40 +0000 (17:15 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev
am:
947cb367db
Change-Id: I3923a04104b949281e487b0b8fc5a55601536e93
Fan Zhang [Wed, 5 Jul 2017 20:46:04 +0000 (13:46 -0700)]
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
Daniel Nishi [Thu, 6 Jul 2017 17:04:53 +0000 (17:04 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev
Matthew Fritze [Thu, 6 Jul 2017 01:15:43 +0000 (18:15 -0700)]
Check non-indexable keys for raw data
Change-Id: I182f6757cae0ccdd07c2c38ea0f02bd4998f79be
Fixes:
63360455
Test: make RunSettingsRoboTests
Android Build Merger (Role) [Thu, 6 Jul 2017 14:11:12 +0000 (14:11 +0000)]
Merge "Merge "Render enhanced battery projection curves." into oc-dr1-dev am:
32812e6121 am:
d69f7cddb6"
Alex Kulesza [Thu, 6 Jul 2017 14:10:49 +0000 (14:10 +0000)]
Merge "Render enhanced battery projection curves." into oc-dr1-dev am:
32812e6121
am:
d69f7cddb6
Change-Id: Ib9a4b036a4e94d5bdbb0abf7ae1f78f03120351e
Alex Kulesza [Thu, 6 Jul 2017 14:10:06 +0000 (14:10 +0000)]
Merge "Render enhanced battery projection curves." into oc-dr1-dev am:
32812e6121
am:
d69f7cddb6
Change-Id: Id226cd9d3c2ea5bbbbc1dcedfbd273938ac477ef
Alex Kulesza [Thu, 6 Jul 2017 14:07:47 +0000 (14:07 +0000)]
Merge "Render enhanced battery projection curves." into oc-dr1-dev
am:
32812e6121
Change-Id: I9ad8579fd76516b2c3ab89571b20ac2b28a2d161
Alex Kulesza [Thu, 6 Jul 2017 14:02:26 +0000 (14:02 +0000)]
Merge "Render enhanced battery projection curves." into oc-dr1-dev
Philipp Weiß [Thu, 6 Jul 2017 08:08:43 +0000 (08:08 +0000)]
Merge "When Remove Account is disallowed, show dialog"
Android Build Merger (Role) [Thu, 6 Jul 2017 06:40:46 +0000 (06:40 +0000)]
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"
Lorenzo Colitti [Thu, 6 Jul 2017 06:40:31 +0000 (06:40 +0000)]
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
Android Build Merger (Role) [Thu, 6 Jul 2017 06:40:27 +0000 (06:40 +0000)]
Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am:
dcc15eabdf am:
413d0ac41e"
Lorenzo Colitti [Thu, 6 Jul 2017 06:37:29 +0000 (06:37 +0000)]
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am:
dcc15eabdf
am:
413d0ac41e
Change-Id: Ia521baee61838cde773c38e2fe0ee03954a62a20
Lorenzo Colitti [Thu, 6 Jul 2017 06:36:46 +0000 (06:36 +0000)]
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am:
dcc15eabdf
am:
413d0ac41e
Change-Id: I1521f1a914b7d8514d9eb976f56d5b856caa2a83
Android Build Merger (Role) [Thu, 6 Jul 2017 06:33:29 +0000 (06:33 +0000)]
Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am:
dcc15eabdf" into oc-dr1-dev-plus-aosp
Lorenzo Colitti [Thu, 6 Jul 2017 06:30:32 +0000 (06:30 +0000)]
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
am:
dcc15eabdf
Change-Id: I3e5eb9cbcd7cdee2f0ee28579fc8f9d707b8e471
Lorenzo Colitti [Thu, 6 Jul 2017 06:30:31 +0000 (06:30 +0000)]
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
am:
dcc15eabdf
Change-Id: I28e2de31fafa533e35655a2d5f2ec9b1e3554eee
TreeHugger Robot [Thu, 6 Jul 2017 06:13:55 +0000 (06:13 +0000)]
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
Daniel Sheng [Thu, 6 Jul 2017 05:41:17 +0000 (05:41 +0000)]
Removed camera lift gesture settings UI. am:
9a16e473ab
am:
89efcf0c0b -s ours
Change-Id: I75ac1a917b9c198cde18cdc704c76c6723f59471
Daniel Sheng [Thu, 6 Jul 2017 05:39:34 +0000 (05:39 +0000)]
Removed camera lift gesture settings UI.
am:
9a16e473ab
Change-Id: I7fe06ff066878b725be5a8ac6132ee9fa9ff3a81
Daniel Sheng [Thu, 6 Jul 2017 03:37:56 +0000 (03:37 +0000)]
Merge "Added suggestions for gestures." into oc-dr1-dev am:
f8e0963f78
am:
34887c8355 -s ours
Change-Id: I691786771b1ba32d6b804534880e65559431c168
Android Build Merger (Role) [Thu, 6 Jul 2017 03:35:43 +0000 (03:35 +0000)]
Merge "Merge "Bluetooth: Use string in remote device summary am:
04f5967c95" into oc-dr1-dev-plus-aosp am:
05be6e07d9"
Jack He [Thu, 6 Jul 2017 03:33:39 +0000 (03:33 +0000)]
Merge "Bluetooth: Use string in remote device summary am:
04f5967c95" into oc-dr1-dev-plus-aosp
am:
05be6e07d9
Change-Id: Ic6d5c86151c221bc1bc94a5f348c8cfabab6892c
Android Build Merger (Role) [Thu, 6 Jul 2017 03:32:52 +0000 (03:32 +0000)]
Merge "Bluetooth: Use string in remote device summary am:
04f5967c95 am:
d79f6af9ae"
Jack He [Thu, 6 Jul 2017 03:30:51 +0000 (03:30 +0000)]
Bluetooth: Use string in remote device summary am:
04f5967c95
am:
d79f6af9ae
Change-Id: I27ee59e2213ab069466c92e26493222ebd865b66
Daniel Sheng [Thu, 6 Jul 2017 03:30:33 +0000 (03:30 +0000)]
Merge "Added suggestions for gestures." into oc-dr1-dev
am:
f8e0963f78
Change-Id: If48fd6cbbc1e8a90afd12da39df8752c4ff301f4
Jack He [Thu, 6 Jul 2017 03:29:58 +0000 (03:29 +0000)]
Bluetooth: Use string in remote device summary am:
04f5967c95
am:
d79f6af9ae
Change-Id: If95cf2c89469d5b9220e3f2741e8c7f9288b655a
Android Build Merger (Role) [Thu, 6 Jul 2017 03:27:09 +0000 (03:27 +0000)]
Merge "Bluetooth: Use string in remote device summary am:
04f5967c95" into oc-dr1-dev-plus-aosp
Jack He [Thu, 6 Jul 2017 03:25:08 +0000 (03:25 +0000)]
Bluetooth: Use string in remote device summary
am:
04f5967c95
Change-Id: Idc084b72529a7408edf3ed7cb74496851e65d053
Daniel Sheng [Fri, 30 Jun 2017 20:14:57 +0000 (13:14 -0700)]
Removed camera lift gesture settings UI.
Bug:
37154489
Test: make + manual + unit tests
Change-Id: Ifefa07d0e8e0de19d78303352c6f0e01dc1c52ab
Merged-In: I79e70dea12a65fefcb06aca3fd1891a95d856626
Jack He [Thu, 6 Jul 2017 03:23:43 +0000 (03:23 +0000)]
Bluetooth: Use string in remote device summary
am:
04f5967c95
Change-Id: Ib8673c03e6875d4661015f9fa0eb25b658090ad2
Daniel Sheng [Thu, 6 Jul 2017 03:19:57 +0000 (03:19 +0000)]
Merge "Added suggestions for gestures." into oc-dr1-dev
Lorenzo Colitti [Tue, 4 Jul 2017 15:29:44 +0000 (00:29 +0900)]
Add a developer offload for tethering hardware acceleration.
Bug:
32163131
Test: builds
Change-Id: Icca7bbd2bdd572b1328e7d0fecb663405b115fe1
Daniel Sheng [Thu, 6 Jul 2017 02:56:12 +0000 (02:56 +0000)]
Merge "Removed camera lift gesture settings UI."
TreeHugger Robot [Thu, 6 Jul 2017 02:02:16 +0000 (02:02 +0000)]
Merge "Follow framework change."
Android Build Merger (Role) [Thu, 6 Jul 2017 01:36:55 +0000 (01:36 +0000)]
Merge "Make utility methods static. am:
43d4fefb36 am:
cc56b1aa04"
Alex Kulesza [Thu, 6 Jul 2017 01:36:38 +0000 (01:36 +0000)]
Make utility methods static. am:
43d4fefb36
am:
cc56b1aa04
Change-Id: Iab792e2213736194cbdccbb680830fc3444e9bbb
Alex Kulesza [Thu, 6 Jul 2017 01:36:33 +0000 (01:36 +0000)]
Make utility methods static. am:
43d4fefb36
am:
cc56b1aa04
Change-Id: Ia1ebdff4fcd82f829e90f76bf7d49b0adbc8febc
Alex Kulesza [Thu, 6 Jul 2017 01:24:46 +0000 (01:24 +0000)]
Make utility methods static.
am:
43d4fefb36
Change-Id: If15b946499c572a693712607bc818d143875290f
Jack He [Wed, 28 Jun 2017 19:08:55 +0000 (12:08 -0700)]
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
Rajeev Kumar [Thu, 6 Jul 2017 01:20:45 +0000 (01:20 +0000)]
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."
Daniel Sheng [Thu, 6 Jul 2017 00:11:13 +0000 (17:11 -0700)]
Removed camera lift gesture settings UI.
Bug:
37154489
Test: make + manual + unit tests
Change-Id: I79e70dea12a65fefcb06aca3fd1891a95d856626
Daniel Sheng [Thu, 8 Jun 2017 16:24:30 +0000 (09:24 -0700)]
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
Daniel Sheng [Thu, 6 Jul 2017 00:34:06 +0000 (00:34 +0000)]
Merge "Added suggestions for gestures."
Android Build Merger (Role) [Wed, 5 Jul 2017 23:27:03 +0000 (23:27 +0000)]
Merge "Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am:
6d50576496" into oc-dr1-dev-plus-aosp am:
6f48e921c4"
Android Build Merger (Role) [Wed, 5 Jul 2017 23:25:53 +0000 (23:25 +0000)]
Merge "Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am:
6d50576496" into oc-dr1-dev-plus-aosp am:
6f48e921c4"
Antony Sargent [Wed, 5 Jul 2017 23:24:46 +0000 (23:24 +0000)]
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am:
6d50576496" into oc-dr1-dev-plus-aosp
am:
6f48e921c4
Change-Id: Ibae0621c69a11cc60eb820647a605c7cf8b34e95
Antony Sargent [Wed, 5 Jul 2017 23:23:38 +0000 (23:23 +0000)]
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am:
6d50576496" into oc-dr1-dev-plus-aosp
am:
6f48e921c4
Change-Id: I70d80655f53bc50d083ff6a165a472ca7b438f76
Android Build Merger (Role) [Wed, 5 Jul 2017 23:23:25 +0000 (23:23 +0000)]
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am:
6d50576496 am:
5438319677"
Android Build Merger (Role) [Wed, 5 Jul 2017 23:21:57 +0000 (23:21 +0000)]
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am:
6d50576496 am:
5438319677"
TreeHugger Robot [Wed, 5 Jul 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Fix alignment for build number preference in RTL."
Antony Sargent [Wed, 5 Jul 2017 23:19:22 +0000 (23:19 +0000)]
Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am:
6d50576496
am:
5438319677
Change-Id: I48ebcc0d625950afe4242d8a442f0f3bf1b2a58b
Rajeev Kumar [Wed, 5 Jul 2017 22:29:11 +0000 (15:29 -0700)]
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
Antony Sargent [Wed, 5 Jul 2017 23:15:53 +0000 (23:15 +0000)]
Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am:
6d50576496
am:
5438319677
Change-Id: I1595e3c80b731a4c7f86faa198f2cc6e7f05d710
Android Build Merger (Role) [Wed, 5 Jul 2017 22:58:57 +0000 (22:58 +0000)]
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am:
6d50576496" into oc-dr1-dev-plus-aosp
OSDN Git Service
