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
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
Daniel Nishi
209bea5580
Shrink the music icon.
...
The icons on the ManageApplications screen are 42dp by default. By
pushing a big inset, we can shrink it to be appropriate.
Change-Id: Iadf9f9f708c7469f42559f88626789127f865543
Fixes: 62548746
Test: Manual
2017-07-05 14:57:12 -07:00
Matthew Fritze
bfe82cab89
Add util method to get battery stats
...
Bug:62271803
Test: make RunSettingsRoboTests
Change-Id: I91089c24c7cd5f7329be052c50859e049e70e9b1
2017-07-05 14:54:20 -07:00
TreeHugger Robot
bc4044ee7b
Merge "Ensure that brightness level is within 0-100%."
2017-07-05 21:47:12 +00:00
Daniel Nishi
2872e2c6cc
Update the Storage icons.
...
Change-Id: I10648df80566629c09d03211ed642516595e4b22
Fixes: 62548249
Test: Manual
2017-07-05 14:41:12 -07: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
Android Build Merger (Role)
95cc1f6829
Merge "Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d am: 593049c1d4"
2017-07-05 20:30:51 +00:00
jackqdyulei
2a6abb5e80
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d
...
am: 593049c1d4
2017-07-05 20:27:29 +00:00
jackqdyulei
6a4f234ec0
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d
...
am: 593049c1d4
2017-07-05 20:26:39 +00:00
jackqdyulei
593049c1d4
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
...
am: 3a9734261d
2017-07-05 20:24:58 +00:00
TreeHugger Robot
3a9734261d
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
2017-07-05 20:21:46 +00:00
Soroosh Mariooryad
55bb0c258d
Log async ranking state in Settings search ranking
...
Bug: 62072727
Test: RunSettingsRoboTests
Change-Id: I2140c41d01f18a1e4b9e3f505e0afa4a8757d049
2017-07-05 13:04:22 -07:00
Sundeep Ghuman
d569195299
Use EntityHeaderController in WifiDetailPreferenceController.
...
Switch to the Entity header to bring parity in design of
WifiNetworkDetailsFragment and other Settings pages.
Bug: b/37252029
Test: make -j40 RunSettingsRoboTests
Change-Id: Ib11f3d37eac4dca08fa61eef67910cd328682bac
2017-07-05 12:54:38 -07:00
