Commit Graph

37969 Commits

Author SHA1 Message Date
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
Fan Zhang
b886c1613c Fix build
Change-Id: I0accc5b7c753ff85a56f5dfc17f7d9aa8eb7cd9a
Fix: 63525553
Test: RunSettingsRoboTests
2017-07-10 10:23:07 -07:00
Christine Franks
250595ae11 Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev am: 8dc795d64b
am: 1be5af80ec

Change-Id: Ibb0cfea8177fed936bd809ccb0a4e953cd9ea401
2017-07-10 14:13:02 +00:00
Christine Franks
1be5af80ec Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
am: 8dc795d64b

Change-Id: Ia2ed1750a996d56255f5eecb42b2607d65c5e8d0
2017-07-10 13:57:38 +00:00
Christine Franks
8dc795d64b Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev 2017-07-10 13:51:39 +00:00
Sunny Goyal
159461569d 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
am: 32df75b686  -s ours

Change-Id: I9fd9f4f353b104a0d2df5263000dce2d86acd3e7
2017-07-08 23:08:36 +00: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
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
Doris Ling
b35886fca9 Merge "Increase suggestion/condition card width." into oc-dr1-dev am: fbd8d21588
am: 67fed2400d

Change-Id: Ie0e8d40f3e21e2458e65c18b1e2c87c257cdffb5
2017-07-07 23:43:42 +00:00
Doris Ling
67fed2400d Merge "Increase suggestion/condition card width." into oc-dr1-dev
am: fbd8d21588

Change-Id: I309c769f4ee929c3f8c4c9e83b1db8e86f9745f1
2017-07-07 23:41:15 +00:00
TreeHugger Robot
fbd8d21588 Merge "Increase suggestion/condition card width." into oc-dr1-dev 2017-07-07 23:35:08 +00:00
Andrew Sapperstein
868bba20b7 Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev am: 604df3cc55
am: 0d2b782c28  -s ours

Change-Id: I9ec3623ddcf18bfd8a321072c9103d6988b656d9
2017-07-07 22:51:12 +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
Ajay Kumar Nadathur Sreenivasan
39e041b0f2 Merge "Overlapping text over fingerprint animation" into oc-dr1-dev am: 56787e3e54
am: 3fafe7cf22

Change-Id: I87972bf9236e2be10b8d36bb9c9ba37cf41932b9
2017-07-07 21:36:16 +00:00
Ajay Kumar Nadathur Sreenivasan
3fafe7cf22 Merge "Overlapping text over fingerprint animation" into oc-dr1-dev
am: 56787e3e54

Change-Id: Ic30a63d3043a04aeeac04d65a747897b91e1831b
2017-07-07 21:33:47 +00:00
Ajay Kumar Nadathur Sreenivasan
56787e3e54 Merge "Overlapping text over fingerprint animation" into oc-dr1-dev 2017-07-07 21:29:07 +00: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
TreeHugger Robot
32d87f4916 Merge "Change words in wifi settings toggle to lowercase." 2017-07-07 20:31:32 +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
e1d46b005b Merge "Create BatterySaverReceiver" into oc-dr1-dev am: 062dedb072
am: 3decd57c50  -s ours

Change-Id: I2975753557bdc016d13c3e0acea0801a36d28c53
2017-07-07 19:47:14 +00: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
Ajay Nadathur
715713d524 Overlapping text over fingerprint animation
bug: 63122688
Test: Manually tested and verified using smallest & largest display
settings

Change-Id: I03a6ab380c8d611b69f0b817788ff1f34b47e19d
2017-07-07 12:10:45 -07:00
Rajeev Kumar
6e4ae6dc53 Merge "Some import cleanups." 2017-07-07 18:39:07 +00:00
Stephen Chen
16d59cbdd4 Change words in wifi settings toggle to lowercase.
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Change-Id: If0e653fd7268e5e14f360a043cdc039a7846bb4a
2017-07-07 11:31:55 -07: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
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
Android Build Merger (Role)
2ad1f69d1e Merge "Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am: 6d8f0b57af am: cfa37bb121" 2017-07-07 17:06:07 +00:00
Android Build Merger (Role)
358a0d98b5 Merge "Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am: 6d8f0b57af am: cfa37bb121" 2017-07-07 17:05:55 +00:00