Commit Graph

18891 Commits

Author SHA1 Message Date
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
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
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
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
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
Matthew Fritze
a57c59bbba Merge "Add location as a Inline list payload" into oc-dr1-dev
am: 9e2984b035

Change-Id: Iad7aa04e35d7853ade051e5a711632b20b2fbcbe
2017-07-10 23:32:11 +00: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
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
Rajeev Kumar
af8f6beebb Get rid of unused IconPreferenceScreen
Change-Id: Ia1e0f3caf80da27c895cbf85320129b7540d8b41
2017-07-10 13:46:50 -07:00
jackqdyulei
17bae5fa57 Init BatteryUtils in constructor am: 116fec5b25
am: d6ff657b78

Change-Id: I876a9fc869ae48ef6bf45080c6036980423d1fe5
2017-07-10 20:26:35 +00:00
jackqdyulei
d6ff657b78 Init BatteryUtils in constructor
am: 116fec5b25

Change-Id: I74636f77f8ee44576894ed25eb48212386f8ee40
2017-07-10 20:22:03 +00:00
TreeHugger Robot
4553225ab5 Merge "Add location as a Inline list payload" 2017-07-10 20:18:42 +00:00
Rajeev Kumar
b82304251a Recycle TypedArray in FixedLineSummaryPreference
Change-Id: I3aefad2081751f778fd2b32c6e05921131b84547
2017-07-10 12:40:26 -07:00
kun.tang
6e6257fb24 Merge "Fix Phone crash when rorate screen on SimStatus." am: 3cbae7d6b5 am: d34ce65e22 am: a482b155f2
am: d83e519871

Change-Id: I1de0b48f92686e0cca42c23520cedf512a659579
2017-07-10 19:30:30 +00:00
kun.tang
d83e519871 Merge "Fix Phone crash when rorate screen on SimStatus." am: 3cbae7d6b5 am: d34ce65e22
am: a482b155f2

Change-Id: I31ae1b4a34bd61bceb607d2fa4c6176bbe27af75
2017-07-10 19:26:03 +00:00
kun.tang
d34ce65e22 Merge "Fix Phone crash when rorate screen on SimStatus."
am: 3cbae7d6b5

Change-Id: I3c968a9bbd7bb687aae53d5d74a9a2b3e38bcbae
2017-07-10 19:17:03 +00:00
Matthew Fritze
0609c4c281 Add location as a Inline list payload
The inline payload is added to security settings because
security settings indexes the setting with the key
"location" which corresponds with the correct
PreferenceController, LocationPreferenceController.

However, we suppress the Location search result, so to
avoid confusion later, we don't include the ResultPayload
in the search indexing.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ica9b775fe7b43259e651f95b079b8cccb29d0ea8
Merged-In: Ic5515d38064498ae908f4cefedfeb3c2a2af449c
2017-07-10 18:21:15 +00:00
Matthew Fritze
ea72afa330 Add location as a Inline list payload
The inline payload is added to security settings because
security settings indexes the setting with the key
"location" which corresponds with the correct
PreferenceController, LocationPreferenceController.

However, we suppress the Location search result, so to
avoid confusion later, we don't include the ResultPayload
in the search indexing.

Merge from: ag/2511709/

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ic5515d38064498ae908f4cefedfeb3c2a2af449c
2017-07-10 11:20:02 -07:00
jackqdyulei
116fec5b25 Init BatteryUtils in constructor
In this case we won't have the NPE.

Bug: 63526637
Test: RunSettingsRoboTests
Change-Id: I20375e535ba07deddacf74052f31476e0cb28e56
2017-07-10 11:08:12 -07:00
Sunny Goyal
32df75b686 Merge "Adding key to individual entries in ManagedServiceSettings so that it can be linked using an intent. Also updating the icon loading logic so that it handles AdaptiveIcons properly." into oc-dr1-dev
am: 8db0691129

Change-Id: If1c570e8f469ba2af39d34d016b53daa49de499b
2017-07-08 23:05:38 +00:00
TreeHugger Robot
8db0691129 Merge "Adding key to individual entries in ManagedServiceSettings so that it can be linked using an intent. Also updating the icon loading logic so that it handles AdaptiveIcons properly." into oc-dr1-dev 2017-07-08 23:01:36 +00:00
Sunny Goyal
93fb5863e5 Adding key to individual entries in ManagedServiceSettings so that it can
be linked using an intent.
Also updating the icon loading logic so that it handles AdaptiveIcons
properly.

Test: Manually tested on device
Bug: 63418030
Change-Id: I4d818956f2fa0585300d4dfb95ad7a16fe8882d5

Merged-In: I3059e3a562a593bc425d4e778be052ac014a7002
2017-07-08 20:42:04 +00:00
Sunny Goyal
48191f7363 Adding key to individual entries in ManagedServiceSettings so that it can
be linked using an intent.
Also updating the icon loading logic so that it handles AdaptiveIcons
properly.

Test: Manually tested on device
Bug: 63418030
Change-Id: I3059e3a562a593bc425d4e778be052ac014a7002
2017-07-08 11:40:56 -07:00
kun.tang
0c06bab9cc Fix Phone crash when rorate screen on SimStatus.
When rorate screen on SimStatus, Fragment not attached to Activity, phone crash.
Solution: use mRes to getString
Test: build

07-07 13:20:27.237   696   696 E AndroidRuntime: Process: com.android.phone, PID: 696
07-07 13:20:27.237   696   696 E AndroidRuntime: java.lang.IllegalStateException: Fragment SimStatus{d1e4bb3} not attached to Activity
07-07 13:20:27.237   696   696 E AndroidRuntime:        at android.app.Fragment.getResources(Fragment.java:861)
07-07 13:20:27.237   696   696 E AndroidRuntime:        at com.android.settings.deviceinfo.SimStatus.updateSignalStrength(SimStatus.java:359)
07-07 13:20:27.237   696   696 E AndroidRuntime:        at com.android.settings.deviceinfo.SimStatus$4.onSignalStrengthsChanged(SimStatus.java:444)
07-07 13:20:27.237   696   696 E AndroidRuntime:        at android.telephony.PhoneStateListener$1.handleMessage(PhoneStateListener.java:334)
07-07 13:20:27.237   696   696 E AndroidRuntime:        at android.os.Handler.dispatchMessage(Handler.java:105)
07-07 13:20:27.237   696   696 E AndroidRuntime:        at android.os.Looper.loop(Looper.java:164)
07-07 13:20:27.237   696   696 E AndroidRuntime:        at android.app.ActivityThread.main(ActivityThread.java:6558)
07-07 13:20:27.237   696   696 E AndroidRuntime:        at java.lang.reflect.Method.invoke(Native Method)
07-07 13:20:27.237   696   696 E AndroidRuntime:        at com.android.internal.os.Zygote$MethodAndArgsCaller.run(Zygot

Change-Id: Ife8f2e3ed8c4fe6db0fe784a43910768ff3ff4d1
2017-07-08 11:09:02 +08:00
Soroosh Mariooryad
892d65fd1e Adding warmup call API for Settings search ranking.
- This allows the ranking implementations to prepare for predictions and
avoids latency on the first prediction call.

Bug: 38197948
Bug: 37312700

Test: RunSettingsRoboTests

Change-Id: I1878b14765ad7cede5648fa1c7f29c419c2e5535
2017-07-07 17:53:58 -07:00
jackqdyulei
d2d524d958 Merge "Update summary for "Voice Calls"" into oc-dr1-dev am: 69d6f2840f
am: d8b92b4d82

Change-Id: Ic8a6bc7312c1a464104867e87daecf72bdcffaa9
2017-07-07 23:59:46 +00:00
jackqdyulei
d8b92b4d82 Merge "Update summary for "Voice Calls"" into oc-dr1-dev
am: 69d6f2840f

Change-Id: Ie98286df2d583d521eefb30630bfb32936b5ac79
2017-07-07 23:57:12 +00:00
TreeHugger Robot
69d6f2840f Merge "Update summary for "Voice Calls"" into oc-dr1-dev 2017-07-07 23:52:58 +00:00
Andrew Sapperstein
0d2b782c28 Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
am: 604df3cc55

Change-Id: If9edeb0e771349bec9a0d3d23d8d9331a4ee13a6
2017-07-07 22:48:45 +00:00
Matthew Fritze
636e18c659 Merge "Add public intent filters to indexing" into oc-dr1-dev am: 50535da16d
am: 01ee9b3cc7

Change-Id: I2a5063324b21e2a77ba10d9e4be9dcbc4aadd2c9
2017-07-07 22:48:42 +00:00
Matthew Fritze
01ee9b3cc7 Merge "Add public intent filters to indexing" into oc-dr1-dev
am: 50535da16d

Change-Id: I567ada95b583eec40a873466136c922ef2e73fd2
2017-07-07 22:46:47 +00:00
TreeHugger Robot
604df3cc55 Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev 2017-07-07 22:46:05 +00:00
TreeHugger Robot
ef1fae4778 Merge "Duplicate ambient display setting in battery settings." 2017-07-07 22:40:23 +00:00