OSDN Git Service
Maurice Lam [Tue, 11 Jul 2017 23:47:21 +0000 (23:47 +0000)]
Merge "Add category for wallpaper suggestion" into oc-dr1-dev
am:
13a1a98bb9
Change-Id: I2bdb8180ab33f8410112c411e0182ce46e462c4f
Maurice Lam [Tue, 11 Jul 2017 23:41:32 +0000 (23:41 +0000)]
Merge "Add category for wallpaper suggestion" into oc-dr1-dev
Kevin Chyn [Tue, 11 Jul 2017 22:36:47 +0000 (22:36 +0000)]
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev
am:
7bde506ed1
Change-Id: I638df735c2716cc243a471687d176be6613e8bce
TreeHugger Robot [Tue, 11 Jul 2017 22:32:19 +0000 (22:32 +0000)]
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev
jackqdyulei [Tue, 11 Jul 2017 22:08:19 +0000 (22:08 +0000)]
Merge "Bind service in onCreate" into oc-dr1-dev
am:
4e4c73bfc7
Change-Id: Id317c4003fd560c5cff4da7191198aa17ea97f7b
TreeHugger Robot [Tue, 11 Jul 2017 22:02:35 +0000 (22:02 +0000)]
Merge "Bind service in onCreate" into oc-dr1-dev
Jack He [Tue, 11 Jul 2017 21:22:40 +0000 (21:22 +0000)]
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
am:
86fd147ac6
Change-Id: Ib56a1d03e9e74632137117802a5baab3870947bb
TreeHugger Robot [Tue, 11 Jul 2017 21:16:32 +0000 (21:16 +0000)]
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
Stephen Chen [Tue, 11 Jul 2017 20:27:39 +0000 (20:27 +0000)]
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
am:
89fdea9807
Change-Id: Iddc9c6e474847f2aa54a0f695d34201a84596985
TreeHugger Robot [Tue, 11 Jul 2017 20:21:01 +0000 (20:21 +0000)]
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
jackqdyulei [Mon, 10 Jul 2017 20:22:50 +0000 (13:22 -0700)]
Bind service in onCreate
This cl puts the binding to onCreate instead of constructor, so
preference controller won't bind/unbind service without registering
Lifecycle.
Bug:
62105045
Test: RunSettingsRoboTests
Change-Id: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
Merged-In: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
Kevin Chyn [Fri, 7 Jul 2017 18:22:16 +0000 (11:22 -0700)]
Assist gesture title should not be translated, remove unused strings
Bug:
63441962
Test: manual && make -j RunSettingsRoboTests
Change-Id: I8b50ad378828f30f31dbfd648c9fac62af5d9da7
Daniel Nishi [Tue, 11 Jul 2017 19:56:41 +0000 (19:56 +0000)]
Merge "Expand ASM activation warning." into oc-dr1-dev
am:
64acb2906c
Change-Id: I980227fd99274364a7160a0e896b9518c2de1dd0
Daniel Nishi [Tue, 11 Jul 2017 19:46:19 +0000 (19:46 +0000)]
Merge "Expand ASM activation warning." into oc-dr1-dev
Jack He [Tue, 11 Jul 2017 19:04:01 +0000 (12:04 -0700)]
Bluetooth: mLocalAdapter should never be null
* mLocalAdapter should never be null
* We should crash if it is ever null
Bug:
63442969
Test: make, pair Bluetooth device
Change-Id: If98f9ea0762927eb57d00224b62abf24bbec69ba
Maurice Lam [Tue, 11 Jul 2017 18:27:30 +0000 (18:27 +0000)]
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
am:
540d92a7e9
Change-Id: I63b9b138b1918d066a85d19c5f91221acdd3e083
Maurice Lam [Tue, 11 Jul 2017 18:21:43 +0000 (18:21 +0000)]
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
Daniel Nishi [Tue, 27 Jun 2017 22:09:20 +0000 (15:09 -0700)]
Expand ASM activation warning.
If the device had ASM enabled by default but still opted to disable ASM
for policy reasons, we need to start warning the user.
Change-Id: I6a296e95d00413308de3ddc565b42c5f605087e9
Fixes:
62105682
Test: Settings robotest
Bill Yi [Tue, 11 Jul 2017 04:11:37 +0000 (04:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
75bcd075f2 -s ours
Change-Id: Ic3bdba9d8575e66c4e94229380e3225881244013
Bill Yi [Tue, 11 Jul 2017 04:08:17 +0000 (04:08 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours am:
750540ae48 -s ours
am:
a8d19dc2e4 -s ours
Change-Id: I86658e992835680c75c69cd869acb314d5b93c3e
Bill Yi [Tue, 11 Jul 2017 04:03:04 +0000 (04:03 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours am:
750540ae48 -s ours
am:
2865272522 -s ours
Change-Id: I0b8b30eda46b1997915adf4ee3921657bdb477a5
TreeHugger Robot [Tue, 11 Jul 2017 04:01:24 +0000 (04:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 11 Jul 2017 03:55:40 +0000 (03:55 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours
am:
750540ae48 -s ours
Change-Id: Ie4b8baffb9d82f30bef5251893124152a66f8f1c
Bill Yi [Tue, 11 Jul 2017 03:55:18 +0000 (03:55 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours
am:
750540ae48 -s ours
Change-Id: If2ede8c90fef89686c2ea93765e7d7acab7e9c26
Bill Yi [Tue, 11 Jul 2017 03:47:35 +0000 (03:47 +0000)]
Import translations. DO NOT MERGE
am:
7267438b58 -s ours
Change-Id: Id5933547a1b04477e00dbef1fd88382a01e02891
Kevin Chyn [Tue, 11 Jul 2017 03:35:06 +0000 (03:35 +0000)]
Merge "Remove unnecessary keywords" into oc-dr1-dev
am:
9cf03c3884
Change-Id: I71026b6b9fa79608afd466cfce56e4be203c610d
Android Build Merger (Role) [Tue, 11 Jul 2017 03:32:54 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE am:
f812f94216 -s ours am:
c45dd3f1ec -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 11 Jul 2017 03:32:38 +0000 (03:32 +0000)]
Import translations. DO NOT MERGE am:
f812f94216 -s ours
am:
c45dd3f1ec -s ours
Change-Id: Ic5a239ac412ccb46da32f08843c039cc4313a67b
Bill Yi [Tue, 11 Jul 2017 03:32:33 +0000 (03:32 +0000)]
Import translations. DO NOT MERGE am:
f812f94216 -s ours
am:
bc4faa93e2 -s ours
Change-Id: I0de19fee01ce891ca72ed5276186cb18f3e49566
TreeHugger Robot [Tue, 11 Jul 2017 03:31:06 +0000 (03:31 +0000)]
Merge "Remove unnecessary keywords" into oc-dr1-dev
Bill Yi [Tue, 11 Jul 2017 03:30:04 +0000 (03:30 +0000)]
Import translations. DO NOT MERGE
am:
f812f94216 -s ours
Change-Id: Id14fbf7f7822ce74772c66410f9bd69e9ecba388
Bill Yi [Tue, 11 Jul 2017 03:30:02 +0000 (03:30 +0000)]
Import translations. DO NOT MERGE
am:
f812f94216 -s ours
Change-Id: If3bc9ec99810524fde2cf69d6a43f4995ed9306a
Kevin Chyn [Tue, 11 Jul 2017 00:54:04 +0000 (17:54 -0700)]
Remove unnecessary keywords
Fixes:
63544783
Test: make -j RunSettingsRoboTests && manual
Change-Id: I6f6cb8aff365174edb7cd22f18cbc1b7e7ba5b4a
Maurice Lam [Tue, 11 Jul 2017 01:15:10 +0000 (18:15 -0700)]
Hide screen lock options button in confirm lock
Hide the screen lock options button in the confirmation stage of
SetupChooseLockPassword, so the user cannot skip out of that screen
while the screen lock is being saved.
Test: Manual
Bug:
63526104
Change-Id: I8ee8938f3ddcd9f0ff3b1812fcae667eddaf09ab
Bill Yi [Tue, 11 Jul 2017 00:16:10 +0000 (17:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifbee1421f45d2cb6f3d5c533e5c4e9a2735afa10
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Ajay Nadathur [Tue, 11 Jul 2017 00:05:53 +0000 (00:05 +0000)]
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
am:
73ae54a63a
Change-Id: I1650614a64463f537edb752d58bc0c05ddf3d5b6
TreeHugger Robot [Tue, 11 Jul 2017 00:00:08 +0000 (00:00 +0000)]
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
Bill Yi [Mon, 10 Jul 2017 23:49:52 +0000 (16:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb8d0e63a8150656a55bb1b2adf5748c75a10224
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Matthew Fritze [Mon, 10 Jul 2017 23:32:11 +0000 (23:32 +0000)]
Merge "Add location as a Inline list payload" into oc-dr1-dev
am:
9e2984b035
Change-Id: Iad7aa04e35d7853ade051e5a711632b20b2fbcbe
Bill Yi [Mon, 10 Jul 2017 23:23:41 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I827ed97b3afd80dd3e834b3cf686c6b1d4a65d25
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Mon, 10 Jul 2017 23:23:13 +0000 (23:23 +0000)]
Merge "Add location as a Inline list payload" into oc-dr1-dev
Fan Zhang [Mon, 10 Jul 2017 21:31:39 +0000 (21:31 +0000)]
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
am:
5d3f6d566b
Change-Id: Ifd5f8aae85864e2a264ea76e28700cf82a0bfac5
Ajay Nadathur [Mon, 10 Jul 2017 21:21:10 +0000 (14:21 -0700)]
Update notification redaction interstitial according to spec
bug:
38395294
Test: Manually tested and verified
Change-Id: Iddd53af604c65bb8e40c081f9538535bd3043ad4
TreeHugger Robot [Mon, 10 Jul 2017 21:23:15 +0000 (21:23 +0000)]
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
jackqdyulei [Mon, 10 Jul 2017 20:22:03 +0000 (20:22 +0000)]
Init BatteryUtils in constructor
am:
116fec5b25
Change-Id: I74636f77f8ee44576894ed25eb48212386f8ee40
Fan Zhang [Mon, 10 Jul 2017 19:08:04 +0000 (12:08 -0700)]
Support multi line title for switch and edittext preferences
Change-Id: I898288a1e8c9d3bedae3f5f3269d4aa0fd2308f6
Fix:
63509156
Test: visual
kun.tang [Mon, 10 Jul 2017 19:26:03 +0000 (19:26 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus." am:
3cbae7d6b5 am:
d34ce65e22
am:
a482b155f2
Change-Id: I31ae1b4a34bd61bceb607d2fa4c6176bbe27af75
kun.tang [Mon, 10 Jul 2017 19:20:58 +0000 (19:20 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus." am:
3cbae7d6b5
am:
d34ce65e22
Change-Id: Ic806452e621c14431576fe4c5ed848ae005122c1
kun.tang [Mon, 10 Jul 2017 19:17:03 +0000 (19:17 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus."
am:
3cbae7d6b5
Change-Id: I3c968a9bbd7bb687aae53d5d74a9a2b3e38bcbae
Treehugger Robot [Mon, 10 Jul 2017 19:08:11 +0000 (19:08 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus."
Matthew Fritze [Fri, 7 Jul 2017 15:04:42 +0000 (08:04 -0700)]
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
jackqdyulei [Mon, 10 Jul 2017 18:00:05 +0000 (11:00 -0700)]
Init BatteryUtils in constructor
In this case we won't have the NPE.
Bug:
63526637
Test: RunSettingsRoboTests
Change-Id: I20375e535ba07deddacf74052f31476e0cb28e56
Christine Franks [Mon, 10 Jul 2017 13:57:38 +0000 (13:57 +0000)]
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
am:
8dc795d64b
Change-Id: Ia2ed1750a996d56255f5eecb42b2607d65c5e8d0
Christine Franks [Mon, 10 Jul 2017 13:51:39 +0000 (13:51 +0000)]
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
Sunny Goyal [Sat, 8 Jul 2017 23:05:38 +0000 (23:05 +0000)]
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
TreeHugger Robot [Sat, 8 Jul 2017 23:01:36 +0000 (23:01 +0000)]
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
Sunny Goyal [Fri, 7 Jul 2017 13:40:27 +0000 (06:40 -0700)]
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
kun.tang [Sat, 8 Jul 2017 03:09:02 +0000 (11:09 +0800)]
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
Maurice Lam [Sat, 8 Jul 2017 01:21:29 +0000 (18:21 -0700)]
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
jackqdyulei [Fri, 7 Jul 2017 23:57:12 +0000 (23:57 +0000)]
Merge "Update summary for "Voice Calls"" into oc-dr1-dev
am:
69d6f2840f
Change-Id: Ie98286df2d583d521eefb30630bfb32936b5ac79
TreeHugger Robot [Fri, 7 Jul 2017 23:52:58 +0000 (23:52 +0000)]
Merge "Update summary for "Voice Calls"" into oc-dr1-dev
Doris Ling [Fri, 7 Jul 2017 23:41:15 +0000 (23:41 +0000)]
Merge "Increase suggestion/condition card width." into oc-dr1-dev
am:
fbd8d21588
Change-Id: I309c769f4ee929c3f8c4c9e83b1db8e86f9745f1
TreeHugger Robot [Fri, 7 Jul 2017 23:35:08 +0000 (23:35 +0000)]
Merge "Increase suggestion/condition card width." into oc-dr1-dev
Andrew Sapperstein [Fri, 7 Jul 2017 22:48:45 +0000 (22:48 +0000)]
Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
am:
604df3cc55
Change-Id: If9edeb0e771349bec9a0d3d23d8d9331a4ee13a6
Matthew Fritze [Fri, 7 Jul 2017 22:46:47 +0000 (22:46 +0000)]
Merge "Add public intent filters to indexing" into oc-dr1-dev
am:
50535da16d
Change-Id: I567ada95b583eec40a873466136c922ef2e73fd2
TreeHugger Robot [Fri, 7 Jul 2017 22:46:05 +0000 (22:46 +0000)]
Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Add public intent filters to indexing" into oc-dr1-dev
jackqdyulei [Fri, 7 Jul 2017 20:05:46 +0000 (13:05 -0700)]
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
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 21:33:47 +0000 (21:33 +0000)]
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev
am:
56787e3e54
Change-Id: Ic30a63d3043a04aeeac04d65a747897b91e1831b
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 21:29:07 +0000 (21:29 +0000)]
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev
Antony Sargent [Fri, 7 Jul 2017 21:15:48 +0000 (21:15 +0000)]
Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev
am:
db522a539d
Change-Id: I85b5235bde32d6a25a708e3bd1245ba646487124
TreeHugger Robot [Fri, 7 Jul 2017 21:12:58 +0000 (21:12 +0000)]
Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev
Andrew Sapperstein [Fri, 7 Jul 2017 18:02:00 +0000 (11:02 -0700)]
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
jackqdyulei [Fri, 7 Jul 2017 19:39:06 +0000 (19:39 +0000)]
Merge "Create BatterySaverReceiver" into oc-dr1-dev
am:
062dedb072
Change-Id: I0f992f6191181be50a54040c0694037cf49a77f5
TreeHugger Robot [Fri, 7 Jul 2017 19:31:47 +0000 (19:31 +0000)]
Merge "Create BatterySaverReceiver" into oc-dr1-dev
Ajay Nadathur [Fri, 7 Jul 2017 00:03:11 +0000 (17:03 -0700)]
Overlapping text over fingerprint animation
bug:
63122688
Test: Manually tested and verified using smallest & largest display
settings
Change-Id: I03a6ab380c8d611b69f0b817788ff1f34b47e19d
Antony Sargent [Fri, 7 Jul 2017 18:09:24 +0000 (11:09 -0700)]
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
Stephen Chen [Fri, 23 Jun 2017 22:14:14 +0000 (15:14 -0700)]
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
Andrew Sapperstein [Fri, 7 Jul 2017 17:47:19 +0000 (17:47 +0000)]
Merge "Search bar polish" into oc-dr1-dev
am:
d10a1af258
Change-Id: Ia09442652744696c2902356b66367d46e7f20534
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 17:40:32 +0000 (17:40 +0000)]
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
am:
9afa37ac3c
Change-Id: Ib1b02ae394631c28db7f2bdd5bbba5a19812182f
TreeHugger Robot [Fri, 7 Jul 2017 17:39:11 +0000 (17:39 +0000)]
Merge "Search bar polish" into oc-dr1-dev
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 17:30:15 +0000 (17:30 +0000)]
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
jackqdyulei [Wed, 5 Jul 2017 22:49:16 +0000 (15:49 -0700)]
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
Adrian Roos [Fri, 7 Jul 2017 16:57:56 +0000 (16:57 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
am:
6d8f0b57af
Change-Id: Ic25e07b765b3d732f410643eba7e854168092e86
TreeHugger Robot [Fri, 7 Jul 2017 16:52:44 +0000 (16:52 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
Bill Yi [Fri, 7 Jul 2017 16:02:10 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e371dcf55a -s ours
Change-Id: If7245374f3d569a9406d632fc7a6c4d618b1dfd0
TreeHugger Robot [Fri, 7 Jul 2017 15:45:55 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 14:30:04 +0000 (16:30 +0200)]
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.
Bill Yi [Fri, 7 Jul 2017 10:12:06 +0000 (03:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6c862c42b058adf710c961f7c42d108fbf8caf01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Kevin Chyn [Fri, 7 Jul 2017 03:49:36 +0000 (03:49 +0000)]
Merge "Fix Assist Gesture settings check" into oc-dr1-dev
am:
d0487eff5e
Change-Id: I609448c301e3c28a2362a884b01a196912c4c7b8
Philip Quinn [Fri, 7 Jul 2017 03:47:19 +0000 (03:47 +0000)]
Add SeekBarPreference.getMax().
am:
648ddd5c83
Change-Id: I2ea54359e6c13b0626ed96da6c8924e70d3d95cb
TreeHugger Robot [Fri, 7 Jul 2017 03:43:12 +0000 (03:43 +0000)]
Merge "Fix Assist Gesture settings check" into oc-dr1-dev
Philip Quinn [Sun, 2 Jul 2017 04:24:10 +0000 (21:24 -0700)]
Add SeekBarPreference.getMax().
Bug:
63047816
Test: make -j
Change-Id: I416d044fa32f3aed32c1e6239baf9c57652bca2e
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:58 +0000 (03:01 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:56 +0000 (03:01 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
Doris Ling [Fri, 7 Jul 2017 03:01:45 +0000 (03:01 +0000)]
Merge "Reduce spacing in condition cards." into oc-dr1-dev
am:
494f82e9b0
Change-Id: Ice2da438bc2bbbae77699e0795426c6456fbe80d
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:38 +0000 (03:01 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
Doris Ling [Fri, 7 Jul 2017 03:01:37 +0000 (03:01 +0000)]
Merge "Reduce spacing in condition cards." into oc-dr1-dev
am:
494f82e9b0
Change-Id: I28903bbc7667f0a0bad065b090076ec73db4947f
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:28 +0000 (03:01 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
jackqdyulei [Fri, 7 Jul 2017 03:01:26 +0000 (03:01 +0000)]
Merge "Update Anomaly detection framework" into oc-dr1-dev
am:
690accadc7
Change-Id: Ic0867be73688beed9ddf5395ed9427572d1b5165