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
Phil Weaver
f5c33cd9b0
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
2017-07-18 22:37:19 +00:00
Phil Weaver
42371fc2b3
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
2017-07-18 22:28:15 +00:00
Phil Weaver
8c1c7cae13
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
2017-07-18 22:22:39 +00:00
Phil Weaver
058b43c382
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
2017-07-18 22:19:45 +00: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
Change-Id: Ib8797dc1e432871289cd528c0fe188132804e12f
2017-07-18 22:18:18 +00:00
Phil Weaver
c62bb9efd7
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
2017-07-18 22:15:51 +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
Change-Id: I43d075a57c5d327f3949408da7ed4890b0b045f4
2017-07-18 22:15:30 +00:00
Fan Zhang
3f8408e2b2
BidiFormat wrap version code in installed app detail UI
...
Change-Id: Ib592e4504331c4fc334ef5257e3d6d21c08098c0
Fix: 37862201
Test: visual
2017-07-18 15:15:10 -07:00
Phil Weaver
ae07650724
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961
-s ours am: 6fee9a5e91
am: ade8640d4d
...
am: 57f1af6a0b
Change-Id: I50c783c642a0f1a86535c2423dd335d2e4ec2999
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
Change-Id: I77a9c4c0d8ce78a02615c5e37bf1843c46a1e5d8
2017-07-18 22:03:51 +00:00
Phil Weaver
b2d3c5e392
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
2017-07-18 21:56:14 +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
Change-Id: I73eb7f86fd59536f8e9674a7406f83a3711b653e
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
Change-Id: I463a22c05f439acd264c21cb99d2700e9600b78d
2017-07-18 21:55:39 +00:00
Fan Zhang
465d79776f
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
2017-07-18 14:53:49 -07:00