Lorenzo Colitti
11c2ea3a96
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
...
am: dcc15eabdf
2017-07-06 06:30:32 +00:00
TreeHugger Robot
dcc15eabdf
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
2017-07-06 06:13:55 +00:00
Daniel Sheng
89efcf0c0b
Removed camera lift gesture settings UI.
...
am: 9a16e473ab
2017-07-06 05:39:34 +00:00
Daniel Sheng
34887c8355
Merge "Added suggestions for gestures." into oc-dr1-dev
...
am: f8e0963f78
2017-07-06 03:30:33 +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
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
Jack He
d79f6af9ae
Bluetooth: Use string in remote device summary
...
am: 04f5967c95
2017-07-06 03:23:43 +00:00
Daniel Sheng
f8e0963f78
Merge "Added suggestions for gestures." into oc-dr1-dev
2017-07-06 03:19:57 +00:00
Lorenzo Colitti
03c4a7401e
Add a developer offload for tethering hardware acceleration.
...
Bug: 32163131
Test: builds
Change-Id: Icca7bbd2bdd572b1328e7d0fecb663405b115fe1
2017-07-06 12:13:11 +09: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
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
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
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
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
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
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
Charles He
3ae7bacff4
Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev
...
am: c619ad77bb
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
2017-07-01 16:09:54 +00:00
Bill Yi
8aa5c204f6
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: aaeb09e6c7
2017-07-01 16:09:53 +00:00
Bill Yi
44a5f4cece
Import translations. DO NOT MERGE am: 126ce95bc6 -s ours
...
am: 2626c36d29
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
2017-07-01 16:05:02 +00:00
Bill Yi
2626c36d29
Import translations. DO NOT MERGE
...
am: 126ce95bc6
2017-07-01 16:05:02 +00:00
Kevin Chyn
408efb26f0
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
...
am: 72a94e9f5a
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
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
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
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
2017-06-30 22:05:33 +00:00
