OSDN Git Service
Fan Zhang [Fri, 21 Jul 2017 18:51:14 +0000 (18:51 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am:
e09338a208
am:
8df2cef10d -s ours
Change-Id: I3156fe7bfd6f2383b18457cf4a854059c26b6f0a
Fan Zhang [Fri, 21 Jul 2017 18:23:56 +0000 (18:23 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am:
e09338a208
Change-Id: I5db6cec4b7976e338d9e49689f1530cbbb6a1259
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
Doris Ling [Fri, 21 Jul 2017 17:26:33 +0000 (17:26 +0000)]
Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev
am:
a39daa25e7
Change-Id: Iaf765d32f99018f2a6372e87523f8b83df97c584
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
Android Build Merger (Role) [Fri, 21 Jul 2017 16:27:31 +0000 (16:27 +0000)]
Merge "Zen settings screen update am:
56b748d686 am:
4faa353f02" into oc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 21 Jul 2017 16:27:18 +0000 (16:27 +0000)]
Zen settings screen update am:
56b748d686
am:
4faa353f02
Change-Id: Ifd7d390db0373561b9a5536b412373579dadc8e3
Julia Reynolds [Fri, 21 Jul 2017 16:27:00 +0000 (16:27 +0000)]
Zen settings screen update am:
56b748d686
am:
6ad9f3267b
Change-Id: I1430e8788765d33e6fd03e2739676d26964cda68
Julia Reynolds [Fri, 21 Jul 2017 16:21:25 +0000 (16:21 +0000)]
Zen settings screen update
am:
56b748d686
Change-Id: Ida9de16ee3a52fd1d06764e560411401c976ac5d
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
Android Build Merger (Role) [Fri, 21 Jul 2017 01:50:05 +0000 (01:50 +0000)]
Merge "Merge "Make the support loader activity display UI." into oc-dr1-dev am:
4ab6f77f98 am:
bb86b53a06" into oc-mr1-dev-plus-aosp
Daniel Nishi [Fri, 21 Jul 2017 01:49:39 +0000 (01:49 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev am:
4ab6f77f98
am:
bb86b53a06
Change-Id: I8fcb2b002c6007dafaeeee882a00937f4aa94e79
Daniel Nishi [Fri, 21 Jul 2017 01:49:34 +0000 (01:49 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev am:
4ab6f77f98
am:
0eae770acc
Change-Id: I0ae9bff7b69927d535656482838f1819304d82df
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: I17baf254839424d21f1588b1a7925927437b95c6
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)
Fan Zhang [Fri, 21 Jul 2017 00:41:32 +0000 (00:41 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
am:
91468e309c
Change-Id: Ib1dcebb2136f8a673e050a3d19534d3fdb309766
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
Fan Zhang [Thu, 20 Jul 2017 22:23:54 +0000 (22:23 +0000)]
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
am:
52a3b5c17d
Change-Id: I2127af952a134a9eeb17c2ee2eda6c8410a671f6
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
Android Build Merger (Role) [Thu, 20 Jul 2017 21:56:06 +0000 (21:56 +0000)]
Merge "Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am:
e4c9b7162d am:
30b97e89d4" into oc-mr1-dev-plus-aosp
Salvador Martinez [Thu, 20 Jul 2017 21:55:52 +0000 (21:55 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am:
e4c9b7162d
am:
30b97e89d4
Change-Id: I6a1d8d036380f183bb080330542f0d5090e93a1b
Salvador Martinez [Thu, 20 Jul 2017 21:55:48 +0000 (21:55 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am:
e4c9b7162d
am:
2834bcb195
Change-Id: I07ba4b0efeae47fc80c46a193aaf073ccadbc182
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: Ib105c6a9769db260e781dde61af74563735345a3
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:31:34 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
acd97be0b8 -s ours
am:
2d50ad831e -s ours
Change-Id: Ic02b25c0a6077217fbd8093ae4f55a062d62bb3f
Bill Yi [Thu, 20 Jul 2017 21:29:51 +0000 (21:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
acd97be0b8 -s ours
am:
bc1a0265c5 -s ours
Change-Id: Ife685585ed0bef93f591de8b852dd4368811af42
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: I4b9fad43198474d48c7eb5313b52f9c9314ca05f
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
Amit Mahajan [Thu, 20 Jul 2017 21:26:51 +0000 (21:26 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
c2b12c5304
am:
8ace0324ee
Change-Id: I515783259b3c57c36985e0646886a1248a47c608
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:11:45 +0000 (21:11 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
c2b12c5304
am:
9ded852f71
Change-Id: I1fc8aec7c8cfc71c707f4ea1d0f02a2a2a7c8375
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:58:48 +0000 (20:58 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
c2b12c5304
Change-Id: I536c3111a917a2d9b1f64235fb54c5face72eb74
Doris Ling [Thu, 20 Jul 2017 20:57:03 +0000 (20:57 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am:
390bb3216d
am:
1f8c5debbb
Change-Id: If600090e0b5e49682411dc42c027a206c97e3e2c
Evan Laird [Thu, 20 Jul 2017 20:56:43 +0000 (20:56 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am:
a9e2d97004
am:
e99586cfea
Change-Id: I84e08dda688ccec72c9c672813f75a3f597784e3
Doris Ling [Thu, 20 Jul 2017 20:51:19 +0000 (20:51 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am:
390bb3216d
am:
11cfc26d0a
Change-Id: I3ac60eea7ed915e891412f88479c9b5374f53299
Evan Laird [Thu, 20 Jul 2017 20:50:57 +0000 (20:50 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am:
a9e2d97004
am:
bc562b1888
Change-Id: I9c33400aa612b7c44b9199ef8564889d8a128a1b
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:43:32 +0000 (20:43 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am:
390bb3216d
Change-Id: Icfaf4162e4f43e6f91bc886e3750c2a713765e5c
Evan Laird [Thu, 20 Jul 2017 20:42:46 +0000 (20:42 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am:
a9e2d97004
Change-Id: I891ad549056df8632fd10570769c2695f6ad4384
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
Android Build Merger (Role) [Thu, 20 Jul 2017 20:10:56 +0000 (20:10 +0000)]
Merge "Merge "Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp am:
8746483a7c -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 20 Jul 2017 20:10:38 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp
am:
8746483a7c -s ours
Change-Id: I5a0e57de40ded32e9207c4ac0e5e85e89d2fde1f
Android Build Merger (Role) [Thu, 20 Jul 2017 20:10:30 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
bd3bd7d1e1 -s ours am:
29978d1ee6 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 20 Jul 2017 20:10:13 +0000 (20:10 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
bd3bd7d1e1 -s ours
am:
29978d1ee6 -s ours
Change-Id: I876d8498f240de3446cc7700ae36db901f6a8408
Bill Yi [Thu, 20 Jul 2017 20:10:11 +0000 (20:10 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
cc298f9ae6 -s ours
am:
821967eca5 -s ours
Change-Id: I5fa9fbca513f35b554126b8a86536c68dcbdf7d0
Android Build Merger (Role) [Thu, 20 Jul 2017 20:05:12 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp
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 20:04:42 +0000 (20:04 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours
am:
bd3bd7d1e1 -s ours
Change-Id: I5654af1da287c0864385a5d6e473cd2800427eb7
Bill Yi [Thu, 20 Jul 2017 20:04:41 +0000 (20:04 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours
am:
cc298f9ae6 -s ours
Change-Id: I3e0203a1fdc9f803c0f981d5dca7ad286493b4ce
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 19:58:46 +0000 (19:58 +0000)]
Import translations. DO NOT MERGE
am:
6cf2d99816 -s ours
Change-Id: Iad277ccc5f81d14255363128d400420ca70cd376
Doris Ling [Thu, 20 Jul 2017 19:33:08 +0000 (19:33 +0000)]
Move Gesture settings up one level.
am:
204ca74397
Change-Id: I01ffe71df1e0769d87f9df6cdb1d3ced39e0ba99
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)
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
Android Build Merger (Role) [Thu, 20 Jul 2017 14:27:14 +0000 (14:27 +0000)]
Merge "Merge "Zen priority settings update" into oc-dr1-dev am:
9dec71f7d7 am:
b49578e485" into oc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 20 Jul 2017 14:27:01 +0000 (14:27 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev am:
9dec71f7d7
am:
b49578e485
Change-Id: I00e748acbef7661272eae4d28f66bfde5ac854b5
Julia Reynolds [Thu, 20 Jul 2017 14:26:50 +0000 (14:26 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev am:
9dec71f7d7
am:
2ab6e2ef9e
Change-Id: Idd8c5f5602a46e595077989dc03911367f633263
Julia Reynolds [Thu, 20 Jul 2017 14:24:03 +0000 (14:24 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev
am:
9dec71f7d7
Change-Id: I1170215a15609f1ca5b4da0eeff0ecc112d9fbf3
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
TreeHugger Robot [Wed, 19 Jul 2017 01:00:04 +0000 (01:00 +0000)]
Merge "Make time remaining estimate debug mode more reliable."
Phil Weaver [Wed, 19 Jul 2017 00:58:05 +0000 (00:58 +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
Change-Id: If54ff20342b55d7c748472471993be43cd492196
OSDN Git Service
