OSDN Git Service
Kevin Chyn [Tue, 25 Jul 2017 05:36:26 +0000 (05:36 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
am:
5e707ccb3d -s ours
Change-Id: Ia0a0f8fff5bec512656229aaf2d81e0952760c4e
Kevin Chyn [Tue, 25 Jul 2017 05:31:53 +0000 (05:31 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
Kevin Chyn [Thu, 20 Jul 2017 07:15:44 +0000 (00:15 -0700)]
Fingerprint swipe settings and suggestions should not show if hardware unavailable
Fixes:
63589121
Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests
Merged-In: I2539128daff8df52d040606141f772fc9edffa57
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
TreeHugger Robot [Tue, 25 Jul 2017 02:32:31 +0000 (02:32 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev
Kevin Chyn [Tue, 25 Jul 2017 01:07:31 +0000 (01:07 +0000)]
Default-off FP Swipe
am:
8f5de15ba1
Change-Id: Iac3a85ac3e0d6f30d32b2823f168f3123d375f08
TreeHugger Robot [Mon, 24 Jul 2017 21:29:22 +0000 (21:29 +0000)]
Merge "Update string for bluetooth device visibility" into oc-mr1-dev
Kevin Chyn [Mon, 24 Jul 2017 21:00:18 +0000 (14:00 -0700)]
Default-off FP Swipe
Fixes:
63992836
Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests
Change-Id: I3245c7b8844df5edaea311c1871b1dd05b8b7784
Kevin Chyn [Thu, 20 Jul 2017 07:15:44 +0000 (00:15 -0700)]
Fingerprint swipe settings and suggestions should not show if hardware unavailable
Fixes:
63589121
Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
Michael Wachenschwanz [Mon, 24 Jul 2017 19:02:12 +0000 (19:02 +0000)]
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev
Fan Zhang [Mon, 24 Jul 2017 17:52:23 +0000 (10:52 -0700)]
Update string for bluetooth device visibility
Change-Id: I33baa5e72596e10f10f13d2324144ca9036c3fc9
Fix:
62891178
Test: visual
Test: robotests
Lei Yu [Mon, 24 Jul 2017 18:07:12 +0000 (18:07 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
am:
6666bf5605
Change-Id: I4903e3617b2fab64831b6e0ad8b5214ea5dd5317
Lei Yu [Mon, 24 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
Andrew Sapperstein [Mon, 24 Jul 2017 17:34:06 +0000 (17:34 +0000)]
Add ResultPayload for always-on ambient display.
am:
eb1a45b95b -s ours
Change-Id: I67522a734dff97d37f09751817f99e5f8a6bf602
Andrew Sapperstein [Sat, 22 Jul 2017 23:22:49 +0000 (16:22 -0700)]
Add ResultPayload for always-on ambient display.
Bug:
62022517
Test: robotest
Change-Id: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
Andrew Sapperstein [Sat, 22 Jul 2017 23:22:49 +0000 (16:22 -0700)]
Add ResultPayload for always-on ambient display.
Bug:
62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
Fan Zhang [Sat, 22 Jul 2017 17:59:36 +0000 (17:59 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
am:
6fcc38975c -s ours
Change-Id: I8ab95d4753c9369a4d47c83ade83380d26733b46
TreeHugger Robot [Sat, 22 Jul 2017 17:54:31 +0000 (17:54 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 16:32:30 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
4d7111b0e9 -s ours
Change-Id: Ida2173d9ce4c4f4aa3efbb24fe0b68d9fa940a29
TreeHugger Robot [Sat, 22 Jul 2017 16:25:35 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 10:57:25 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Michael Wachenschwanz [Tue, 11 Jul 2017 18:11:16 +0000 (11:11 -0700)]
Add Foreground Service time to battery usage
Add foreground service time to foreground usage time of apps. This will
account for app usage that user is aware of but is not being displayed
on screen, such as playing music while screen is locked.
Change-Id: Ica9fe0819e46b50299eb2eab7f0483ea01441fb0
Fixes:
38313557
Test: RunSettingsRoboTests
Andrew Sapperstein [Sat, 22 Jul 2017 00:33:13 +0000 (00:33 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am:
59a66d9b77
Change-Id: I2b279d3a1562e693caeaf64f2f91ab629b4e294f
Fan Zhang [Sat, 22 Jul 2017 00:32:42 +0000 (00:32 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
am:
03c595ce24
Change-Id: I1d2f8d65fb7ba48bac656222c4501306103b385c
Lei Yu [Sat, 22 Jul 2017 00:32:21 +0000 (00:32 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am:
0ec3e4e626
Change-Id: Ie3e4b7ead145b22c44383443229043722b9e86d9
Antony Sargent [Sat, 22 Jul 2017 00:32:00 +0000 (00:32 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am:
a6ac4890ed
Change-Id: Ib4cbffa94b0372419f60f16972836df27ad1fecf
Christine Franks [Sat, 22 Jul 2017 00:31:39 +0000 (00:31 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am:
cb9a7075f8 -s ours
Change-Id: Id75c03768308873b6b2666eaae6d1c86f23d1663
TreeHugger Robot [Sat, 22 Jul 2017 00:28:31 +0000 (00:28 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
Christine Franks [Fri, 21 Jul 2017 23:59:23 +0000 (23:59 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 22:16:56 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 22:09:15 +0000 (22:09 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-mr1-dev
Andrew Sapperstein [Fri, 21 Jul 2017 22:01:55 +0000 (15:01 -0700)]
Add help uri for process stats summary and apps.
Bug:
62903521
Test: manual
Change-Id: I55cdb061d79232676d4064677bd7f5936700e8b7
Fan Zhang [Fri, 21 Jul 2017 21:41:29 +0000 (21:41 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
Lei Yu [Fri, 21 Jul 2017 20:28:01 +0000 (20:28 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 00:05:01 +0000 (17:05 -0700)]
Reindex db when package w/ searchIndexProvider changes
We do this by tracking a list of package/version that provides search
indexing data. When they change, we do a full reindex.
Change-Id: I85d4c4a994c7ff808662371c857cac1929a8b1cd
Merged-In: I906a1524f5b1292932f63727d605283ddb7d6ee2
Bug:
63903835
Test: robotests
TreeHugger Robot [Fri, 21 Jul 2017 20:03:41 +0000 (20:03 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
jackqdyulei [Tue, 18 Jul 2017 18:02:53 +0000 (11:02 -0700)]
Add log for anomaly.
This cl adds all the info that need to be logged to Anomaly and add a
dump method for log.
Bug:
63776178
Test: RunSettingsRoboTests
Change-Id: If762bfca725fee07944ffa23998332c81335a37f
Fan Zhang [Fri, 21 Jul 2017 00:05:01 +0000 (17:05 -0700)]
Reindex db when package w/ searchIndexProvider changes
We do this by tracking a list of package/version that provides search
indexing data. When they change, we do a full reindex.
Change-Id: I906a1524f5b1292932f63727d605283ddb7d6ee2
Bug:
63903835
Test: robotests
Bill Yi [Fri, 21 Jul 2017 19:22:06 +0000 (12:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb876a3208315c84fad355fac5204336eb8681e1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Christine Franks [Fri, 23 Jun 2017 21:28:21 +0000 (14:28 -0700)]
Move logic for FR in demo mode out of Settings
Bug:
62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
Christine Franks [Fri, 21 Jul 2017 18:52:56 +0000 (18:52 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 18:42:40 +0000 (18:42 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am:
e09338a208 -s ours
Change-Id: Iabafe1e7ffdd70fa9694cf4e293d83b4aef6bba8
Fan Zhang [Fri, 21 Jul 2017 18:34:39 +0000 (11:34 -0700)]
Tweak bluetooth name preference
- remove accent color from device name
- remove useless ripple when tap
Change-Id: I7800523eb27bafa24f3a4549b1acf02c869ac8c8
Fix:
62891178
Test: robotests
Fan Zhang [Fri, 21 Jul 2017 18:18:44 +0000 (18:18 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
jackqdyulei [Fri, 21 Jul 2017 01:00:20 +0000 (18:00 -0700)]
Make anomaly item refresh in battery
Bug:
63908155
Test: RunSettingsRoboTest
Change-Id: I3e220001ca989020447403641360fade4d09e969
Doris Ling [Fri, 21 Jul 2017 17:19:12 +0000 (17:19 +0000)]
Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev
Julia Reynolds [Fri, 21 Jul 2017 16:21:25 +0000 (16:21 +0000)]
Zen settings screen update
am:
56b748d686
Change-Id: Iaac694915e20e5dc0f5edd0d1be17321621caa6e
Julia Reynolds [Fri, 21 Jul 2017 13:07:23 +0000 (09:07 -0400)]
Zen settings screen update
- Remove app attribution
- Change visual disturbances label
Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes:
63905920
Fixes:
63906381
Test: manual
Daniel Nishi [Fri, 21 Jul 2017 01:47:17 +0000 (01:47 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev
am:
4ab6f77f98
Change-Id: I06dea000a9bc74314905f49843262e79a6c240dd
TreeHugger Robot [Fri, 21 Jul 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev
Fan Zhang [Wed, 19 Jul 2017 23:44:28 +0000 (16:44 -0700)]
Add shadow to searchbar when user scrolls vertically
Bug:
63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit
e651ddf9e6c00a62338ef8c7114b5e5e9cd307ec)
Christine Franks [Fri, 23 Jun 2017 21:28:21 +0000 (14:28 -0700)]
Move logic for FR in demo mode out of Settings
Bug:
62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
TreeHugger Robot [Fri, 21 Jul 2017 00:36:59 +0000 (00:36 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 22:17:50 +0000 (22:17 +0000)]
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
Salvador Martinez [Thu, 20 Jul 2017 21:53:50 +0000 (21:53 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
am:
e4c9b7162d
Change-Id: I560c4f1640b20e781daf2bcc9e22fc0c9b511b90
TreeHugger Robot [Thu, 20 Jul 2017 21:46:33 +0000 (21:46 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
acd97be0b8 -s ours
Change-Id: Ib8a1e9a9f4b4ae2d056b5b4bf8e6603aa9212c4d
TreeHugger Robot [Thu, 20 Jul 2017 21:17:34 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Amit Mahajan [Thu, 20 Jul 2017 21:00:23 +0000 (21:00 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
c2b12c5304
Change-Id: Ic352005843d3ffd0b04a0a80710c04a5f02291a6
Amit Mahajan [Thu, 20 Jul 2017 20:47:12 +0000 (20:47 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Doris Ling [Thu, 20 Jul 2017 20:25:51 +0000 (13:25 -0700)]
Fix gesture preview image visibility not set correctly.
- update for the preview image is done only in onStart()/Stop().
Move the handling to onPause()/onResume() instead so that visibility
updates will also be done when switching between pages.
- remove the obsolete GesturePreference class.
Change-Id: I743a9d41f17aab3303201e11e5bba708ca5810ae
Fix:
63783217
Test: make RunSettingsRoboTests
Doris Ling [Thu, 20 Jul 2017 20:38:09 +0000 (20:38 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am:
390bb3216d
Change-Id: I4b6b6f8d2d6ef19e16d74df1f403f0a5f5109713
Evan Laird [Thu, 20 Jul 2017 20:37:47 +0000 (20:37 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am:
a9e2d97004
Change-Id: I596d700d10a29640344d4554824a29eb21e71cf1
TreeHugger Robot [Thu, 20 Jul 2017 20:34:55 +0000 (20:34 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
Fan Zhang [Wed, 19 Jul 2017 23:44:28 +0000 (16:44 -0700)]
Add shadow to searchbar when user scrolls vertically
Bug:
63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
TreeHugger Robot [Thu, 20 Jul 2017 20:23:53 +0000 (20:23 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 20:04:42 +0000 (20:04 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours
am:
cc298f9ae6 -s ours
Change-Id: I28beea32e9cdc8bced4cd2af333e391bfc6d73c0
Bill Yi [Thu, 20 Jul 2017 19:58:46 +0000 (19:58 +0000)]
Import translations. DO NOT MERGE
am:
6cf2d99816 -s ours
Change-Id: Ic6e1c58d91200c599211ccf4a1f781892dc75d55
Bill Yi [Thu, 20 Jul 2017 17:53:14 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: If5c18c395a4293f6c084f9019fd37a17ddfd24d9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Doris Ling [Wed, 5 Jul 2017 19:53:04 +0000 (12:53 -0700)]
Ensure that brightness level is within 0-100%.
Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.
Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix:
63872023
Test: make RunSettingsRoboTests
(cherry picked from commit
c7d2d270abbe0d05ae00f326539d3dde91450243)
Antony Sargent [Thu, 20 Jul 2017 16:54:29 +0000 (09:54 -0700)]
Switch to using gray icon for Bluetooth imaging devices
All the other Bluetooth icons were switched to gray at some point in the
past, but we must have missed this one.
Bug:
63858978
Test: make RunSettingsRoboTests
Change-Id: I2ebefa42f3ecff8ae6d58f4bdb22dce39ae4dbd4
Doris Ling [Tue, 18 Jul 2017 22:43:26 +0000 (15:43 -0700)]
Move Gesture settings up one level.
Move System->Languages, input & gestures->Gestures to System->Gestures.
Change-Id: Ie81876208383f69ebf1a0465d76c760d7dd9d95d
Fix:
62276882
Test: make RunSettingsRoboTests
(cherry picked from commit
55ce7de7d06d9fd8ec153c4b6f5300fbe9349990)
Fan Zhang [Wed, 19 Jul 2017 23:06:15 +0000 (16:06 -0700)]
Ignore clicks on developer switch UI during monkey test
Change-Id: I10c4771386bb38e117848da385090dec78e4a2f8
Fix:
63852950
Test: robotests
Julia Reynolds [Thu, 20 Jul 2017 14:23:51 +0000 (14:23 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev
am:
9dec71f7d7
Change-Id: I81e2609637537413bfd36ed9e0658d49d533a9cd
Julia Reynolds [Thu, 20 Jul 2017 14:19:33 +0000 (14:19 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 06:13:29 +0000 (23:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1dad650eb3d6c49c1b1b8b6873a2f8a0ffe89a9c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Salvador Martinez [Thu, 20 Jul 2017 00:14:21 +0000 (17:14 -0700)]
Add some more logging to settings battery stuff
This CL adds logging to areas which are possible suspects for
the slowdown some people have been reporting in the
PowerUsageAdvanced screen. It times the time it takes for various
battery stats methods as well as the time it takes to draw things.
Test: still build (only adds logging)
Bug:
62959645
Bug:
63442960
Change-Id: I7e6c5e83e33a931057c9fdef14d3bef84f514940
Rajeev Kumar [Wed, 19 Jul 2017 21:41:09 +0000 (21:41 +0000)]
Merge "Data plan usage summary activity."
TreeHugger Robot [Wed, 19 Jul 2017 20:39:05 +0000 (20:39 +0000)]
Merge "Delete " / " delimiter in Settings app."
Rajeev Kumar [Wed, 19 Jul 2017 02:21:34 +0000 (19:21 -0700)]
Data plan usage summary activity.
Change-Id: Ibb0889563d432591fd00ac00d03633b1894ad124
Note: These changes are required for Data balance UI.
Bug:
62349208
Test: make RunSettingsRoboTests -j40
TreeHugger Robot [Wed, 19 Jul 2017 16:52:57 +0000 (16:52 +0000)]
Merge "Settings: Add SMS Mirroring."
Julia Reynolds [Wed, 19 Jul 2017 16:50:55 +0000 (16:50 +0000)]
Merge "Add separator to auto zen rule listing." into oc-dr1-dev am:
afe4ce0927
am:
92f2cd5055
Change-Id: Iafd82b051b0e2f83dc797338bb121cf72f29c52c
Julia Reynolds [Wed, 19 Jul 2017 16:47:56 +0000 (16:47 +0000)]
Merge "Add separator to auto zen rule listing." into oc-dr1-dev
am:
afe4ce0927
Change-Id: I91c22aeb773e32d544bb658a61e94c2b740ae5c9
Julia Reynolds [Wed, 19 Jul 2017 16:44:07 +0000 (16:44 +0000)]
Merge "Add separator to auto zen rule listing." into oc-dr1-dev
Oren Blasberg [Thu, 13 Jul 2017 13:55:15 +0000 (06:55 -0700)]
Settings: Add SMS Mirroring.
Bug:
37546615
Test: Updated Robolectric suite with new unit tests.
Change-Id: I02e1723e1b125b004ff679d6242df14bca4f08ce
Evan Laird [Tue, 18 Jul 2017 20:37:42 +0000 (16:37 -0400)]
Fix Settings manifest pointing to old class namespace
The string declaring the right fragment was never updated to the new
namespace.
Change-Id: I35809f2f35dbf290deeb69d1bc672b86f8d5a752
Fixes:
63677809
Test: make SettingsUnitTests && \
adb install -r out/target/product/<device>/data/app/SettingsUnitTests/SettingsUnitTests.apk && \
adb shell am instrument -w -e class \
com.android.settings.dream.DreamSettingsLaunchTest\
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Alex Kulesza [Wed, 19 Jul 2017 03:22:39 +0000 (03:22 +0000)]
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev am:
f21bc100a6
am:
07bd51e98d -s ours
Change-Id: I972d5171ab5b94e4a3cfa1219a23cf0143630f1b
Alex Kulesza [Wed, 19 Jul 2017 03:17:43 +0000 (03:17 +0000)]
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
am:
f21bc100a6
Change-Id: I145fa85f2a0ba2b6ff3d7fc6a586b823c959a768
TreeHugger Robot [Wed, 19 Jul 2017 03:15:29 +0000 (03:15 +0000)]
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
Phil Weaver [Wed, 19 Jul 2017 01:37:05 +0000 (01:37 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours am:
b019e2c469 am:
072d4c282e
am:
f471234779
Change-Id: I3e91645f8b821aec766c07acc34c26e8c5efd987
Phil Weaver [Wed, 19 Jul 2017 01:33:28 +0000 (01:33 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours am:
b019e2c469 am:
ce007d328d
am:
6721c9306a
Change-Id: I2d906d4ac87deb6b1acd4310ed9a9b3cb3cfb99a
Phil Weaver [Wed, 19 Jul 2017 01:26:38 +0000 (01:26 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours am:
b019e2c469
am:
072d4c282e
Change-Id: If13f37325685c98d796e24334f00e5ae9bc9a3b8
Phil Weaver [Wed, 19 Jul 2017 01:24:33 +0000 (01:24 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours am:
b019e2c469
am:
ce007d328d
Change-Id: Ic95aaeb03f2cd1d77f4c4e31967bd1d23c81738e
Phil Weaver [Wed, 19 Jul 2017 01:18:04 +0000 (01:18 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours
am:
b019e2c469
Change-Id: I936fd8c441ed20e6616f00c603d22c4551923f27
Phil Weaver [Wed, 19 Jul 2017 01:17:52 +0000 (01:17 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours
am:
b019e2c469
Change-Id: Iaa681452ab197e1afea21b76c17441939a9fc6c7
Phil Weaver [Wed, 19 Jul 2017 01:16:58 +0000 (01:16 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a am:
d68bd495ec am:
1faf81da83 am:
947133471e
am:
c64adcde84
Change-Id: I1d7272ebea3aa9fc9abaa3046bd700f697c96475
Phil Weaver [Wed, 19 Jul 2017 01:16:27 +0000 (01:16 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a am:
d68bd495ec am:
1faf81da83 am:
7aaec13b05
am:
0666f394b5
Change-Id: Ic78f3f0b0839aecb5118fdc4777c14a7b787f5ce
Phil Weaver [Wed, 19 Jul 2017 01:11:09 +0000 (01:11 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63
am:
4fc6cbfa6a -s ours
Change-Id: Iaa96265da8e054b791e5d4b7852b91f4a4ace7b2
Phil Weaver [Wed, 19 Jul 2017 01:04:40 +0000 (01:04 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a am:
d68bd495ec am:
1faf81da83
am:
947133471e
Change-Id: I791142486eb0d844483ea3eb6812f5a6f81501a0
Alex Kulesza [Thu, 29 Jun 2017 16:27:19 +0000 (12:27 -0400)]
Make time remaining estimate debug mode more reliable.
Previously, the long click handler was unregistered on first use and
never re-registered. This meant that, e.g., on plugging and unplugging
the phone, debug mode stopped working. This change moves long click
activation into restartBatteryInfoLoader().
Bug:
63133793
Test: make RunSettingsRoboTests
Merged-In: I4c25a1f05ab3718bf06faf455cf670b5460a7306
Change-Id: I4c25a1f05ab3718bf06faf455cf670b5460a7306
Phil Weaver [Wed, 19 Jul 2017 01:00:05 +0000 (01:00 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92
am:
54e508ca63
Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f