Commit Graph

38168 Commits

Author SHA1 Message Date
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

Change-Id: Ib35f0e2f74055b7c119f9fd9775c7299a6cc9e29
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
4fd8528c2f Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev
am: 09229abbf2

Change-Id: I7a636c40515b24b7376b8ceadf969a257b2dc8d9
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
Daniel Nishi
2872e2c6cc Update the Storage icons.
Change-Id: I10648df80566629c09d03211ed642516595e4b22
Fixes: 62548249
Test: Manual
2017-07-05 14:41:12 -07: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

Change-Id: I97bb447b0b2ce106bc87914bc2b10df6b7632a4c
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

Change-Id: Ib2f37664e42035e72c0980ac3dc209e47585f95f
2017-07-05 20:42:29 +00:00
jackqdyulei
b067dea683 Merge "Update the method about foreground time." into oc-dr1-dev
am: 96e774b7d7

Change-Id: I4037f224cf5028abe5617775d394adfed1552b27
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
jackqdyulei
593049c1d4 Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
am: 3a9734261d

Change-Id: I03c108b9a4712205906125ea12114e4ed6659255
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
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
Daniel Nishi
5d272ce4ff Unify storage calculations.
Due to one calculation using longs and the other using doubles, there
were situations where the percentage was off-by-one between the two
places.

By changing both places to now use doubles to calculate percentages, the
numbers should be unified.

Change-Id: I4f4ed19326562e198273adc60a1593c7d1a6b6a7
Fixes: 37923610
Test: Manual
2017-07-05 10:10:15 -07:00
Charles He
3ae7bacff4 Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev
am: c619ad77bb

Change-Id: I6d4e95b63896365308c8acaa07699d53560d64b4
2017-07-03 15:34:45 +00:00
Charles He
c619ad77bb Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev 2017-07-03 15:32:09 +00:00
Charles He
701ac5cbee Disable incorrect strong auth prompt strings.
The prompt strings on the confirm credentials screen (pin, password,
pattern) are incorrect. They currently say strong auth is "required
after device restarts". But instead they should be "required for
additional security" because strong auth can be enforced not only after
device or profile restarts, but also after profile key eviction, for
example.

Unfortunately, we've already missed the window for string changes.
Therefore, as an alternative, we use generic prompt strings in this CL,
to avoid conveying the incorrect (and misleading) information. We'll
follow up with another CL in master with a proper string change to fix
the issue.

Bug: 36511626
Test: manual
Test: make SettingsRoboTests
Change-Id: I44f84420b88bb4933ad0afa6e8032af465de0cd3
2017-07-03 09:42:20 +01:00
Android Build Merger (Role)
a659760862 Merge "Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 07a57fc90b -s ours" into oc-dr1-dev-plus-aosp 2017-07-01 16:10:18 +00:00
Bill Yi
6532f4c129 Import translations. DO NOT MERGE am: 126ce95bc6 -s ours
am: 07a57fc90b  -s ours

Change-Id: Ifbfb5d7e768115a0b2366d15c489da2b34d57ad4
2017-07-01 16:09:54 +00:00
Bill Yi
8aa5c204f6 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: aaeb09e6c7  -s ours

Change-Id: I2d839b0eae979a4a5c655427f57575006b9f0694
2017-07-01 16:09:53 +00:00
Bill Yi
44a5f4cece Import translations. DO NOT MERGE am: 126ce95bc6 -s ours
am: 2626c36d29  -s ours

Change-Id: Ia3d459b682083ce6b7897439748a2630a143e90e
2017-07-01 16:09:34 +00:00
TreeHugger Robot
aaeb09e6c7 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-01 16:06:05 +00:00
Bill Yi
07a57fc90b Import translations. DO NOT MERGE
am: 126ce95bc6  -s ours

Change-Id: I99cf4ac7ff9a9ae62df014c790a7af691e670cbc
2017-07-01 16:05:02 +00:00
Bill Yi
2626c36d29 Import translations. DO NOT MERGE
am: 126ce95bc6  -s ours

Change-Id: Iaa93cedcdc1089409ee0d01bad5edd932acbbcbb
2017-07-01 16:05:02 +00:00
Kevin Chyn
8b2304f232 Fix Assist Gesture settings check
Fixes: 63181412

Test: manual
Change-Id: Ie51cc4bb62c68722e4613850bfdb4dc67ae15e77
2017-06-30 22:41:56 -07:00
Kevin Chyn
408efb26f0 Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
am: 72a94e9f5a

Change-Id: I7748c0537a6eebb1fd460b3039a9a53dc070e19e
2017-07-01 03:06:52 +00:00
TreeHugger Robot
72a94e9f5a Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev 2017-07-01 02:59:19 +00:00
Bill Yi
126ce95bc6 Import translations. DO NOT MERGE
Change-Id: Id991a5f419ccb85d8e25a5111b717a84e4de6184
Auto-generated-cl: translation import
2017-06-30 18:07:52 -07:00
Jeff Davidson
4ba7478fdf Don't show "Wipe eSIMs" checkbox for developers.
Per UX review feedback, it doesn't make sense to show this just
because someone has developer options turned on. So only show it if
the user has ever downloaded an eSIM profile.

Change-Id: If474451dddcaa75bce1e57ce2f1751ef3adf45ee
Test: TreeHugger
Fixes: 63147904
2017-07-01 01:06:19 +00:00
Bill Yi
7df73c0524 Import translations. DO NOT MERGE
Change-Id: I67181f9f767d7edccf78f901ad70e903b123649f
Auto-generated-cl: translation import
2017-06-30 18:02:00 -07:00
Fan Zhang
33a91c5004 Change permission preference to only 1 line summary
am: 32a8568230

Change-Id: I5f4cb35694767adc62d5f094e481d1423a85c93b
2017-07-01 00:45:13 +00:00
Antony Sargent
1b6e7d76ed Fix Bluetooth device details crash on screen rotation
We were getting the following exception when you rotated the Bluetooth
device details screen:

java.lang.RuntimeException: Unable to start activity
ComponentInfo{com.android.settings/com.android.settings.SubSettings}:
java.lang.IllegalStateException: This Activity already has an action bar
supplied by the window decor. Do not request Window.FEATURE_ACTION_BAR
and set android:windowActionBar to false in your theme to use a Toolbar
instead.

It turns out that allowing EntityHeaderController to inflate the
settings_entity_header.xml view seems to cause this - if you instead
manually include a LayoutPreference and hand that to
EntityHeaderController, you don't have the problem.

The rotation failure couldn't be tested with Robolectric because our
version doesn't support using FragmentTestUtil.startFragment for
fragments which use PreferenceScreen's ("sorry, not yet
implemented"). So instead this includes an app test.

Bug: 62447414
Test: runtest --path=BluetoothDeviceDetailsRotationTest.java
Change-Id: I8d052d1f4ab6e2b0ca5c0e513ec366bdcc382d99
2017-06-30 16:34:40 -07:00
Kevin Chyn
1db30b7749 Assist gesture setting should not be available on unsupported devices
Fixes: 63176246

Test: manual
Change-Id: I17cd338eafd2e1a86d1e82d81bc9817eaf18d57b
2017-06-30 16:27:49 -07:00
jackqdyulei
43cbee6914 Update the method about foreground time.
For now it uses MIN(STATE_TOP_TIME, FOREGROUND_ACTIVITY_TIME) and this
method is used in both display and screen smearing.

Bug: 63080621
Test: RunSettingsRoboTests
Change-Id: I2ca3109697aa66fae67d8b2f4f10c4d08bb99d59
2017-06-30 16:18:29 -07:00
Fan Zhang
32a8568230 Change permission preference to only 1 line summary
Test: visual
Change-Id: I0e397c096eac19d312c5632cd7f0a1856c199b96
Fix: 36413664
2017-06-30 22:29:27 +00:00
Salvador Martinez
97642af54d Merge "Add BatteryInfo logging to settings" into oc-dr1-dev
am: 9a3b115cc8

Change-Id: I447d0d7689f77b12a0caf9374155883217ff330a
2017-06-30 22:05:53 +00:00
Daniel Nishi
0c48b5a29d Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
am: 7809c3d2f0

Change-Id: I8eddca071d602cedcdcdbd5f65f5dd5265a084a8
2017-06-30 22:05:33 +00:00
TreeHugger Robot
9a3b115cc8 Merge "Add BatteryInfo logging to settings" into oc-dr1-dev 2017-06-30 21:58:38 +00:00
Daniel Nishi
7809c3d2f0 Merge "Use normal layout for "Space Used" header." into oc-dr1-dev 2017-06-30 21:54:38 +00:00
Doris Ling
e7e971d2ed Update the gesture video container background color.
The new sets of gesture video has slight different background color,
updating the background of the container to better match that.

Bug: 62517696
Test: Visual
Change-Id: I95cfb8c4c50706b7ce28c778453c5ee115d5ed08
2017-06-30 13:59:16 -07:00
Jason Monk
bc4df21ef7 Allow clicking on guest user
am: c1cc9fefa8

Change-Id: I828716ff982cd2f8bedc96b74c1abc44716cc753
2017-06-30 19:43:00 +00:00
jackqdyulei
a66363a787 Make items in Advanced battery page unclickable.
Because these items only display info and have no click action:
1. foreground time item
2. background time item
3. battery usage item

Bug: 62423725
Test: Build
Change-Id: I8d15be13953c73fce4d5f42711e186673673a036
2017-06-30 11:11:16 -07:00
Jason Monk
c1cc9fefa8 Allow clicking on guest user
This is needed since the user switch will be hidden by default in
QS and will show up once multi-user has been activated in some way.

Test: click on guest
Bug: 37152893
Change-Id: I351a5d95e9e8a5e47e388d9f0611924b077754da
2017-06-30 11:29:40 -04:00
Fan Zhang
517daf43a4 Fix settings robotest
am: 4e34839a1e

Change-Id: I46d6dd639b779f993bc2088608a52165139967fb
2017-06-30 03:49:57 +00:00
Fan Zhang
4e34839a1e Fix settings robotest
Change-Id: I0685b1f47ae286a4fdf78a57c21f7a656804754f
Fix: 63146944
Test: robotest
2017-06-30 01:27:20 +00:00