Fan Zhang
64cac99448
Entity header layout cleanup
...
Change-Id: I866231e3a6cb506e3aa1c03f2cbead1049270999
Fix: 63339943
Test: visual
2017-07-10 15:13:17 -07:00
Rajeev Kumar
5c279e4bce
Merge "Recycle TypedArray in FixedLineSummaryPreference"
2017-07-10 21:41:41 +00:00
Fan Zhang
7a56184063
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev am: 5d3f6d566b
...
am: 16afefd509
2017-07-10 21:36:10 +00:00
Fan Zhang
16afefd509
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
...
am: 5d3f6d566b
2017-07-10 21:31:39 +00: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
jackqdyulei
17bae5fa57
Init BatteryUtils in constructor am: 116fec5b25
...
am: d6ff657b78
2017-07-10 20:26:35 +00:00
jackqdyulei
d6ff657b78
Init BatteryUtils in constructor
...
am: 116fec5b25
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
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
2017-07-10 19:26:03 +00:00
kun.tang
a482b155f2
Merge "Fix Phone crash when rorate screen on SimStatus." am: 3cbae7d6b5
...
am: d34ce65e22
2017-07-10 19:20:58 +00:00
kun.tang
d34ce65e22
Merge "Fix Phone crash when rorate screen on SimStatus."
...
am: 3cbae7d6b5
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
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
2017-07-10 14:13:02 +00:00
Christine Franks
1be5af80ec
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
...
am: 8dc795d64b
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
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
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
2017-07-07 23:59:46 +00:00
jackqdyulei
d8b92b4d82
Merge "Update summary for "Voice Calls"" into oc-dr1-dev
...
am: 69d6f2840f
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
2017-07-07 23:43:42 +00:00
Doris Ling
67fed2400d
Merge "Increase suggestion/condition card width." into oc-dr1-dev
...
am: fbd8d21588
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
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
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
2017-07-07 22:48:42 +00:00
Matthew Fritze
01ee9b3cc7
Merge "Add public intent filters to indexing" into oc-dr1-dev
...
am: 50535da16d
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
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
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
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
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
