Julia Reynolds
9dec71f7d7
Merge "Zen priority settings update" into oc-dr1-dev
2017-07-20 14:19:33 +00:00
Bill Yi
606f83bd74
Import translations. DO NOT MERGE
...
Change-Id: I1dad650eb3d6c49c1b1b8b6873a2f8a0ffe89a9c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-19 23:13:29 -07:00
Salvador Martinez
7961627680
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
2017-07-19 18:16:56 -07:00
Julia Reynolds
afe4ce0927
Merge "Add separator to auto zen rule listing." into oc-dr1-dev
2017-07-19 16:44:07 +00:00
Evan Laird
22315adb60
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
2017-07-19 10:29:16 -04:00
TreeHugger Robot
f21bc100a6
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
2017-07-19 03:15:29 +00:00
Phil Weaver
ce007d328d
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours
...
am: b019e2c469
2017-07-19 01:17:52 +00:00
Phil Weaver
b019e2c469
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
...
am: 4fc6cbfa6a
2017-07-19 01:11:09 +00:00
Alex Kulesza
2f0e60ccda
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
2017-07-19 01:04:08 +00:00
Phil Weaver
4fc6cbfa6a
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92
...
am: 54e508ca63
2017-07-19 01:00:05 +00:00
Phil Weaver
54e508ca63
Merge "Back-port ag/2491664" into nyc-mr1-dev
...
am: 87c77fba92
2017-07-19 00:53:20 +00:00
Phil Weaver
947133471e
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
2017-07-19 00:50:50 +00:00
Phil Weaver
87c77fba92
Merge "Back-port ag/2491664" into nyc-mr1-dev
2017-07-19 00:46:35 +00:00
Phil Weaver
1faf81da83
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
2017-07-19 00:40:56 +00:00
Phil Weaver
d68bd495ec
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
2017-07-19 00:31:13 +00:00
Phil Weaver
00143e1a7a
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7
...
am: f5675a9ab0
2017-07-19 00:24:40 +00:00
Phil Weaver
f5675a9ab0
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d
...
am: 533c1efbc7
2017-07-19 00:15:50 +00:00
Phil Weaver
533c1efbc7
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours
...
am: 2b8694c33d
2017-07-19 00:05:08 +00:00
Phil Weaver
2b8694c33d
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
...
am: 4f8be72b18
2017-07-18 23:58:43 +00:00
Phil Weaver
4f8be72b18
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec
...
am: f9d05230df
2017-07-18 23:41:33 +00:00
Phil Weaver
f9d05230df
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
...
am: a801d5e8ec
2017-07-18 23:35:31 +00:00
Phil Weaver
a801d5e8ec
Merge "Back-port ag/2491664" into mnc-dev
...
am: 7b3ca9886e
2017-07-18 23:29:03 +00:00
Phil Weaver
7b3ca9886e
Merge "Back-port ag/2491664" into mnc-dev
2017-07-18 23:21:17 +00:00
Phil Weaver
e76e053595
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-18 15:51:28 -07:00
Phil Weaver
8ff3fd420c
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724
...
am: 3ae8ac0911
2017-07-18 22:18:18 +00:00
Phil Weaver
3ae8ac0911
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b
...
am: ae07650724
2017-07-18 22:15:30 +00:00
Phil Weaver
ae07650724
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d
...
am: 57f1af6a0b
2017-07-18 22:11:43 +00:00
Phil Weaver
57f1af6a0b
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91
...
am: ade8640d4d
2017-07-18 22:03:51 +00:00
Phil Weaver
7c3daa9ba5
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794
...
am: ce3fef5c99
2017-07-18 21:56:10 +00:00
Phil Weaver
ade8640d4d
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours
...
am: 6fee9a5e91
2017-07-18 21:55:39 +00:00
Phil Weaver
ce3fef5c99
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c
...
am: 3099a7f794
2017-07-18 21:48:55 +00:00
Phil Weaver
6fee9a5e91
Merge "Back-port ag/2491664" into nyc-dev
...
am: 3adf585961
2017-07-18 21:44:43 +00:00
Phil Weaver
3099a7f794
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf
...
am: 7a7d6b1d0c
2017-07-18 21:43:53 +00:00
Phil Weaver
7a7d6b1d0c
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c
...
am: 2e690de9cf
2017-07-18 21:24:36 +00:00
Phil Weaver
3adf585961
Merge "Back-port ag/2491664" into nyc-dev
2017-07-18 21:23:17 +00:00
Phil Weaver
2e690de9cf
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3
...
am: a1426f209c
2017-07-18 21:13:41 +00:00
Phil Weaver
a1426f209c
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349
...
am: af26bae8b3
2017-07-18 21:09:55 +00:00
Phil Weaver
f7d3537fcd
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7
...
am: 066f79adc3
2017-07-18 21:04:27 +00:00
Phil Weaver
066f79adc3
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04
...
am: 625d4bffc7
2017-07-18 21:02:30 +00:00
Phil Weaver
af26bae8b3
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9
...
am: 55b3b1f349
2017-07-18 20:59:48 +00:00
Phil Weaver
625d4bffc7
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69
...
am: 2e2e6fcc04
2017-07-18 20:58:54 +00:00
Phil Weaver
2e2e6fcc04
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e
...
am: 85aa9ccc69
2017-07-18 20:57:24 +00:00
Lei Yu
8f8797f768
Merge "Never store battery stats for cache" into oc-dr1-dev
2017-07-18 20:55:58 +00:00
Phil Weaver
85aa9ccc69
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac
...
am: ba26fabe3e
2017-07-18 20:54:26 +00:00
Phil Weaver
55b3b1f349
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94
...
am: 46592e90a9
2017-07-18 20:54:21 +00:00
Phil Weaver
ba26fabe3e
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671
...
am: 91f4a42dac
2017-07-18 20:52:25 +00:00
Phil Weaver
91f4a42dac
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d
...
am: 57aa22c671
2017-07-18 20:49:55 +00:00
Phil Weaver
57aa22c671
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780
...
am: 5d3967338d
2017-07-18 20:47:53 +00:00
Phil Weaver
46592e90a9
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d
...
am: 4c70016a94
2017-07-18 20:47:09 +00:00
Phil Weaver
5d3967338d
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9
...
am: f6b1267780
2017-07-18 20:46:34 +00:00
