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
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
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
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
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
2017-07-06 05:41:17 +00:00
Daniel Sheng
89efcf0c0b
Removed camera lift gesture settings UI.
...
am: 9a16e473ab
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
720dd1ec61
Merge "Added suggestions for gestures." into oc-dr1-dev am: f8e0963f78
...
am: 34887c8355
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
2017-07-06 03:33:39 +00:00
Android Build Merger (Role)
1134302080
Merge "Bluetooth: Use string in remote device summary am: 04f5967c95 am: d79f6af9ae"
2017-07-06 03:32:52 +00:00
Jack He
8e9add2ff1
Bluetooth: Use string in remote device summary am: 04f5967c95
...
am: d79f6af9ae
2017-07-06 03:30:51 +00:00
Daniel Sheng
34887c8355
Merge "Added suggestions for gestures." into oc-dr1-dev
...
am: f8e0963f78
2017-07-06 03:30:33 +00:00
Jack He
bbe2cf45ac
Bluetooth: Use string in remote device summary am: 04f5967c95
...
am: d79f6af9ae
2017-07-06 03:29:58 +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
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
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
Android Build Merger (Role)
3d4ffb1deb
Merge "Make utility methods static. am: 43d4fefb36 am: cc56b1aa04"
2017-07-06 01:36:55 +00:00
Alex Kulesza
049e81e918
Make utility methods static. am: 43d4fefb36
...
am: cc56b1aa04
2017-07-06 01:36:38 +00:00
Alex Kulesza
f30915e860
Make utility methods static. am: 43d4fefb36
...
am: cc56b1aa04
2017-07-06 01:36:33 +00:00
Alex Kulesza
cc56b1aa04
Make utility methods static.
...
am: 43d4fefb36
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)
614671fcbe
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"
2017-07-05 23:27:03 +00:00
Android Build Merger (Role)
9f251fcf7d
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"
2017-07-05 23:25:53 +00:00
Antony Sargent
92b1bd153f
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496" into oc-dr1-dev-plus-aosp
...
am: 6f48e921c4
2017-07-05 23:24:46 +00:00
Antony Sargent
7032fc1785
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496" into oc-dr1-dev-plus-aosp
...
am: 6f48e921c4
2017-07-05 23:23:38 +00:00
Android Build Merger (Role)
0c60182f86
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496 am: 5438319677"
2017-07-05 23:23:25 +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
Antony Sargent
3a7c32e2e8
Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496
...
am: 5438319677
2017-07-05 23:19:22 +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
2017-07-05 23:15:53 +00: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
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
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
