OSDN Git Service
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
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
Phil Weaver [Wed, 19 Jul 2017 00:53:20 +0000 (00:53 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev
am:
87c77fba92
Change-Id: Ie540995d5b499a0e87bc13c11e28c4b8adab93f3
TreeHugger Robot [Wed, 19 Jul 2017 00:52:38 +0000 (00:52 +0000)]
Merge "BidiFormat wrap version code in installed app detail UI"
Phil Weaver [Wed, 19 Jul 2017 00:50:50 +0000 (00:50 +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
Change-Id: I506146a00ad79f7faad2888a0f1063a2a1c078d2
Phil Weaver [Wed, 19 Jul 2017 00:46:36 +0000 (00:46 +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
Change-Id: Ie2be7683a783e125a74b8d9383317fdf156d219c
Phil Weaver [Wed, 19 Jul 2017 00:46:35 +0000 (00:46 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:40:56 +0000 (00:40 +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
Change-Id: Ib2b14e63463ea041575e6d884cc155972264ae91
Phil Weaver [Wed, 19 Jul 2017 00:31:13 +0000 (00:31 +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
Change-Id: I08371b60dbed3351a06f49bed71aaca1f46fb864
Phil Weaver [Wed, 19 Jul 2017 00:24:40 +0000 (00:24 +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
Change-Id: Icbc5147a6050058c78ece104f1c169673b93a373
Phil Weaver [Wed, 19 Jul 2017 00:15:50 +0000 (00:15 +0000)]
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
Phil Weaver [Wed, 19 Jul 2017 00:05:08 +0000 (00:05 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours
am:
2b8694c33d
Change-Id: Icef5847bf3eaf4c9fdce6eaaff1d642828f89477
Rajeev Kumar [Wed, 19 Jul 2017 00:02:50 +0000 (00:02 +0000)]
Merge "Data plan usage summary fragment."
Phil Weaver [Tue, 18 Jul 2017 23:58:43 +0000 (23:58 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df
am:
4f8be72b18 -s ours
Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76
Phil Weaver [Tue, 18 Jul 2017 23:41:33 +0000 (23:41 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec
am:
f9d05230df
Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9
Phil Weaver [Tue, 18 Jul 2017 23:35:31 +0000 (23:35 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e
am:
a801d5e8ec
Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c
TreeHugger Robot [Tue, 18 Jul 2017 23:33:28 +0000 (23:33 +0000)]
Merge "Improve search indexing time."
Phil Weaver [Tue, 18 Jul 2017 23:29:03 +0000 (23:29 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
am:
7b3ca9886e
Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db
Phil Weaver [Tue, 18 Jul 2017 23:24:15 +0000 (23:24 +0000)]
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
Phil Weaver [Tue, 18 Jul 2017 23:21:17 +0000 (23:21 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
Phil Weaver [Tue, 18 Jul 2017 22:45:36 +0000 (22:45 +0000)]
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
Phil Weaver [Tue, 18 Jul 2017 22:45:03 +0000 (22:45 +0000)]
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
Phil Weaver [Tue, 18 Jul 2017 22:38:23 +0000 (22:38 +0000)]
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
Phil Weaver [Tue, 18 Jul 2017 22:37:19 +0000 (22:37 +0000)]
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:
7c3daa9ba5
am:
c62bb9efd7
Change-Id: I0c88909da60f3518b216a33aba3623c05c8ff5cf
Phil Weaver [Tue, 18 Jul 2017 22:28:15 +0000 (22:28 +0000)]
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
Change-Id: I3d42e6f17755ffd20d60cb75e04931e4b168b027
Phil Weaver [Tue, 18 Jul 2017 22:22:39 +0000 (22:22 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b am:
ae07650724
am:
3ae8ac0911
Change-Id: Ie3af58a1cfe48fadbf32d9634483571fc12c1d52
Phil Weaver [Tue, 18 Jul 2017 22:19:45 +0000 (22:19 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b am:
ae07650724 am:
3ae8ac0911
am:
8ff3fd420c
Change-Id: I6efd0f0905c346036a0d9e3392cd7b464948764a
Phil Weaver [Tue, 18 Jul 2017 22:18:18 +0000 (22:18 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b am:
ae07650724
am:
3ae8ac0911
Change-Id: Ib8797dc1e432871289cd528c0fe188132804e12f
Phil Weaver [Tue, 18 Jul 2017 22:15:51 +0000 (22:15 +0000)]
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:
7c3daa9ba5
Change-Id: I6d0d94bd7d9701e106ed3e8fe1852da5c1fedbc1
Phil Weaver [Tue, 18 Jul 2017 22:15:30 +0000 (22:15 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b
am:
ae07650724
Change-Id: I43d075a57c5d327f3949408da7ed4890b0b045f4
Fan Zhang [Tue, 18 Jul 2017 22:14:38 +0000 (15:14 -0700)]
BidiFormat wrap version code in installed app detail UI
Change-Id: Ib592e4504331c4fc334ef5257e3d6d21c08098c0
Fix:
37862201
Test: visual
Phil Weaver [Tue, 18 Jul 2017 22:11:43 +0000 (22:11 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d
am:
57f1af6a0b
Change-Id: I50c783c642a0f1a86535c2423dd335d2e4ec2999
Phil Weaver [Tue, 18 Jul 2017 22:03:51 +0000 (22:03 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91
am:
ade8640d4d
Change-Id: I77a9c4c0d8ce78a02615c5e37bf1843c46a1e5d8
Phil Weaver [Tue, 18 Jul 2017 21:56:14 +0000 (21:56 +0000)]
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
Change-Id: Ie8bbee7db53b887311684ead2b2bd9d82ff8ba58
Phil Weaver [Tue, 18 Jul 2017 21:56:10 +0000 (21:56 +0000)]
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
Change-Id: I73eb7f86fd59536f8e9674a7406f83a3711b653e
Phil Weaver [Tue, 18 Jul 2017 21:55:39 +0000 (21:55 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours
am:
6fee9a5e91
Change-Id: I463a22c05f439acd264c21cb99d2700e9600b78d
Fan Zhang [Mon, 17 Jul 2017 18:08:09 +0000 (11:08 -0700)]
Improve search indexing time.
- Some import clean up.
- Add timing log to track indexing time breakdown.
- Remove isAvailable() from UserDictionaryPreferenceController.
Bug:
36391685
Test: rebuild
Change-Id: If154c5dafba5d21cb1020497c44fbf67f03ad820
Rajeev Kumar [Sat, 15 Jul 2017 02:40:56 +0000 (19:40 -0700)]
Data plan usage summary fragment.
Change-Id: I2d928d1b5313b723450c8f5a45ff944b99dc3d5d
Note: These changes are required for Data balance UI.
Bug:
62349208
Test: make RunSettingsRoboTests -j40
Phil Weaver [Tue, 18 Jul 2017 21:48:55 +0000 (21:48 +0000)]
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
Change-Id: Ib02617e2779b6da6569182cd94936dafc07b7422
Phil Weaver [Tue, 18 Jul 2017 21:44:43 +0000 (21:44 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev
am:
3adf585961 -s ours
Change-Id: I8ba7e805110028752e1968e38ac548fcd4194438
Phil Weaver [Tue, 18 Jul 2017 21:43:53 +0000 (21:43 +0000)]
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
Change-Id: I7a12d05b79c4a78e14fccf5288c9bea50ae4c4d9
Phil Weaver [Tue, 18 Jul 2017 21:24:36 +0000 (21:24 +0000)]
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
Change-Id: Idb805deec53765994f5ed8a1bd7b1f56d6717b3b
Phil Weaver [Tue, 18 Jul 2017 21:23:17 +0000 (21:23 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 21:13:41 +0000 (21:13 +0000)]
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
Change-Id: I410bcb403ace5044da8f98fadbb622a44d21021b
Phil Weaver [Tue, 18 Jul 2017 21:09:55 +0000 (21:09 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349
am:
af26bae8b3
Change-Id: I0dc45ca53a9c60c830795d6686a0d86efa356f4e
Phil Weaver [Tue, 18 Jul 2017 21:09:28 +0000 (21:09 +0000)]
Merge "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 am:
f7d3537fcd" into oc-dr1-dev-plus-aosp
am:
aa0772ff7e
Change-Id: I310d25174d3c24c749f4d77c29eb154ef4ed7cf6
Phil Weaver [Tue, 18 Jul 2017 21:08:56 +0000 (21:08 +0000)]
Android Build Merger (Role) [Tue, 18 Jul 2017 21:06:44 +0000 (21:06 +0000)]
Phil Weaver [Tue, 18 Jul 2017 21:06:27 +0000 (21:06 +0000)]
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
am:
e8f916bf97
Change-Id: Ibeb5914563f0e67d8919b2cc2ddf100d5eba70b8
Phil Weaver [Tue, 18 Jul 2017 21:06:27 +0000 (21:06 +0000)]
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
am:
f7d3537fcd
Change-Id: If19362bb1a73a34b2783d6c1777aef37d7f8941e
Lei Yu [Tue, 18 Jul 2017 21:06:25 +0000 (21:06 +0000)]
Merge "Never store battery stats for cache" into oc-dr1-dev am:
8f8797f768
am:
c150df6f8e
Change-Id: Iea0ac999b8f4dea20e0252b91b3013a5740ce353
Lei Yu [Tue, 18 Jul 2017 21:04:29 +0000 (21:04 +0000)]
Merge "Never store battery stats for cache" into oc-dr1-dev
am:
8f8797f768
Change-Id: I7b0408d12da25e4a89091110e78a9cdb60993d75
Phil Weaver [Tue, 18 Jul 2017 21:04:27 +0000 (21:04 +0000)]
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
Change-Id: I9d4b01aff8483315c34874052bc1dca69f9be680
Phil Weaver [Tue, 18 Jul 2017 21:04:27 +0000 (21:04 +0000)]
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
Change-Id: I3645f94b7220a956a95e13350e51e49a41204dcb
Phil Weaver [Tue, 18 Jul 2017 21:02:30 +0000 (21:02 +0000)]
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
Change-Id: Idb85f53bc0ad17856ee65b4cc2240bef6710851c
Phil Weaver [Tue, 18 Jul 2017 20:59:48 +0000 (20:59 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9
am:
55b3b1f349
Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2
Phil Weaver [Tue, 18 Jul 2017 20:58:54 +0000 (20:58 +0000)]
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
Change-Id: I2d9d6a7fb0ac1d88a4e910e9e23e7160bbfcdafd
Phil Weaver [Tue, 18 Jul 2017 20:57:24 +0000 (20:57 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671 am:
91f4a42dac am:
ba26fabe3e
am:
85aa9ccc69
Change-Id: I8d411e2b84113763c49ec5c627f966da662a42b6
Lei Yu [Tue, 18 Jul 2017 20:55:58 +0000 (20:55 +0000)]
Merge "Never store battery stats for cache" into oc-dr1-dev
Phil Weaver [Tue, 18 Jul 2017 20:54:26 +0000 (20:54 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671 am:
91f4a42dac
am:
ba26fabe3e
Change-Id: I78f285821bc170c9a32b6e911e38826123c81820
Phil Weaver [Tue, 18 Jul 2017 20:54:21 +0000 (20:54 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94
am:
46592e90a9
Change-Id: If666cdb52e2565e889fd026917eaea20502ca59e
Phil Weaver [Tue, 18 Jul 2017 20:52:25 +0000 (20:52 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671
am:
91f4a42dac
Change-Id: Iaf412cbcc4b9a3513ba27672ae2e1cfc04e57da5
Phil Weaver [Tue, 18 Jul 2017 20:49:55 +0000 (20:49 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d
am:
57aa22c671
Change-Id: Ia487b2e3c0ee6c4eace1502704fda873e3690300
Phil Weaver [Tue, 18 Jul 2017 20:47:53 +0000 (20:47 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780
am:
5d3967338d
Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c
Phil Weaver [Tue, 18 Jul 2017 20:47:09 +0000 (20:47 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d
am:
4c70016a94
Change-Id: I0b78bc04741d8b0d2d7af292484a025d0c62fd6a
Phil Weaver [Tue, 18 Jul 2017 20:46:34 +0000 (20:46 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9
am:
f6b1267780
Change-Id: I2e61b6da4262cf05ca30e2c2d505eb9cae017a9a
Pengfei Zhao [Tue, 18 Jul 2017 20:42:02 +0000 (20:42 +0000)]
Merge "Fix Settings crash when setting only decimal point to data usage warning" am:
3a2e327741 am:
dfe237f2cf am:
d1dbc81145
am:
76b1817685
Change-Id: If62e23d750b55a292852b2bda8ab46299a7e8aea
Phil Weaver [Tue, 18 Jul 2017 20:38:01 +0000 (20:38 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3
am:
4b029f8b0d
Change-Id: Ibedf70b6b6b14d51ba482f28f2db9c04c10457d6
Pengfei Zhao [Tue, 18 Jul 2017 20:36:56 +0000 (20:36 +0000)]
Merge "Fix Settings crash when setting only decimal point to data usage warning" am:
3a2e327741 am:
dfe237f2cf
am:
d1dbc81145
Change-Id: Ia9ac501c7d67bec0465f6019a1ba52ad863b6da0
Phil Weaver [Tue, 18 Jul 2017 20:35:06 +0000 (20:35 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours
am:
9d889600a9
Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f
Pengfei Zhao [Tue, 18 Jul 2017 20:34:42 +0000 (20:34 +0000)]
Merge "Fix Settings crash when setting only decimal point to data usage warning" am:
3a2e327741
am:
dfe237f2cf
Change-Id: Ic88ad971e2bf0784e9062d5dabe3e4c9def1eb51
Pengfei Zhao [Tue, 18 Jul 2017 20:31:57 +0000 (20:31 +0000)]
Merge "Fix Settings crash when setting only decimal point to data usage warning"
am:
3a2e327741
Change-Id: Ic25c64da40b1accb9dce63a63462acd01664e054
Phil Weaver [Tue, 18 Jul 2017 20:28:31 +0000 (20:28 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b
am:
c84dc8feb3
Change-Id: Ia81f4d5e0e9d433e33e19a70a9f63a6cc2afb79a
Phil Weaver [Tue, 18 Jul 2017 20:25:56 +0000 (20:25 +0000)]
Back-port ag/
2491664 am:
1d21738bd6
am:
4150739791 -s ours
Change-Id: I580b7232fcbe2c2025d2fd35e7f04ddf1255fd6b
Treehugger Robot [Tue, 18 Jul 2017 20:24:35 +0000 (20:24 +0000)]
Merge "Fix Settings crash when setting only decimal point to data usage warning"
TreeHugger Robot [Tue, 18 Jul 2017 19:52:30 +0000 (19:52 +0000)]
Merge "Check the tintable metadata before tinting tile icon."
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
Change-Id: I4c25a1f05ab3718bf06faf455cf670b5460a7306
Charles He [Tue, 18 Jul 2017 18:47:34 +0000 (18:47 +0000)]
Merge "Disable always-on VPN options if an app has opted out."
Phil Weaver [Tue, 18 Jul 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c
am:
cbbdc18c7b
Change-Id: I3cb41508ce487f1d4a21517c86ef57f9cc041705
OSDN Git Service
