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
Jack He
8e9add2ff1
Bluetooth: Use string in remote device summary am: 04f5967c95
...
am: d79f6af9ae
2017-07-06 03:30:51 +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
Jack He
d79f6af9ae
Bluetooth: Use string in remote device summary
...
am: 04f5967c95
2017-07-06 03:23:43 +00: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
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
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
Sundeep Ghuman
2d1e8a736e
Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev am: 09229abbf2
...
am: 4fd8528c2f
2017-07-05 22:43:16 +00:00
Sundeep Ghuman
4fd8528c2f
Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev
...
am: 09229abbf2
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
TreeHugger Robot
bc4044ee7b
Merge "Ensure that brightness level is within 0-100%."
2017-07-05 21:47:12 +00:00
Rajeev Kumar
a414ef872f
Merge "Create a feature provider for data plan feature. This change will allow us to enable/disable this feature from adb shell."
2017-07-05 21:33:23 +00:00
Fan Zhang
e6b7bc6f15
Fix alignment for build number preference in RTL.
...
- Fixed by adding BidiFormatter.unicodeWrap around the whole string.
Change-Id: I3ca1292d912062db8c2fead524cd84a19eb80cff
Fix: 63135900
Test: make RunSettingsRoboTests
2017-07-05 14:20:08 -07:00
TreeHugger Robot
ff45106b49
Merge "Adjust UX for toggles when active scorer is not set."
2017-07-05 21:19:58 +00:00
Android Build Merger (Role)
f612e41f7d
Merge "Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp am: 5daad21245"
2017-07-05 20:45:22 +00:00
Daniel Nishi
9e3b0ad50a
Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp
...
am: 5daad21245
2017-07-05 20:45:07 +00:00
Android Build Merger (Role)
6c3bdb2ca2
Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da am: d7685ec8c8"
2017-07-05 20:45:01 +00:00
Daniel Nishi
cb66524cdf
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da
...
am: d7685ec8c8
2017-07-05 20:44:43 +00:00
Daniel Nishi
e2e4c1276a
Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp
...
am: 5daad21245
2017-07-05 20:44:42 +00:00
Daniel Nishi
ac4c095f3e
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da
...
am: d7685ec8c8
2017-07-05 20:44:22 +00:00
jackqdyulei
e0fa4afc71
Merge "Update the method about foreground time." into oc-dr1-dev am: 96e774b7d7
...
am: b067dea683
2017-07-05 20:43:58 +00: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
2017-07-05 20:42:44 +00:00
Daniel Nishi
d7685ec8c8
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
...
am: 37caf9c7da
2017-07-05 20:42:29 +00:00
jackqdyulei
b067dea683
Merge "Update the method about foreground time." into oc-dr1-dev
...
am: 96e774b7d7
2017-07-05 20:42:10 +00:00
Daniel Nishi
37caf9c7da
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
2017-07-05 20:40:41 +00:00
TreeHugger Robot
96e774b7d7
Merge "Update the method about foreground time." into oc-dr1-dev
2017-07-05 20:38:52 +00:00
