Commit Graph

38441 Commits

Author SHA1 Message Date
Ajay Nadathur
8c6910e9d5 Update notification redaction interstitial according to spec
bug: 38395294
Test: Manually tested and verified
Change-Id: Iddd53af604c65bb8e40c081f9538535bd3043ad4
2017-07-10 14:24:42 -07:00
TreeHugger Robot
5d3f6d566b Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev 2017-07-10 21:23:15 +00:00
TreeHugger Robot
f74878dca3 Merge "Import translations. DO NOT MERGE" 2017-07-10 20:52:21 +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
Fan Zhang
e67630ab16 Support multi line title for switch and edittext preferences
Change-Id: I898288a1e8c9d3bedae3f5f3269d4aa0fd2308f6
Fix: 63509156
Test: visual
2017-07-10 19:57:58 +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
a482b155f2 Merge "Fix Phone crash when rorate screen on SimStatus." am: 3cbae7d6b5
am: d34ce65e22

Change-Id: Ic806452e621c14431576fe4c5ed848ae005122c1
2017-07-10 19:20:58 +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
Treehugger Robot
3cbae7d6b5 Merge "Fix Phone crash when rorate screen on SimStatus." 2017-07-10 19:08:11 +00:00
TreeHugger Robot
a9b1cca103 Merge "Fix build" 2017-07-10 19:06:50 +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
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
Maurice Lam
d64d3c04fb Add category for wallpaper suggestion
Add PERSONALIZE category to wallpaper suggestion so it would be shown
during deferred setup.

Test: Manual
Bug: 62019610
Change-Id: Id3d9d926db298fba77dc472ae32574fe8855f962
2017-07-07 18:23:23 -07: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
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