Commit Graph

2303 Commits

Author SHA1 Message Date
TreeHugger Robot
50535da16d Merge "Add public intent filters to indexing" into oc-dr1-dev 2017-07-07 22:39:20 +00:00
TreeHugger Robot
db522a539d Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev 2017-07-07 21:12:58 +00:00
TreeHugger Robot
062dedb072 Merge "Create BatterySaverReceiver" into oc-dr1-dev 2017-07-07 19:31:47 +00:00
Antony Sargent
2efec86bae Get rid of spurious gear icon in BT details page
The problem is that we were calling done() on the EntityHeaderController
and passing false for whether to rebind the action buttons, which means
we were getting the default behavior including a visible gear
icon. Passing true to request rebinding causes that icon to be hidden.

Bug: 63405635
Test: make RunSettingsRoboTests
Change-Id: I031f4a2d176ff3be025cc2675d7026a679936b03
2017-07-07 11:31:43 -07:00
Ajay Kumar Nadathur Sreenivasan
9afa37ac3c Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev 2017-07-07 17:30:15 +00:00
jackqdyulei
aea085bc96 Create BatterySaverReceiver
This cl elicits BatterySaverReceiver that listen to the change about
battery state and battery saver state.

BatterySaverController and BatterySaverSettings will use this receiver
to update the UI.

Bug: 32410757
Test: RunSettingsRoboTests
Change-Id: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5
Merged-In: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5
2017-07-07 10:01:52 -07:00
TreeHugger Robot
690accadc7 Merge "Update Anomaly detection framework" into oc-dr1-dev 2017-07-07 02:13:37 +00:00
TreeHugger Robot
21423623bd Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev 2017-07-06 23:46:39 +00:00
Matthew Fritze
473b6b45de Add public intent filters to indexing
Adds a public intent action to the index so that intents
can be created for callers outside of settings.

Change-Id: I9f87263f213b6de40542e8735c931ee1f0d82094
Fixes: 63136008
Test: make RunSettingsRoboTests
2017-07-06 23:12:21 +00:00
jackqdyulei
bfc2b11b93 Update Anomaly detection framework
This cl make it could have multiple actions for each anomaly type.

This includes:
1. Add field "targetSdkVersion", "bgRestrictionEnabled" in Anomaly
2. Add new action which includes "force stop" and "background check"
3. Add "sdkVersion" and "bgRestrictionEnabled" method in BatteryUtils
4. Update BackgroundCheckAction to check sdkVersion first
5. Update serveral tests and add new test

Bug: 63037765
Test: RunSettingsRoboTests
Change-Id: Iea7a131ee57d501f7737ae4a3ba672d948d05cd8
2017-07-06 15:53:28 -07:00
TreeHugger Robot
55ad60d1ff Merge "Add util method to get battery stats" into oc-dr1-dev 2017-07-06 21:58:33 +00:00
Ajay Nadathur
3d9fffed16 Screen lock type metrics are not reported if user goes back
bug: 63116381
Test: Manually tested and verified that metrics are passed back to
setupwizard. Also added robolectric tests
Change-Id: I9d095754addc34121a2a0a12b3e5d1479ff15a78
2017-07-06 14:56:34 -07:00
Daniel Nishi
fa47cebd55 Merge "Update the Storage icons." into oc-dr1-dev 2017-07-06 21:50:49 +00:00
Antony Sargent
b6fc6e31a5 Add a confirmation dialog when forgetting BT device
This adds a confirmation dialog for when you hit the "Forget" button to
unpair with a device from the Bluetooth device details page.

Bug: 37955181
Test: make RunSettingsRoboTests
Change-Id: I7643ed09bf363c48078d6de8a47583bf91fc7729
2017-07-06 12:24:32 -07:00
Fan Zhang
2c6634a8a9 Fix a crash in AppInfoBase where appEntry is invalid
Change-Id: Ifbea967405ddc1e1bd069ddeab170bc67b1835b4
Fix: 63178369
Test: robotests
2017-07-06 17:56:47 +00:00
TreeHugger Robot
24ba2fbdb9 Merge "Check non-indexable keys for raw data" into oc-dr1-dev 2017-07-06 17:31:29 +00:00
Matthew Fritze
bdd57aad3e Check non-indexable keys for raw data
Change-Id: I182f6757cae0ccdd07c2c38ea0f02bd4998f79be
Fixes: 63360455
Test: make RunSettingsRoboTests
2017-07-06 08:15:42 -07:00
Alex Kulesza
32812e6121 Merge "Render enhanced battery projection curves." into oc-dr1-dev 2017-07-06 14:02:26 +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
Daniel Sheng
f8e0963f78 Merge "Added suggestions for gestures." into oc-dr1-dev 2017-07-06 03:19:57 +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
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
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
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
TreeHugger Robot
09229abbf2 Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev 2017-07-05 22:21:40 +00: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
TreeHugger Robot
96e774b7d7 Merge "Update the method about foreground time." into oc-dr1-dev 2017-07-05 20:38:52 +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
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
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
4e34839a1e Fix settings robotest
Change-Id: I0685b1f47ae286a4fdf78a57c21f7a656804754f
Fix: 63146944
Test: robotest
2017-06-30 01:27:20 +00:00
TreeHugger Robot
9638e020e5 Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev 2017-06-29 20:31:18 +00:00
TreeHugger Robot
5243d5dd85 Merge "Add account sync summary." into oc-dr1-dev 2017-06-29 18:58:58 +00:00
TreeHugger Robot
1498e86530 Merge "Change the type of "hours" from long to double" into oc-dr1-dev 2017-06-29 18:38:39 +00:00
Shunta Sato
22080a1df5 Fix Wi-Fi list adds same AP repeatedly
When switch AP security mode, several same APs are shown.

To fix this issue, append security type to preference
key for avoiding different APs have same key.
git fetch

Cherrypick of:
https://partner-android-review.googlesource.com/#/c/799829/

Bug: 37558394
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: I39621636f14b29e45ba96ff76dc3c21a4996a136
2017-06-28 20:21:46 -07:00
TreeHugger Robot
43afb664e6 Merge "Add metric action log for anomaly action" into oc-dr1-dev 2017-06-29 01:10:42 +00:00
TreeHugger Robot
9df70249b9 Merge "Change to use new suggestion/condition UI." into oc-dr1-dev 2017-06-29 01:04:58 +00:00
TreeHugger Robot
33c9b7a111 Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev 2017-06-29 00:43:09 +00:00
jackqdyulei
8213f102dc Change the type of "hours" from long to double
So we won't have the rounding issue here.

Bug: 63112264
Test: RunSettingsRoboTests
Change-Id: I85b3525781074294964a956dbe76f3b55f65704d
2017-06-28 16:20:34 -07:00
jackqdyulei
ac29684b14 Add metric action log for anomaly action
Change AnomalyAction to abstract class and log the action there.

Bug: 37681923
Test: RunSettingsRoboTests
Change-Id: Ied7a269d4a3f8fcb978165af6e17a9c9952fea49
2017-06-28 15:35:54 -07:00
TreeHugger Robot
e2e54e17c7 Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev 2017-06-28 20:44:13 +00:00
Doris Ling
e76550a66e Add account sync summary.
- Check for the number of sync adapter that is enabled for the account and
update the summary text for the account sync preference accordingly.
- Add divider above the Remove Account button.

Merged-In: Ic333f62cce9aed0a72771324976ebe3d8e586287
Change-Id: I003d6dd0a070bf123f178b8d9ba7b6657466b905
Fix: 62862167
Test: make RunSettingsRoboTests
2017-06-28 13:37:17 -07:00
TreeHugger Robot
e455c8f377 Merge "Add list-select as an inline result" into oc-dr1-dev 2017-06-28 20:27:00 +00:00
TreeHugger Robot
9a30ceab83 Merge "Hide the IDLE in "app list"" into oc-dr1-dev 2017-06-28 19:38:20 +00:00
jackqdyulei
85e25e34fd Fix the getForegroundActivityTotalTimeMs
The parameter in timer should be microseconds, not milliseconds

Bug: 63073847
Test: RunSettingsRoboTests
Change-Id: I5e451aee9eb30815fbefe12c0bfdc85dff884b8e
2017-06-28 12:33:20 -07:00
Doris Ling
b99af0e4a2 Change to use new suggestion/condition UI.
Change to always use the new UI that combines the suggestion and conditions,
and remove all codes relating to the old UI.

Fix: 37645754
Fix: 62621808
Test: make RunSettingsRoboTests

Merged-In: I3421a9e5182f6606843392d6fae8b9f07c5f2e46
Change-Id: I5ef169a563166520dad0ac44f6780da814e2f1f7
2017-06-28 12:22:34 -07:00
Matthew Fritze
98a9e42c93 Add synchronous indexing api to SearchFeatureProvider
- Opens the database indexing to be synchronous for the
external settings api.
- Adds logging to track synchronous and async indexing
times.

Bug: 62826872
Test: make RunSettingsRoboTests
Change-Id: I28b69f3952946c0ae5dd7ea7da66f7a5fd485637
2017-06-28 11:31:27 -07:00
Matthew Fritze
694088075e Add list-select as an inline result
Move the majority of the Setting set & get logic into
InlinePayload, but add formatting of input to each
concrete payload class.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: I08932871554beb4a04625f05f8555a5b3a887fe2
2017-06-28 11:21:55 -07:00