Commit Graph

37633 Commits

Author SHA1 Message Date
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

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
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
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
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
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
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
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
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

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
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
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
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
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
Adrian Roos
cfa37bb121 Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
am: 6d8f0b57af

Change-Id: Ic25e07b765b3d732f410643eba7e854168092e86
2017-07-07 16:57:56 +00:00
TreeHugger Robot
6d8f0b57af Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev 2017-07-07 16:52:44 +00:00
Bill Yi
dc333a317e Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: e371dcf55a  -s ours

Change-Id: If7245374f3d569a9406d632fc7a6c4d618b1dfd0
2017-07-07 16:02:10 +00:00
TreeHugger Robot
e371dcf55a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-07 15:45:55 +00:00
Adrian Roos
6953a80804 AOD Settings: Add battery usage warning
Change-Id: I14946046c1541e8092ed2b492867730713e3e1ed
Fixes: 33279975
Test: Open Settings > Display. Verify that always on strings contain the increased battery usage warning.
2017-07-07 16:30:04 +02:00
Bill Yi
f6da721f4f Import translations. DO NOT MERGE
Change-Id: I6c862c42b058adf710c961f7c42d108fbf8caf01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-07 03:12:06 -07: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
Android Build Merger (Role)
73b6a18d24 Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am: 494f82e9b0" into oc-dr1-dev-plus-aosp 2017-07-07 03:01:58 +00:00
Android Build Merger (Role)
7091fa4882 Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am: 494f82e9b0" into oc-dr1-dev-plus-aosp 2017-07-07 03:01:56 +00:00
Doris Ling
fb62deac8e Merge "Reduce spacing in condition cards." into oc-dr1-dev
am: 494f82e9b0

Change-Id: Ice2da438bc2bbbae77699e0795426c6456fbe80d
2017-07-07 03:01:45 +00:00
Android Build Merger (Role)
c0e8d57a48 Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am: 690accadc7" into oc-dr1-dev-plus-aosp 2017-07-07 03:01:38 +00:00
Doris Ling
2e215c5117 Merge "Reduce spacing in condition cards." into oc-dr1-dev
am: 494f82e9b0

Change-Id: I28903bbc7667f0a0bad065b090076ec73db4947f
2017-07-07 03:01:37 +00:00
Android Build Merger (Role)
0291cbb58e Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am: 690accadc7" into oc-dr1-dev-plus-aosp 2017-07-07 03:01:28 +00:00