OSDN Git Service
jackqdyulei [Fri, 7 Jul 2017 03:01:16 +0000 (03:01 +0000)]
Merge "Update Anomaly detection framework" into oc-dr1-dev
am:
690accadc7
Change-Id: Idefefd2703b8b885cc6aa68665d629d04092d5d9
Andrew Sapperstein [Fri, 7 Jul 2017 03:00:49 +0000 (03:00 +0000)]
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
am:
4545d636ec
Change-Id: I49fcb529e64cd1d66c85bc42f67514559140467b
Doris Ling [Fri, 7 Jul 2017 02:59:44 +0000 (02:59 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev
am:
c2002db8cc
Change-Id: Ia99dd8d0d9ae926d4fe09c7911c4bc10e60e397d
TreeHugger Robot [Fri, 7 Jul 2017 02:38:10 +0000 (02:38 +0000)]
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev
am:
4fffc20ada
Change-Id: I2e0672e71b69f35cbc0f98d9cebeebf1a6dc1af7
Antony Sargent [Fri, 7 Jul 2017 02:35:24 +0000 (02:35 +0000)]
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev
am:
21423623bd
Change-Id: I9f819e3f4bf0f785f9a42592a9a37955df8e8103
TreeHugger Robot [Fri, 7 Jul 2017 02:13:37 +0000 (02:13 +0000)]
Merge "Update Anomaly detection framework" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 02:02:51 +0000 (02:02 +0000)]
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 01:26:48 +0000 (01:26 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 23:50:28 +0000 (23:50 +0000)]
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 23:46:39 +0000 (23:46 +0000)]
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev
jackqdyulei [Thu, 29 Jun 2017 21:20:46 +0000 (14:20 -0700)]
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
Android Build Merger (Role) [Thu, 6 Jul 2017 22:12:03 +0000 (22:12 +0000)]
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am:
8218511fb7" into oc-dr1-dev-plus-aosp
Maurice Lam [Thu, 6 Jul 2017 22:11:52 +0000 (22:11 +0000)]
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
am:
8218511fb7
Change-Id: I48b40d6158f4ebeaaaef6b8d2baf72bf8edf226a
Android Build Merger (Role) [Thu, 6 Jul 2017 22:11:44 +0000 (22:11 +0000)]
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp
Matthew Fritze [Thu, 6 Jul 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
am:
55ad60d1ff
Change-Id: I6aa6178f142bcf0bb67957c459d86ec0618c7bd0
Matthew Fritze [Thu, 6 Jul 2017 22:11:04 +0000 (22:11 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
am:
55ad60d1ff
Change-Id: I02308e6829fbc1a3764efb8a09dfc9d576428775
Daniel Nishi [Thu, 6 Jul 2017 22:10:37 +0000 (22:10 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev
am:
e78190d124
Change-Id: I21af42927fa117c68a4979285213361a3c70fa56
Daniel Nishi [Thu, 6 Jul 2017 22:10:18 +0000 (22:10 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev
am:
fa47cebd55
Change-Id: I2a393ea0aa4274c23cf9c75fdc655d7436d695d3
TreeHugger Robot [Thu, 6 Jul 2017 22:08:51 +0000 (22:08 +0000)]
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 21:58:33 +0000 (21:58 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 21:58:01 +0000 (21:58 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 21:50:49 +0000 (21:50 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev
Andrew Sapperstein [Thu, 6 Jul 2017 21:30:28 +0000 (14:30 -0700)]
Use config_headlineFontFamily for password screens.
These screens are used whenever setting or confirming the
lockscreen PIN or password. Set them to a consistent textSize (24sp)
and a consistent fontFamily.
Would have set the fontFamily in the style, but unfortunately
setInputType is called on the TextViews after inflation which blows
away the fontFamily. Instead, we set it in code right after that
call.
Change-Id: I77c3f94e2b1ce6d1f19697394c5caa09aac423b0
Fixes:
62873478
Test: manual
Fan Zhang [Thu, 6 Jul 2017 19:58:06 +0000 (19:58 +0000)]
Fix a crash in AppInfoBase where appEntry is invalid
am:
2c6634a8a9
Change-Id: I6a3bc29c8a1863b320bfe3f07a40f85ddeb676fd
Antony Sargent [Fri, 30 Jun 2017 22:23:01 +0000 (15:23 -0700)]
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
Fan Zhang [Wed, 5 Jul 2017 23:12:00 +0000 (16:12 -0700)]
Fix a crash in AppInfoBase where appEntry is invalid
Change-Id: Ifbea967405ddc1e1bd069ddeab170bc67b1835b4
Fix:
63178369
Test: robotests
Matthew Fritze [Thu, 6 Jul 2017 17:37:46 +0000 (17:37 +0000)]
Merge "Check non-indexable keys for raw data" into oc-dr1-dev
am:
24ba2fbdb9
Change-Id: Iab0cb32e75fabda8e2c411391d0693107fa9d2ed
TreeHugger Robot [Thu, 6 Jul 2017 17:31:29 +0000 (17:31 +0000)]
Merge "Check non-indexable keys for raw data" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 17:18:56 +0000 (17:18 +0000)]
Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp
Daniel Nishi [Thu, 6 Jul 2017 17:17:27 +0000 (17:17 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev
am:
947cb367db
Change-Id: Ia5e4650eb1922e59ee1e95b04df7377668f0538a
Daniel Nishi [Thu, 6 Jul 2017 17:15:40 +0000 (17:15 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev
am:
947cb367db
Change-Id: I3923a04104b949281e487b0b8fc5a55601536e93
Daniel Nishi [Thu, 6 Jul 2017 17:04:53 +0000 (17:04 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev
Matthew Fritze [Thu, 6 Jul 2017 01:15:43 +0000 (18:15 -0700)]
Check non-indexable keys for raw data
Change-Id: I182f6757cae0ccdd07c2c38ea0f02bd4998f79be
Fixes:
63360455
Test: make RunSettingsRoboTests
Alex Kulesza [Thu, 6 Jul 2017 14:07:47 +0000 (14:07 +0000)]
Merge "Render enhanced battery projection curves." into oc-dr1-dev
am:
32812e6121
Change-Id: I9ad8579fd76516b2c3ab89571b20ac2b28a2d161
Alex Kulesza [Thu, 6 Jul 2017 14:02:26 +0000 (14:02 +0000)]
Merge "Render enhanced battery projection curves." into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 06:33:29 +0000 (06:33 +0000)]
Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am:
dcc15eabdf" into oc-dr1-dev-plus-aosp
Lorenzo Colitti [Thu, 6 Jul 2017 06:30:32 +0000 (06:30 +0000)]
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
am:
dcc15eabdf
Change-Id: I3e5eb9cbcd7cdee2f0ee28579fc8f9d707b8e471
Lorenzo Colitti [Thu, 6 Jul 2017 06:30:31 +0000 (06:30 +0000)]
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
am:
dcc15eabdf
Change-Id: I28e2de31fafa533e35655a2d5f2ec9b1e3554eee
TreeHugger Robot [Thu, 6 Jul 2017 06:13:55 +0000 (06:13 +0000)]
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
Daniel Sheng [Thu, 6 Jul 2017 05:39:34 +0000 (05:39 +0000)]
Removed camera lift gesture settings UI.
am:
9a16e473ab
Change-Id: I7fe06ff066878b725be5a8ac6132ee9fa9ff3a81
TreeHugger Robot [Mon, 19 Jun 2017 23:21:12 +0000 (23:21 +0000)]
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
Daniel Sheng [Thu, 6 Jul 2017 03:30:33 +0000 (03:30 +0000)]
Merge "Added suggestions for gestures." into oc-dr1-dev
am:
f8e0963f78
Change-Id: If48fd6cbbc1e8a90afd12da39df8752c4ff301f4
Android Build Merger (Role) [Thu, 6 Jul 2017 03:27:09 +0000 (03:27 +0000)]
Merge "Bluetooth: Use string in remote device summary am:
04f5967c95" into oc-dr1-dev-plus-aosp
Jack He [Thu, 6 Jul 2017 03:25:08 +0000 (03:25 +0000)]
Bluetooth: Use string in remote device summary
am:
04f5967c95
Change-Id: Idc084b72529a7408edf3ed7cb74496851e65d053
Daniel Sheng [Fri, 30 Jun 2017 20:14:57 +0000 (13:14 -0700)]
Removed camera lift gesture settings UI.
Bug:
37154489
Test: make + manual + unit tests
Change-Id: Ifefa07d0e8e0de19d78303352c6f0e01dc1c52ab
Merged-In: I79e70dea12a65fefcb06aca3fd1891a95d856626
Jack He [Thu, 6 Jul 2017 03:23:43 +0000 (03:23 +0000)]
Bluetooth: Use string in remote device summary
am:
04f5967c95
Change-Id: Ib8673c03e6875d4661015f9fa0eb25b658090ad2
Daniel Sheng [Thu, 6 Jul 2017 03:19:57 +0000 (03:19 +0000)]
Merge "Added suggestions for gestures." into oc-dr1-dev
Lorenzo Colitti [Tue, 4 Jul 2017 15:29:44 +0000 (00:29 +0900)]
Add a developer offload for tethering hardware acceleration.
Bug:
32163131
Test: builds
Change-Id: Icca7bbd2bdd572b1328e7d0fecb663405b115fe1
Alex Kulesza [Thu, 6 Jul 2017 01:24:46 +0000 (01:24 +0000)]
Make utility methods static.
am:
43d4fefb36
Change-Id: If15b946499c572a693712607bc818d143875290f
Jack He [Wed, 28 Jun 2017 19:08:55 +0000 (12:08 -0700)]
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
Daniel Sheng [Thu, 8 Jun 2017 16:24:30 +0000 (09:24 -0700)]
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
Android Build Merger (Role) [Wed, 5 Jul 2017 22:58:57 +0000 (22:58 +0000)]
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am:
6d50576496" into oc-dr1-dev-plus-aosp
Antony Sargent [Wed, 5 Jul 2017 22:56:11 +0000 (22:56 +0000)]
Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev
am:
6d50576496
Change-Id: I91cedada5ebd6c77378d918b90440aca50f000a5
Alex Kulesza [Thu, 29 Jun 2017 16:26:59 +0000 (12:26 -0400)]
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
Antony Sargent [Wed, 5 Jul 2017 22:55:51 +0000 (22:55 +0000)]
Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev
am:
6d50576496
Change-Id: Ib35f0e2f74055b7c119f9fd9775c7299a6cc9e29
Alex Kulesza [Wed, 5 Jul 2017 21:43:11 +0000 (17:43 -0400)]
Make utility methods static.
BatteryUtils.convertUsToMs and .convertMsToUs should be static, and now
they are.
Bug:
63347148
Test: make RunSettingsRoboTests
Change-Id: If652e2d3e1260df9a933805d7da670fbb26b2c25
Antony Sargent [Wed, 5 Jul 2017 22:49:04 +0000 (22:49 +0000)]
Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev
Sundeep Ghuman [Wed, 5 Jul 2017 22:30:22 +0000 (22:30 +0000)]
Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev
am:
09229abbf2
Change-Id: I7a636c40515b24b7376b8ceadf969a257b2dc8d9
TreeHugger Robot [Wed, 5 Jul 2017 22:21:40 +0000 (22:21 +0000)]
Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev
Daniel Nishi [Thu, 29 Jun 2017 19:30:26 +0000 (12:30 -0700)]
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
Matthew Fritze [Fri, 23 Jun 2017 01:47:38 +0000 (18:47 -0700)]
Add util method to get battery stats
Bug:
62271803
Test: make RunSettingsRoboTests
Change-Id: I91089c24c7cd5f7329be052c50859e049e70e9b1
Daniel Nishi [Wed, 28 Jun 2017 21:41:18 +0000 (14:41 -0700)]
Update the Storage icons.
Change-Id: I10648df80566629c09d03211ed642516595e4b22
Fixes:
62548249
Test: Manual
Android Build Merger (Role) [Wed, 5 Jul 2017 20:42:57 +0000 (20:42 +0000)]
Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am:
37caf9c7da" into oc-dr1-dev-plus-aosp
Daniel Nishi [Wed, 5 Jul 2017 20:42:44 +0000 (20:42 +0000)]
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
am:
37caf9c7da
Change-Id: I97bb447b0b2ce106bc87914bc2b10df6b7632a4c
Daniel Nishi [Wed, 5 Jul 2017 20:42:29 +0000 (20:42 +0000)]
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
am:
37caf9c7da
Change-Id: Ib2f37664e42035e72c0980ac3dc209e47585f95f
jackqdyulei [Wed, 5 Jul 2017 20:42:10 +0000 (20:42 +0000)]
Merge "Update the method about foreground time." into oc-dr1-dev
am:
96e774b7d7
Change-Id: I4037f224cf5028abe5617775d394adfed1552b27
Daniel Nishi [Wed, 5 Jul 2017 20:40:41 +0000 (20:40 +0000)]
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 20:38:52 +0000 (20:38 +0000)]
Merge "Update the method about foreground time." into oc-dr1-dev
jackqdyulei [Wed, 5 Jul 2017 20:24:58 +0000 (20:24 +0000)]
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
am:
3a9734261d
Change-Id: I03c108b9a4712205906125ea12114e4ed6659255
TreeHugger Robot [Wed, 5 Jul 2017 20:21:46 +0000 (20:21 +0000)]
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
Sundeep Ghuman [Thu, 29 Jun 2017 02:07:02 +0000 (19:07 -0700)]
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
Daniel Nishi [Mon, 26 Jun 2017 20:42:36 +0000 (13:42 -0700)]
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
Charles He [Mon, 3 Jul 2017 15:34:45 +0000 (15:34 +0000)]
Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev
am:
c619ad77bb
Change-Id: I6d4e95b63896365308c8acaa07699d53560d64b4
Charles He [Mon, 3 Jul 2017 15:32:09 +0000 (15:32 +0000)]
Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev
Charles He [Mon, 3 Jul 2017 08:42:20 +0000 (09:42 +0100)]
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
Android Build Merger (Role) [Sat, 1 Jul 2017 16:10:18 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE am:
126ce95bc6 -s ours am:
07a57fc90b -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Sat, 1 Jul 2017 16:09:54 +0000 (16:09 +0000)]
Import translations. DO NOT MERGE am:
126ce95bc6 -s ours
am:
07a57fc90b -s ours
Change-Id: Ifbfb5d7e768115a0b2366d15c489da2b34d57ad4
Bill Yi [Sat, 1 Jul 2017 16:09:53 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
aaeb09e6c7 -s ours
Change-Id: I2d839b0eae979a4a5c655427f57575006b9f0694
Bill Yi [Sat, 1 Jul 2017 16:09:34 +0000 (16:09 +0000)]
Import translations. DO NOT MERGE am:
126ce95bc6 -s ours
am:
2626c36d29 -s ours
Change-Id: Ia3d459b682083ce6b7897439748a2630a143e90e
TreeHugger Robot [Sat, 1 Jul 2017 16:06:05 +0000 (16:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 1 Jul 2017 16:05:02 +0000 (16:05 +0000)]
Import translations. DO NOT MERGE
am:
126ce95bc6 -s ours
Change-Id: I99cf4ac7ff9a9ae62df014c790a7af691e670cbc
Bill Yi [Sat, 1 Jul 2017 16:05:02 +0000 (16:05 +0000)]
Import translations. DO NOT MERGE
am:
126ce95bc6 -s ours
Change-Id: Iaa93cedcdc1089409ee0d01bad5edd932acbbcbb
Kevin Chyn [Sat, 1 Jul 2017 03:06:52 +0000 (03:06 +0000)]
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
am:
72a94e9f5a
Change-Id: I7748c0537a6eebb1fd460b3039a9a53dc070e19e
TreeHugger Robot [Sat, 1 Jul 2017 02:59:19 +0000 (02:59 +0000)]
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
Bill Yi [Sat, 1 Jul 2017 01:07:52 +0000 (18:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id991a5f419ccb85d8e25a5111b717a84e4de6184
Auto-generated-cl: translation import
Bill Yi [Sat, 1 Jul 2017 01:02:00 +0000 (18:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I67181f9f767d7edccf78f901ad70e903b123649f
Auto-generated-cl: translation import
Fan Zhang [Sat, 1 Jul 2017 00:45:13 +0000 (00:45 +0000)]
Change permission preference to only 1 line summary
am:
32a8568230
Change-Id: I5f4cb35694767adc62d5f094e481d1423a85c93b
Antony Sargent [Thu, 29 Jun 2017 22:32:12 +0000 (15:32 -0700)]
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
Kevin Chyn [Fri, 30 Jun 2017 23:27:49 +0000 (16:27 -0700)]
Assist gesture setting should not be available on unsupported devices
Fixes:
63176246
Test: manual
Change-Id: I17cd338eafd2e1a86d1e82d81bc9817eaf18d57b
jackqdyulei [Fri, 30 Jun 2017 17:18:34 +0000 (10:18 -0700)]
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
Fan Zhang [Fri, 30 Jun 2017 22:28:19 +0000 (15:28 -0700)]
Change permission preference to only 1 line summary
Test: visual
Change-Id: I0e397c096eac19d312c5632cd7f0a1856c199b96
Fix:
36413664
Salvador Martinez [Fri, 30 Jun 2017 22:05:53 +0000 (22:05 +0000)]
Merge "Add BatteryInfo logging to settings" into oc-dr1-dev
am:
9a3b115cc8
Change-Id: I447d0d7689f77b12a0caf9374155883217ff330a
Daniel Nishi [Fri, 30 Jun 2017 22:05:33 +0000 (22:05 +0000)]
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
am:
7809c3d2f0
Change-Id: I8eddca071d602cedcdcdbd5f65f5dd5265a084a8
TreeHugger Robot [Fri, 30 Jun 2017 21:58:38 +0000 (21:58 +0000)]
Merge "Add BatteryInfo logging to settings" into oc-dr1-dev
Daniel Nishi [Fri, 30 Jun 2017 21:54:38 +0000 (21:54 +0000)]
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
Doris Ling [Fri, 30 Jun 2017 20:59:16 +0000 (13:59 -0700)]
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
Jason Monk [Fri, 30 Jun 2017 19:43:00 +0000 (19:43 +0000)]
Allow clicking on guest user
am:
c1cc9fefa8
Change-Id: I828716ff982cd2f8bedc96b74c1abc44716cc753
jackqdyulei [Fri, 30 Jun 2017 18:11:16 +0000 (11:11 -0700)]
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
Jason Monk [Fri, 30 Jun 2017 15:29:40 +0000 (11:29 -0400)]
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
Fan Zhang [Fri, 30 Jun 2017 03:49:57 +0000 (03:49 +0000)]
Fix settings robotest
am:
4e34839a1e
Change-Id: I46d6dd639b779f993bc2088608a52165139967fb
OSDN Git Service
