Commit Graph

38655 Commits

Author SHA1 Message Date
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
Rajeev Kumar
5984c71af2 Merge "Data plan usage summary activity." 2017-07-19 21:41:09 +00:00
TreeHugger Robot
1dcfbdb0cc Merge "Delete " / " delimiter in Settings app." 2017-07-19 20:39:05 +00:00
Rajeev Kumar
4a5e3dc6c5 Data plan usage summary activity.
Change-Id: Ibb0889563d432591fd00ac00d03633b1894ad124
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-19 12:35:24 -07:00
TreeHugger Robot
ba70d1866f Merge "Settings: Add SMS Mirroring." 2017-07-19 16:52:57 +00:00
Julia Reynolds
33e8223fe2 Merge "Add separator to auto zen rule listing." into oc-dr1-dev am: afe4ce0927
am: 92f2cd5055

Change-Id: Iafd82b051b0e2f83dc797338bb121cf72f29c52c
2017-07-19 16:50:55 +00:00
Julia Reynolds
92f2cd5055 Merge "Add separator to auto zen rule listing." into oc-dr1-dev
am: afe4ce0927

Change-Id: I91c22aeb773e32d544bb658a61e94c2b740ae5c9
2017-07-19 16:47:56 +00:00
Julia Reynolds
afe4ce0927 Merge "Add separator to auto zen rule listing." into oc-dr1-dev 2017-07-19 16:44:07 +00:00
Oren Blasberg
d33dcf13ee Settings: Add SMS Mirroring.
Bug: 37546615

Test: Updated Robolectric suite with new unit tests.

Change-Id: I02e1723e1b125b004ff679d6242df14bca4f08ce
2017-07-19 08:07:11 -07: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
Alex Kulesza
c0cc7feb6e Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev am: f21bc100a6
am: 07bd51e98d  -s ours

Change-Id: I972d5171ab5b94e4a3cfa1219a23cf0143630f1b
2017-07-19 03:22:39 +00:00
Alex Kulesza
07bd51e98d Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
am: f21bc100a6

Change-Id: I145fa85f2a0ba2b6ff3d7fc6a586b823c959a768
2017-07-19 03:17:43 +00: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
3884450e48 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
2017-07-19 01:37:05 +00:00
Phil Weaver
78f6716a6b 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
2017-07-19 01:33:28 +00:00
Phil Weaver
f471234779 Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours am: b019e2c469
am: 072d4c282e

Change-Id: If13f37325685c98d796e24334f00e5ae9bc9a3b8
2017-07-19 01:26:38 +00:00
Phil Weaver
6721c9306a Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours am: b019e2c469
am: ce007d328d

Change-Id: Ic95aaeb03f2cd1d77f4c4e31967bd1d23c81738e
2017-07-19 01:24:33 +00:00
Phil Weaver
072d4c282e Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours
am: b019e2c469

Change-Id: I936fd8c441ed20e6616f00c603d22c4551923f27
2017-07-19 01:18:04 +00:00
Phil Weaver
ce007d328d Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours
am: b019e2c469

Change-Id: Iaa681452ab197e1afea21b76c17441939a9fc6c7
2017-07-19 01:17:52 +00:00
Phil Weaver
3c958c13e7 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
2017-07-19 01:16:58 +00:00
Phil Weaver
5fd5a650f4 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
2017-07-19 01:16:27 +00:00
Phil Weaver
b019e2c469 Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
am: 4fc6cbfa6a  -s ours

Change-Id: Iaa96265da8e054b791e5d4b7852b91f4a4ace7b2
2017-07-19 01:11:09 +00:00
Phil Weaver
c64adcde84 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
2017-07-19 01:04:40 +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

Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f
2017-07-19 01:00:05 +00:00
TreeHugger Robot
a18a1cd3c9 Merge "Make time remaining estimate debug mode more reliable." 2017-07-19 01:00:04 +00:00
Phil Weaver
0666f394b5 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
2017-07-19 00:58:05 +00:00
Phil Weaver
54e508ca63 Merge "Back-port ag/2491664" into nyc-mr1-dev
am: 87c77fba92

Change-Id: Ie540995d5b499a0e87bc13c11e28c4b8adab93f3
2017-07-19 00:53:20 +00:00
TreeHugger Robot
a8cae6b71d Merge "BidiFormat wrap version code in installed app detail UI" 2017-07-19 00:52:38 +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

Change-Id: I506146a00ad79f7faad2888a0f1063a2a1c078d2
2017-07-19 00:50:50 +00:00
Phil Weaver
7aaec13b05 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

Change-Id: Ie2be7683a783e125a74b8d9383317fdf156d219c
2017-07-19 00:46:36 +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

Change-Id: Ib2b14e63463ea041575e6d884cc155972264ae91
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

Change-Id: I08371b60dbed3351a06f49bed71aaca1f46fb864
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

Change-Id: Icbc5147a6050058c78ece104f1c169673b93a373
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

Change-Id: Ib54143b47f6c1b09d2d3c5f73630aebcc1fcba33
2017-07-19 00:15:50 +00:00
Sundeep Ghuman
030b58d917 Delete " / " delimiter in Settings app.
Reference delimiter now defined in SettingsLib instead.

Bug: b/62354743
Test: NA - refactor
Change-Id: I021d7cb9b06014b27df0003634ce53ecf1089fa1
2017-07-18 17:13:57 -07:00
Phil Weaver
533c1efbc7 Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours
am: 2b8694c33d

Change-Id: Icef5847bf3eaf4c9fdce6eaaff1d642828f89477
2017-07-19 00:05:08 +00:00
Rajeev Kumar
282dab7dfe Merge "Data plan usage summary fragment." 2017-07-19 00:02:50 +00:00
Phil Weaver
2b8694c33d Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
am: 4f8be72b18  -s ours

Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76
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

Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9
2017-07-18 23:41:33 +00:00
Phil Weaver
f9d05230df Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec

Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c
2017-07-18 23:35:31 +00:00
TreeHugger Robot
74c03cd8f4 Merge "Improve search indexing time." 2017-07-18 23:33:28 +00:00
Phil Weaver
a801d5e8ec Merge "Back-port ag/2491664" into mnc-dev
am: 7b3ca9886e

Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db
2017-07-18 23:29:03 +00:00
Phil Weaver
fceaae7ec9 Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724 am: 3ae8ac0911 am: 8c1c7cae13
am: 587467249a

Change-Id: Ia5e0909a885ff68c524c023d1815bdbdd56c2237
2017-07-18 23:24:15 +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
672ac9809a 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 am: b2d3c5e392
am: 42371fc2b3

Change-Id: Iae7d283152a3bd01c3812bb020dad774ad9535dd
2017-07-18 22:45:36 +00:00
Phil Weaver
e13342c1b2 Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724 am: 3ae8ac0911 am: 8ff3fd420c
am: 058b43c382

Change-Id: I8dfa0c4cd4c3ba804894238015b175a65d63ee0a
2017-07-18 22:45:03 +00:00
Phil Weaver
587467249a Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724 am: 3ae8ac0911
am: 8c1c7cae13

Change-Id: Ic89f371e4c6d8b169ac2b3d314b74155d9c2c0bd
2017-07-18 22:38:23 +00:00