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
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
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
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
TreeHugger Robot
bc4044ee7b
Merge "Ensure that brightness level is within 0-100%."
2017-07-05 21:47:12 +00: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
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
Doris Ling
c7d2d270ab
Ensure that brightness level is within 0-100%.
...
Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.
Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix: 63181935
Test: make RunSettingsRoboTests
2017-07-05 12:53:04 -07:00
Stephen Chen
7e27006a7b
Adjust UX for toggles when active scorer is not set.
...
This change fixes two issues: when wakeup is not available, update the
number of items to show above the fold in wifi preferences. When scorer
is not set, grey out wakeup toggle and set summary to reflect the
status.
Bug: 62410973
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
2017-07-05 12:29:06 -07:00
Rajeev Kumar
ad157aca52
Create a feature provider for data plan feature. This change will
...
allow us to enable/disable this feature from adb shell.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
Change-Id: I2d0bed738d5d4cd0fe1de056ee37092d46be72b6
2017-07-05 12:25:53 -07:00
TreeHugger Robot
f0398e1294
Merge "Add an activity that starts DataUsageList fragment for mobile."
2017-07-05 17:40:13 +00:00
Charles He
d5612408af
Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev am: c619ad77bb
...
am: 3ae7bacff4
2017-07-03 15:38:13 +00: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
Bill Yi
10b7b9e943
Merge "Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 07a57fc90b -s ours" into oc-dr1-dev-plus-aosp
...
am: a659760862
2017-07-01 16:15:40 +00:00
Bill Yi
9ce196f540
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: aaeb09e6c7 -s ours
...
am: 8aa5c204f6
2017-07-01 16:15:17 +00:00
Bill Yi
a177e243e8
Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 2626c36d29 -s ours
...
am: 44a5f4cece
2017-07-01 16:14:53 +00:00
