Maurice Lam
540d92a7e9
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
2017-07-11 18:21:43 +00:00
Geoffrey Pitsch
57adc290d2
Disable lift-to-wake when always-on is checked
...
The setting has little to no meaning when AOD is on.
Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
2017-07-11 14:05:03 -04:00
jackqdyulei
4a2bbadcd4
Bind service in onCreate
...
This cl puts the binding to onCreate instead of constructor, so
preference controller won't bind/unbind service without registering
Lifecycle.
Bug: 62105045
Test: RunSettingsRoboTests
Change-Id: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
2017-07-11 10:52:06 -07:00
Doris Ling
a689787b71
Automatically play the gesture video when the setting is launched.
...
- and save the video pause state on config change so that the paused
video will not auto start again on screen rotation.
Change-Id: I3f41849ee3063942fb4141e4556e494bc8439226
Fix: 63145847
Test: make RunSettingsRoboTests
2017-07-11 10:38:24 -07:00
Rajeev Kumar
eaceb1906e
Add custom attributes to DonutView.
...
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: Manual
Change-Id: I50f304580f681dc1461fb82d84ce0fede21b4b87
2017-07-11 10:32:27 -07:00
TreeHugger Robot
70a48e66eb
Merge "Use a grey shade under progress spinner in wifi settings"
2017-07-11 17:24:43 +00:00
Daniel Nishi
8f345d7fd6
Expand ASM activation warning.
...
If the device had ASM enabled by default but still opted to disable ASM
for policy reasons, we need to start warning the user.
Change-Id: I6a296e95d00413308de3ddc565b42c5f605087e9
Fixes: 62105682
Test: Settings robotest
2017-07-11 09:51:14 -07:00
TreeHugger Robot
740405a044
Merge "Add special lock screen prompt strings for strong auth."
2017-07-11 12:04:38 +00:00
Charles He
4c96d9b203
Add special lock screen prompt strings for strong auth.
...
Due to incorrect strings, we temporarily disabled the prompt strings for
strong auth and instead used the generic ones as a short-term fix. In
this CL, we correct the strong auth prompt strings and add them back to
the lock screen UI. The new strings are in line with those in keyguard.
Bug: 36511626
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ifba689db37cc7d331eb1a774814f6b6235977ff9
2017-07-11 10:49:59 +01:00
Bill Yi
1af7dc740f
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 75bcd075f2 -s ours
...
am: 219086822c
2017-07-11 04:19:00 +00:00
Bill Yi
c183765a84
Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours am: a8d19dc2e4 -s ours
...
am: 4a11531ec7
2017-07-11 04:18:29 +00:00
Bill Yi
6cc94bf656
Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours am: 2865272522 -s ours
...
am: 81a9389ebd
2017-07-11 04:18:09 +00:00
Bill Yi
219086822c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 75bcd075f2
2017-07-11 04:11:37 +00:00
Bill Yi
4a11531ec7
Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours
...
am: a8d19dc2e4
2017-07-11 04:08:17 +00:00
Bill Yi
81a9389ebd
Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours
...
am: 2865272522
2017-07-11 04:03:04 +00:00
TreeHugger Robot
75bcd075f2
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-11 04:01:24 +00:00
Bill Yi
a8d19dc2e4
Import translations. DO NOT MERGE am: 7267438b58 -s ours
...
am: 750540ae48
2017-07-11 03:55:40 +00:00
Bill Yi
2865272522
Import translations. DO NOT MERGE am: 7267438b58 -s ours
...
am: 750540ae48
2017-07-11 03:55:18 +00:00
Bill Yi
750540ae48
Import translations. DO NOT MERGE
...
am: 7267438b58
2017-07-11 03:47:35 +00:00
Kevin Chyn
c10561bda2
Merge "Remove unnecessary keywords" into oc-dr1-dev am: 9cf03c3884
...
am: b5b7ef69bf
2017-07-11 03:37:34 +00:00
Bill Yi
3ad1659a9a
Merge "Import translations. DO NOT MERGE am: f812f94216 -s ours am: c45dd3f1ec -s ours" into oc-dr1-dev-plus-aosp
...
am: 51e0ed982c
2017-07-11 03:35:23 +00:00
Kevin Chyn
b5b7ef69bf
Merge "Remove unnecessary keywords" into oc-dr1-dev
...
am: 9cf03c3884
2017-07-11 03:35:06 +00:00
Bill Yi
734fa3e361
Import translations. DO NOT MERGE am: f812f94216 -s ours am: bc4faa93e2 -s ours
...
am: bf24c5db83
2017-07-11 03:35:05 +00:00
Android Build Merger (Role)
51e0ed982c
Merge "Import translations. DO NOT MERGE am: f812f94216 -s ours am: c45dd3f1ec -s ours" into oc-dr1-dev-plus-aosp
2017-07-11 03:32:54 +00:00
Bill Yi
5076e0747b
Import translations. DO NOT MERGE am: f812f94216 -s ours
...
am: c45dd3f1ec
2017-07-11 03:32:38 +00:00
Bill Yi
bf24c5db83
Import translations. DO NOT MERGE am: f812f94216 -s ours
...
am: bc4faa93e2
2017-07-11 03:32:33 +00:00
TreeHugger Robot
9cf03c3884
Merge "Remove unnecessary keywords" into oc-dr1-dev
2017-07-11 03:31:06 +00:00
Bill Yi
c45dd3f1ec
Import translations. DO NOT MERGE
...
am: f812f94216
2017-07-11 03:30:04 +00:00
Bill Yi
bc4faa93e2
Import translations. DO NOT MERGE
...
am: f812f94216
2017-07-11 03:30:02 +00:00
Kevin Chyn
dde95f663a
Remove unnecessary keywords
...
Fixes: 63544783
Test: make -j RunSettingsRoboTests && manual
Change-Id: I6f6cb8aff365174edb7cd22f18cbc1b7e7ba5b4a
2017-07-11 03:23:21 +00:00
Maurice Lam
62c0c3c324
Hide screen lock options button in confirm lock
...
Hide the screen lock options button in the confirmation stage of
SetupChooseLockPassword, so the user cannot skip out of that screen
while the screen lock is being saved.
Test: Manual
Bug: 63526104
Change-Id: I8ee8938f3ddcd9f0ff3b1812fcae667eddaf09ab
2017-07-10 18:15:10 -07:00
TreeHugger Robot
cd3e5bf6c8
Merge "Search cleanu-np: remove useless summary from some settings"
2017-07-11 00:25:50 +00:00
TreeHugger Robot
ce9e90a740
Merge "Entity header layout cleanup"
2017-07-11 00:21:41 +00:00
Bill Yi
7267438b58
Import translations. DO NOT MERGE
...
Change-Id: Ifbee1421f45d2cb6f3d5c533e5c4e9a2735afa10
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 17:16:10 -07:00
Ajay Nadathur
bd013f0099
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev am: 73ae54a63a
...
am: 6465041095
2017-07-11 00:08:51 +00:00
Ajay Nadathur
6465041095
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
...
am: 73ae54a63a
2017-07-11 00:05:53 +00:00
TreeHugger Robot
73ae54a63a
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
2017-07-11 00:00:08 +00:00
Bill Yi
f812f94216
Import translations. DO NOT MERGE
...
Change-Id: Ifb8d0e63a8150656a55bb1b2adf5748c75a10224
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 16:49:52 -07:00
Matthew Fritze
1e099ee60a
Merge "Add location as a Inline list payload" into oc-dr1-dev am: 9e2984b035
...
am: a57c59bbba
2017-07-10 23:35:21 +00:00
Matthew Fritze
a57c59bbba
Merge "Add location as a Inline list payload" into oc-dr1-dev
...
am: 9e2984b035
2017-07-10 23:32:11 +00:00
Bill Yi
85550c537b
Import translations. DO NOT MERGE
...
Change-Id: I827ed97b3afd80dd3e834b3cf686c6b1d4a65d25
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 16:23:41 -07:00
TreeHugger Robot
9e2984b035
Merge "Add location as a Inline list payload" into oc-dr1-dev
2017-07-10 23:23:13 +00:00
Rajeev Kumar
58878fcb33
Merge "Get rid of unused IconPreferenceScreen"
2017-07-10 23:11:54 +00:00
Fan Zhang
1befb49813
Search cleanu-np: remove useless summary from some settings
...
Change-Id: Ie5c953f594bf1d364c0aa1a99f9363756ac5802f
Fix: 63014636
Test: robotests
2017-07-10 15:36:58 -07:00
Fan Zhang
64cac99448
Entity header layout cleanup
...
Change-Id: I866231e3a6cb506e3aa1c03f2cbead1049270999
Fix: 63339943
Test: visual
2017-07-10 15:13:17 -07:00
Fan Zhang
f559395603
Use preference theme from SettingsLib
...
Bug: 36663882
Test: rerun robotests
Change-Id: I9f0f51a9d070191f5bf8f3315fef4d997d6213c3
2017-07-10 14:56:49 -07:00
Fan Zhang
62a3220efb
Use a grey shade under progress spinner in wifi settings
...
Change-Id: I1c3fa3a05fe66924989607d73e77ca2616a898e6
Fix: 62545533
Test: visual
2017-07-10 14:46:29 -07:00
Rajeev Kumar
5c279e4bce
Merge "Recycle TypedArray in FixedLineSummaryPreference"
2017-07-10 21:41:41 +00:00
Fan Zhang
7a56184063
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev am: 5d3f6d566b
...
am: 16afefd509
2017-07-10 21:36:10 +00:00
Fan Zhang
16afefd509
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
...
am: 5d3f6d566b
2017-07-10 21:31:39 +00:00
