Commit Graph

19158 Commits

Author SHA1 Message Date
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
TreeHugger Robot
50535da16d Merge "Add public intent filters to indexing" into oc-dr1-dev 2017-07-07 22:39:20 +00:00
jackqdyulei
85e771da78 Update summary for "Voice Calls"
Change it from "Screen usage 2m" to "2m", since this is not a screen
usage. This cl has effect on all non-app batterySipper.

Bug: 63443732
Test: RunSettingsRoboTests
Change-Id: I027b3234bd7b56738ab31c5dfbc0d8bd7f19186e
2017-07-07 14:52:27 -07:00
Antony Sargent
93b1e9bc74 Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev am: db522a539d
am: ef7f6663ef

Change-Id: I6a20da2230e27b28c3dac6f1526414e06a13507d
2017-07-07 21:17:44 +00:00
Antony Sargent
ef7f6663ef Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev
am: db522a539d

Change-Id: I85b5235bde32d6a25a708e3bd1245ba646487124
2017-07-07 21:15:48 +00:00
TreeHugger Robot
db522a539d Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev 2017-07-07 21:12:58 +00:00
Andrew Sapperstein
512dc80a42 Duplicate ambient display setting in battery settings.
Also fixed a bug where ambient display was duplicated
in search results.

Change-Id: I71e8d9ff12e59ad7b9eb309d1093df1ba67abaae
Merged-In: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes: 62298578
Test: robotests
2017-07-07 20:10:09 +00:00
Andrew Sapperstein
fedae393ef Duplicate ambient display setting in battery settings.
Also fixed a bug where ambient display was duplicated
in search results.

Change-Id: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes: 62298578
Test: robotests
2017-07-07 13:07:54 -07:00
jackqdyulei
3decd57c50 Merge "Create BatterySaverReceiver" into oc-dr1-dev
am: 062dedb072

Change-Id: I0f992f6191181be50a54040c0694037cf49a77f5
2017-07-07 19:39:06 +00:00
TreeHugger Robot
062dedb072 Merge "Create BatterySaverReceiver" into oc-dr1-dev 2017-07-07 19:31:47 +00:00
Rajeev Kumar
6e4ae6dc53 Merge "Some import cleanups." 2017-07-07 18:39:07 +00:00
Antony Sargent
2efec86bae Get rid of spurious gear icon in BT details page
The problem is that we were calling done() on the EntityHeaderController
and passing false for whether to rebind the action buttons, which means
we were getting the default behavior including a visible gear
icon. Passing true to request rebinding causes that icon to be hidden.

Bug: 63405635
Test: make RunSettingsRoboTests
Change-Id: I031f4a2d176ff3be025cc2675d7026a679936b03
2017-07-07 11:31:43 -07:00
Stephen Chen
cb3dfb91e8 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
Merged-In: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
2017-07-07 11:06:20 -07:00
Andrew Sapperstein
1bc4a459fb Merge "Search bar polish" into oc-dr1-dev am: d10a1af258
am: e0c01c6605

Change-Id: I39bae9af6032e392bfcb96eaab1af281bc705273
2017-07-07 18:04:37 +00:00
Ajay Kumar Nadathur Sreenivasan
0f9d39518b Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev am: 9afa37ac3c
am: d6e1be947e

Change-Id: I253706d61d4c917601581457b128f7fedec3a12c
2017-07-07 18:03:31 +00:00
Andrew Sapperstein
e0c01c6605 Merge "Search bar polish" into oc-dr1-dev
am: d10a1af258

Change-Id: Ia09442652744696c2902356b66367d46e7f20534
2017-07-07 17:47:19 +00:00
Ajay Kumar Nadathur Sreenivasan
d6e1be947e Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
am: 9afa37ac3c

Change-Id: Ib1b02ae394631c28db7f2bdd5bbba5a19812182f
2017-07-07 17:40:32 +00:00
TreeHugger Robot
d10a1af258 Merge "Search bar polish" into oc-dr1-dev 2017-07-07 17:39:11 +00:00
Ajay Kumar Nadathur Sreenivasan
9afa37ac3c Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev 2017-07-07 17:30:15 +00:00
jackqdyulei
aea085bc96 Create BatterySaverReceiver
This cl elicits BatterySaverReceiver that listen to the change about
battery state and battery saver state.

BatterySaverController and BatterySaverSettings will use this receiver
to update the UI.

Bug: 32410757
Test: RunSettingsRoboTests
Change-Id: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5
Merged-In: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5
2017-07-07 10:01:52 -07:00
TreeHugger Robot
04d5a29507 Merge "Log async ranking state in Settings search ranking" 2017-07-07 16:38:46 +00:00
Kevin Chyn
74d4547a3f Merge "Fix Assist Gesture settings check" into oc-dr1-dev am: d0487eff5e
am: 6d41ab7958

Change-Id: I6f4bdd8e1f18870c027c578fc9c1a1e4143da7d5
2017-07-07 03:57:30 +00:00
Philip Quinn
97efc5c6f1 Add SeekBarPreference.getMax(). am: 648ddd5c83
am: 7d46906218

Change-Id: Id8d9071b4a9ceac31fe81eb7d1de31890d9156f1
2017-07-07 03:51:09 +00:00
Kevin Chyn
6d41ab7958 Merge "Fix Assist Gesture settings check" into oc-dr1-dev
am: d0487eff5e

Change-Id: I609448c301e3c28a2362a884b01a196912c4c7b8
2017-07-07 03:49:36 +00:00
Philip Quinn
7d46906218 Add SeekBarPreference.getMax().
am: 648ddd5c83

Change-Id: I2ea54359e6c13b0626ed96da6c8924e70d3d95cb
2017-07-07 03:47:19 +00:00
TreeHugger Robot
d0487eff5e Merge "Fix Assist Gesture settings check" into oc-dr1-dev 2017-07-07 03:43:12 +00:00
Philip Quinn
648ddd5c83 Add SeekBarPreference.getMax().
Bug: 63047816
Test: make -j
Change-Id: I416d044fa32f3aed32c1e6239baf9c57652bca2e
2017-07-07 03:39:40 +00:00
jackqdyulei
dadbcfca37 Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am: 690accadc7" into oc-dr1-dev-plus-aosp
am: 0291cbb58e

Change-Id: I7942d4ab3bd2ceb29375dd62c58ff319b9d5d9e8
2017-07-07 03:34:24 +00:00
Andrew Sapperstein
c2684dd56b Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am: 4545d636ec" into oc-dr1-dev-plus-aosp
am: 0ee38fa7eb

Change-Id: I95f9a51aee9542cb2ff99043fd305760e276f108
2017-07-07 03:33:25 +00:00
jackqdyulei
059c4bca53 Merge "Update Anomaly detection framework" into oc-dr1-dev
am: 690accadc7

Change-Id: Idefefd2703b8b885cc6aa68665d629d04092d5d9
2017-07-07 03:01:16 +00:00
Andrew Sapperstein
0fb7d3b5a2 Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
am: 4545d636ec

Change-Id: I49fcb529e64cd1d66c85bc42f67514559140467b
2017-07-07 03:00:49 +00:00
TreeHugger Robot
c432d19068 Merge "Create BatterySaverReceiver" 2017-07-07 03:00:45 +00:00
TreeHugger Robot
a53d834f31 Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am: 4fffc20ada
am: fb2b63df05

Change-Id: I0c19439f83ff576673ab7ebf9b8e5860b7eb7dc3
2017-07-07 02:57:09 +00:00
Antony Sargent
1e673aeafb Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am: 21423623bd
am: c608cfcceb

Change-Id: I67eebf79d609eff8353255e35f04bf1ff728d497
2017-07-07 02:54:18 +00:00