Commit Graph

38210 Commits

Author SHA1 Message Date
jackqdyulei
07fffc3877 Remove obsolete bluetooth pages
1. Remove BluetoothSettingsObsolete
2. Remove DeviceListPreferenceObsoleteFragment
3. Update master swtich, now constantly point to new page
4. Update the tests

Future cl will remove the page switch API in BluetoothFeatureProvider

Bug: 63444548
Test: Test still pass
Change-Id: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
Merged-In: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
2017-07-11 15:01:59 -07:00
Fan Zhang
af6fce6335 Use pref controller to get non-indexable in network setting
Change-Id: I2bcc9047146f4ad014d5929e66ee895ee497b641
Fix: 62555826
Test: robotests
2017-07-11 14:58:38 -07:00
Jack He
549d864bbf Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev am: 86fd147ac6
am: 99eab3d5f9

Change-Id: I7c78e818010bb513dd2ac1d65baa00f4159073b1
2017-07-11 21:26:09 +00:00
Jack He
99eab3d5f9 Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
am: 86fd147ac6

Change-Id: Ib56a1d03e9e74632137117802a5baab3870947bb
2017-07-11 21:22:40 +00:00
TreeHugger Robot
86fd147ac6 Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev 2017-07-11 21:16:32 +00:00
Stephen Chen
80b65d4328 Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev am: 89fdea9807
am: e549e732bd  -s ours

Change-Id: Ia63966016655faa3e113003ac04ddd4bf3386bf8
2017-07-11 20:30:38 +00:00
Stephen Chen
e549e732bd Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
am: 89fdea9807

Change-Id: Iddc9c6e474847f2aa54a0f695d34201a84596985
2017-07-11 20:27:39 +00:00
TreeHugger Robot
89fdea9807 Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev 2017-07-11 20:21:01 +00:00
jackqdyulei
50b0daee90 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
Merged-In: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
2017-07-11 13:17:38 -07:00
Kevin Chyn
599d4b93f3 Assist gesture title should not be translated, remove unused strings
Bug: 63441962

Test: manual && make -j RunSettingsRoboTests
Change-Id: I8b50ad378828f30f31dbfd648c9fac62af5d9da7
2017-07-11 13:17:37 -07:00
TreeHugger Robot
38d02fb900 Merge "Bind service in onCreate" 2017-07-11 20:15:08 +00:00
jackqdyulei
88a9e4cc19 Remove obsolete bluetooth pages
1. Remove BluetoothSettingsObsolete
2. Remove DeviceListPreferenceObsoleteFragment
3. Update master swtich, now constantly point to new page
4. Update the tests

Future cl will remove the page switch API in BluetoothFeatureProvider

Bug: 63444548
Test: Test still pass
Change-Id: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
2017-07-11 13:12:17 -07:00
Daniel Nishi
6dd03f6d8e Merge "Expand ASM activation warning." into oc-dr1-dev am: 64acb2906c
am: 4961451a4e

Change-Id: I992843e238acc4720c1fd5ade1cb4a66936ecb9c
2017-07-11 20:00:20 +00:00
Daniel Nishi
4961451a4e Merge "Expand ASM activation warning." into oc-dr1-dev
am: 64acb2906c

Change-Id: I980227fd99274364a7160a0e896b9518c2de1dd0
2017-07-11 19:56:41 +00:00
Daniel Nishi
64acb2906c Merge "Expand ASM activation warning." into oc-dr1-dev 2017-07-11 19:46:19 +00:00
Fan Zhang
a30c941361 Merge "Use preference theme from SettingsLib" 2017-07-11 19:20:59 +00:00
Jack He
a4503c5b8b Bluetooth: mLocalAdapter should never be null
* mLocalAdapter should never be null
* We should crash if it is ever null

Bug: 63442969
Test: make, pair Bluetooth device
Change-Id: If98f9ea0762927eb57d00224b62abf24bbec69ba
2017-07-11 12:04:01 -07:00
Rajeev Kumar
ff3834f4d4 Merge "Add custom attributes to DonutView." 2017-07-11 19:02:17 +00:00
Maurice Lam
ac4a473e72 Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev am: 540d92a7e9
am: ace9759446

Change-Id: Ib134acb1856b83eacd1c1d57e7e7215961d5ec6d
2017-07-11 18:31:30 +00:00
Maurice Lam
ace9759446 Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
am: 540d92a7e9

Change-Id: I63b9b138b1918d066a85d19c5f91221acdd3e083
2017-07-11 18:27:30 +00:00
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  -s ours

Change-Id: Icc709fda2de3c0a740cb0e492f7e7fd78b32cbe0
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  -s ours

Change-Id: I9cdbcf32e517361752d0b5868671f8cc0df2fc15
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  -s ours

Change-Id: Id15b3a7b0175943e4c0a83af64643d7bc611c09c
2017-07-11 04:18:09 +00:00
Bill Yi
219086822c Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 75bcd075f2  -s ours

Change-Id: Ic3bdba9d8575e66c4e94229380e3225881244013
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  -s ours

Change-Id: I86658e992835680c75c69cd869acb314d5b93c3e
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  -s ours

Change-Id: I0b8b30eda46b1997915adf4ee3921657bdb477a5
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  -s ours

Change-Id: Ie4b8baffb9d82f30bef5251893124152a66f8f1c
2017-07-11 03:55:40 +00:00
Bill Yi
2865272522 Import translations. DO NOT MERGE am: 7267438b58 -s ours
am: 750540ae48  -s ours

Change-Id: If2ede8c90fef89686c2ea93765e7d7acab7e9c26
2017-07-11 03:55:18 +00:00
Bill Yi
750540ae48 Import translations. DO NOT MERGE
am: 7267438b58  -s ours

Change-Id: Id5933547a1b04477e00dbef1fd88382a01e02891
2017-07-11 03:47:35 +00:00
Kevin Chyn
c10561bda2 Merge "Remove unnecessary keywords" into oc-dr1-dev am: 9cf03c3884
am: b5b7ef69bf

Change-Id: I8abf3025eb9b08283b19af3caba6100c46957ae0
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  -s ours

Change-Id: Ib0364671f7637f59a29c29abd90b7ddbf8b39f63
2017-07-11 03:35:23 +00:00
Kevin Chyn
b5b7ef69bf Merge "Remove unnecessary keywords" into oc-dr1-dev
am: 9cf03c3884

Change-Id: I71026b6b9fa79608afd466cfce56e4be203c610d
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  -s ours

Change-Id: If9f14b394f7fc6148ac621daa513319bfdfbaeba
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  -s ours

Change-Id: Ic5a239ac412ccb46da32f08843c039cc4313a67b
2017-07-11 03:32:38 +00:00
Bill Yi
bf24c5db83 Import translations. DO NOT MERGE am: f812f94216 -s ours
am: bc4faa93e2  -s ours

Change-Id: I0de19fee01ce891ca72ed5276186cb18f3e49566
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  -s ours

Change-Id: Id14fbf7f7822ce74772c66410f9bd69e9ecba388
2017-07-11 03:30:04 +00:00
Bill Yi
bc4faa93e2 Import translations. DO NOT MERGE
am: f812f94216  -s ours

Change-Id: If3bc9ec99810524fde2cf69d6a43f4995ed9306a
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