Bill Yi
81a9389ebd
Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours
...
am: 2865272522
2017-07-11 04:03:04 +00:00
Bill Yi
2865272522
Import translations. DO NOT MERGE am: 7267438b58 -s ours
...
am: 750540ae48
2017-07-11 03:55:18 +00:00
Bill Yi
750540ae48
Import translations. DO NOT MERGE
...
am: 7267438b58
2017-07-11 03:47:35 +00:00
Kevin Chyn
b5b7ef69bf
Merge "Remove unnecessary keywords" into oc-dr1-dev
...
am: 9cf03c3884
2017-07-11 03:35:06 +00:00
Android Build Merger (Role)
51e0ed982c
Merge "Import translations. DO NOT MERGE am: f812f94216 -s ours am: c45dd3f1ec -s ours" into oc-dr1-dev-plus-aosp
2017-07-11 03:32:54 +00:00
Bill Yi
5076e0747b
Import translations. DO NOT MERGE am: f812f94216 -s ours
...
am: c45dd3f1ec
2017-07-11 03:32:38 +00:00
Bill Yi
bf24c5db83
Import translations. DO NOT MERGE am: f812f94216 -s ours
...
am: bc4faa93e2
2017-07-11 03:32:33 +00:00
TreeHugger Robot
9cf03c3884
Merge "Remove unnecessary keywords" into oc-dr1-dev
2017-07-11 03:31:06 +00:00
Bill Yi
c45dd3f1ec
Import translations. DO NOT MERGE
...
am: f812f94216
2017-07-11 03:30:04 +00:00
Bill Yi
bc4faa93e2
Import translations. DO NOT MERGE
...
am: f812f94216
2017-07-11 03:30:02 +00:00
Kevin Chyn
dde95f663a
Remove unnecessary keywords
...
Fixes: 63544783
Test: make -j RunSettingsRoboTests && manual
Change-Id: I6f6cb8aff365174edb7cd22f18cbc1b7e7ba5b4a
2017-07-11 03:23:21 +00:00
Bill Yi
7267438b58
Import translations. DO NOT MERGE
...
Change-Id: Ifbee1421f45d2cb6f3d5c533e5c4e9a2735afa10
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 17:16:10 -07:00
Ajay Nadathur
6465041095
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
...
am: 73ae54a63a
2017-07-11 00:05:53 +00:00
TreeHugger Robot
73ae54a63a
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
2017-07-11 00:00:08 +00:00
Bill Yi
f812f94216
Import translations. DO NOT MERGE
...
Change-Id: Ifb8d0e63a8150656a55bb1b2adf5748c75a10224
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 16:49:52 -07:00
Matthew Fritze
a57c59bbba
Merge "Add location as a Inline list payload" into oc-dr1-dev
...
am: 9e2984b035
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
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
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
jackqdyulei
d6ff657b78
Init BatteryUtils in constructor
...
am: 116fec5b25
2017-07-10 20:22:03 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
jackqdyulei
3decd57c50
Merge "Create BatterySaverReceiver" into oc-dr1-dev
...
am: 062dedb072
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
