OSDN Git Service
Geoff Mendal [Mon, 1 Jun 2015 15:25:10 +0000 (15:25 +0000)]
am
408606f3: (-s ours) am
78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
408606f31eb126bad9a8c1da28026ffe9c4943f4':
Import translations. DO NOT MERGE
Xiyuan Xia [Mon, 1 Jun 2015 15:25:02 +0000 (15:25 +0000)]
am
223826b3: am
e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
* commit '
223826b3cd1c7dc00706efc137b8a4dcaf7595fa':
Avoid keyguard UI layout dimensions underflow
Geoff Mendal [Mon, 1 Jun 2015 15:24:55 +0000 (15:24 +0000)]
am
7ec9264f: (-s ours) am
642c4fc5: (-s ours) Import translations. DO NOT MERGE
* commit '
7ec9264f40087f48dcab821c65a93f8628dd0e93':
Import translations. DO NOT MERGE
Narayan Kamath [Mon, 1 Jun 2015 15:24:49 +0000 (15:24 +0000)]
am
2de63d7c: am
d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev
* commit '
2de63d7cc1398fe699cc2a16b47647674e4efb64':
Avoid inspecting packages twice to deduce ABIs for moves / installs.
John Spurlock [Mon, 1 Jun 2015 15:24:42 +0000 (15:24 +0000)]
am
015a95ff: am
6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
* commit '
015a95ff35e5e9de959c10d082fbe2e10c58885c':
Zen: Use account name instead of calendar id in event conditions.
Selim Cinek [Mon, 1 Jun 2015 15:24:32 +0000 (15:24 +0000)]
am
4dbe7c0d: am
ff3bf4b1: Increased the falsing treashold for quick settings
* commit '
4dbe7c0d16944ba4b8df4216f730acfc06818eca':
Increased the falsing treashold for quick settings
Dirk Dougherty [Mon, 1 Jun 2015 15:24:23 +0000 (15:24 +0000)]
am
4b9d724c: am
34cca12b: am
906a91b4: am
08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
* commit '
4b9d724cd666bdad3703f383be8c024f4a6016a1':
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
David Friedman [Mon, 1 Jun 2015 15:24:15 +0000 (15:24 +0000)]
am
bc0e7f28: am
95af201a: am
2ed3a89c: am
90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '
bc0e7f287599e90a44ab249ba2fc0673ddfaf609':
Docs: Corrects technical content of one sentence, and deletes another.
Guang Zhu [Mon, 1 Jun 2015 15:24:03 +0000 (15:24 +0000)]
am
0ca15144: am
9bb76544: fix NPE in shutdown thread
* commit '
0ca15144e375e7439a64fabcbb53d6813135cfc4':
fix NPE in shutdown thread
Andrew Solovay [Mon, 1 Jun 2015 15:23:55 +0000 (15:23 +0000)]
am
74f4e4f1: am
832654a8: am
2f85475c: am
7d36a250: docs: Quick spelling fix
* commit '
74f4e4f1b8016a586d6a0b3ca6ebe06840c21573':
docs: Quick spelling fix
Sungsoo Lim [Mon, 1 Jun 2015 15:23:46 +0000 (15:23 +0000)]
am
f819ac38: am
6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev
* commit '
f819ac38a9647a8d7d00bca83f176e32a415517e':
Send a message with data in MediaController.MessageHandler.post()
Yorke Lee [Mon, 1 Jun 2015 15:23:37 +0000 (15:23 +0000)]
am
923df3da: am
d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
* commit '
923df3da935b006b983ea1837538f6baecf26b86':
Make ACTION_CONNECTION_SERVICE_CONFIGURE public
Glenn Kasten [Mon, 1 Jun 2015 15:23:23 +0000 (15:23 +0000)]
am
a84e73a7: am
ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev
* commit '
a84e73a7bc99e4ef5c50125400d319a4124b4296':
Improve error handling for AudioTrack write with PTS
Raph Levien [Mon, 1 Jun 2015 15:23:16 +0000 (15:23 +0000)]
am
023973ec: am
71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
* commit '
023973ecc66c62f2b83d9154097bb370966ed96d':
Use getRunAdvance to position cursor
Alan Viverette [Mon, 1 Jun 2015 15:23:09 +0000 (15:23 +0000)]
am
4e419432: am
a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev
* commit '
4e419432e1717de6154ea5c8177c519fe449b8f0':
Synchronize Theme.Material and Theme.Material light attributes
Makoto Onuki [Mon, 1 Jun 2015 15:23:03 +0000 (15:23 +0000)]
am
8c48834b: am
0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev
* commit '
8c48834b112cf10d43bacd668aadf6f3cf4a9ad1':
CountryDetector no longer requires location permissions.
Yohei Yukawa [Mon, 1 Jun 2015 15:22:58 +0000 (15:22 +0000)]
am
92086e06: am
5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
* commit '
92086e06ad3167ebfadbc746d32e86c335878a8f':
Rely on IMM#focusOut() to close input session.
Brian Attwell [Mon, 1 Jun 2015 15:22:52 +0000 (15:22 +0000)]
am
4ababd27: am
19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
* commit '
4ababd27401db430afb2f30d29efce972f8b1ccb':
Rename "end" to "endExclusive" in addPhoneTtsSpan
Alan Viverette [Mon, 1 Jun 2015 15:22:47 +0000 (15:22 +0000)]
am
9ddcef8e: am
3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev
* commit '
9ddcef8eec56bd161d8f8e91c854b740232f6a64':
Postpone AnimatedVectorDrawable animator inflation until applyTheme()
Andres Morales [Mon, 1 Jun 2015 15:22:42 +0000 (15:22 +0000)]
am
8d61ab00: am
a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
* commit '
8d61ab0003e26952349a959a4a38d3ebdea664d0':
[partition checking] re-enable bootimage/bootloader, add recovery
Neil Fuller [Mon, 1 Jun 2015 12:26:01 +0000 (12:26 +0000)]
am
59b24040: am
e761938c: Merge "Fix javadocs based on recent case consistency change"
* commit '
59b240404f19f3450e710e07a90d4e8d35fabcaf':
Fix javadocs based on recent case consistency change
Neil Fuller [Mon, 1 Jun 2015 12:14:47 +0000 (12:14 +0000)]
am
e761938c: Merge "Fix javadocs based on recent case consistency change"
* commit '
e761938c39c1cafa80d0c474e107041316a49cbd':
Fix javadocs based on recent case consistency change
Neil Fuller [Mon, 1 Jun 2015 12:01:44 +0000 (12:01 +0000)]
Merge "Fix javadocs based on recent case consistency change"
Chad Brubaker [Fri, 29 May 2015 21:44:34 +0000 (21:44 +0000)]
am
0189c6ef: am
dd783301: Merge "Add optional additional entropy to finish"
* commit '
0189c6efed4f36db0661d827d998a49bc34ece12':
Add optional additional entropy to finish
Chad Brubaker [Fri, 29 May 2015 21:31:52 +0000 (21:31 +0000)]
am
dd783301: Merge "Add optional additional entropy to finish"
* commit '
dd78330140ad0e02fc693fc1f5bf041adcf64a1f':
Add optional additional entropy to finish
Chad Brubaker [Fri, 29 May 2015 21:17:54 +0000 (21:17 +0000)]
Merge "Add optional additional entropy to finish"
Chad Brubaker [Fri, 29 May 2015 19:32:51 +0000 (12:32 -0700)]
Add optional additional entropy to finish
If provided the extra entropy will be added to the device before calling
finish. If entropy is provided and the device does not support supplying
additional entropy then finish will fail with KM_ERROR_UNIMPLEMENTED.
Change-Id: If26be118bf382604f6f8e96e833b76e6f9e94d58
Geoff Mendal [Fri, 29 May 2015 19:19:41 +0000 (19:19 +0000)]
am
78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
78a247da5f21415657a9ab6f20d4d8449a13f734':
Import translations. DO NOT MERGE
Xiyuan Xia [Fri, 29 May 2015 19:19:27 +0000 (19:19 +0000)]
am
e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
* commit '
e103029dbc457596661ae4066aabcb2a35f07dfd':
Avoid keyguard UI layout dimensions underflow
Geoff Mendal [Fri, 29 May 2015 19:19:20 +0000 (19:19 +0000)]
am
642c4fc5: (-s ours) Import translations. DO NOT MERGE
* commit '
642c4fc527da40cf4697d3630bdebdfc1044ab82':
Import translations. DO NOT MERGE
Narayan Kamath [Fri, 29 May 2015 19:18:51 +0000 (19:18 +0000)]
am
d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev
* commit '
d644c5638180d5d4218f34e1afb9e7782fc52e49':
Avoid inspecting packages twice to deduce ABIs for moves / installs.
John Spurlock [Fri, 29 May 2015 19:18:45 +0000 (19:18 +0000)]
am
6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
* commit '
6a2999073ce4d4ac203e7e2d7b40aaaa794851d4':
Zen: Use account name instead of calendar id in event conditions.
Selim Cinek [Fri, 29 May 2015 19:18:36 +0000 (19:18 +0000)]
am
ff3bf4b1: Increased the falsing treashold for quick settings
* commit '
ff3bf4b12f87d9aa552f517989f2b0dda4e43cc5':
Increased the falsing treashold for quick settings
Dirk Dougherty [Fri, 29 May 2015 19:18:31 +0000 (19:18 +0000)]
am
34cca12b: am
906a91b4: am
08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
* commit '
34cca12bbda96ea8aad86b0455eb61e4674a4616':
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
David Friedman [Fri, 29 May 2015 19:18:26 +0000 (19:18 +0000)]
am
95af201a: am
2ed3a89c: am
90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '
95af201aead0ce7dc5326220dd3ee8619a237ae6':
Docs: Corrects technical content of one sentence, and deletes another.
Guang Zhu [Fri, 29 May 2015 19:18:19 +0000 (19:18 +0000)]
am
9bb76544: fix NPE in shutdown thread
* commit '
9bb765448df43d41e0a3edb7de1d1641c9251c35':
fix NPE in shutdown thread
Andrew Solovay [Fri, 29 May 2015 19:18:09 +0000 (19:18 +0000)]
am
832654a8: am
2f85475c: am
7d36a250: docs: Quick spelling fix
* commit '
832654a8574b4371b5dc69216dd0b8377368fb5c':
docs: Quick spelling fix
Sungsoo Lim [Fri, 29 May 2015 19:18:01 +0000 (19:18 +0000)]
am
6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev
* commit '
6dddc7d1a9ed7f94e37dd6127664e02e25ceb6c8':
Send a message with data in MediaController.MessageHandler.post()
Geoff Mendal [Fri, 29 May 2015 14:49:43 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:27:57 +0000 (07:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I08da4367a1ba723e7dfb701f47fba96b548e7f86
Auto-generated-cl: translation import
Xiyuan Xia [Fri, 29 May 2015 14:24:20 +0000 (14:24 +0000)]
Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:10:35 +0000 (09:10 -0500)]
Import translations. DO NOT MERGE
Change-Id: I6fbaa6bb785894851b344f414fe5c8f830adbde3
Auto-generated-cl: translation import
Narayan Kamath [Fri, 29 May 2015 14:04:40 +0000 (14:04 +0000)]
Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev
Narayan Kamath [Thu, 28 May 2015 10:23:57 +0000 (11:23 +0100)]
Avoid inspecting packages twice to deduce ABIs for moves / installs.
In the case of moves, we can use the existing ABIs from settings because
a move will not result in an ABI change. For new installs, we can just
use the ABI we deduced for compiling (dex2oat) the package.
bug:
21144503
Change-Id: I35e2e8abd47f547b6252271fc6b41d30719c4298
John Spurlock [Fri, 29 May 2015 13:22:31 +0000 (13:22 +0000)]
Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
Selim Cinek [Fri, 29 May 2015 12:39:08 +0000 (05:39 -0700)]
Increased the falsing treashold for quick settings
Bug:
21433654
Change-Id: I593297e4577a40762e926353da046a53b9876245
Narayan Kamath [Fri, 29 May 2015 09:58:32 +0000 (10:58 +0100)]
resolved conflicts for merge of
57e82aad to mnc-dev-plus-aosp
Change-Id: Ib895c959b7403f959f326881a1dea4b81dda73e3
Narayan Kamath [Fri, 29 May 2015 09:43:23 +0000 (09:43 +0000)]
am
d6acfc62: am
90cfc192: Merge "Close race condition in binderDied()"
* commit '
d6acfc6219fd6a47b267e8f31a83773862759890':
Close race condition in binderDied()
Narayan Kamath [Fri, 29 May 2015 09:39:43 +0000 (09:39 +0000)]
am
4993da92: Merge "Patches for IKeyguardStateCallback"
* commit '
4993da924c6f25194aded71e70eefd07208eee81':
Patches for IKeyguardStateCallback
Narayan Kamath [Fri, 29 May 2015 09:26:16 +0000 (09:26 +0000)]
Merge "Patches for IKeyguardStateCallback"
dooyoung.hwang [Thu, 21 May 2015 07:09:43 +0000 (16:09 +0900)]
Patches for IKeyguardStateCallback
1. Also notify input is restricted or not when IKeyguardStateCallback callback is added.
When first Keyguard is showing after boot, the mInputRestricted is not updated. So,
inKeyguardRestrictedInputMode still returns false, although device is locked.
2. If mShowing remains false during setup time of KeyguardViewMediator, mInputRestricted
is not updated. This is because updateInputRestrictedLocked is called only if showing
value is changed during setup time.
For this reason, when device is not provisioned, inKeyguardRestrictedInputMode returns
false, and device does not restrict key.
3. If one of callbacks causes RemoteException, the other callbacks are not called.
This is because catching RemoteException breaks for-loop.
Change-Id: I0281405127bcc75285b908d01485da3ac9b40b52
Signed-off-by: Dooyoung Hwang <dooyoung.hwang@lge.com>
Narayan Kamath [Fri, 29 May 2015 09:25:16 +0000 (09:25 +0000)]
am
90cfc192: Merge "Close race condition in binderDied()"
* commit '
90cfc1923ae0a9fe98b97d123b2250f01e8bc3f2':
Close race condition in binderDied()
Narayan Kamath [Fri, 29 May 2015 08:34:02 +0000 (08:34 +0000)]
Merge "Close race condition in binderDied()"
Christopher Tate [Wed, 20 May 2015 01:16:58 +0000 (18:16 -0700)]
Close race condition in binderDied()
It was possible for a binderDied() call to occur while the death
recipient list containing the object was being iterated, in which
case we could invalidate an object reference out from under the
iteration, causing a VM abort. We now interlock the binderDied()
deref operation with the list's locking semantics to prevent this.
Bug
15831054
(cherry picked from commit
090c08ff2a7525c830b4edfd1a79aa8ee3893c60)
Change-Id: If0027d3ac4da1153284a425dd9b2819a203481ab
Dirk Dougherty [Fri, 29 May 2015 07:00:58 +0000 (07:00 +0000)]
am
906a91b4: am
08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
* commit '
906a91b4e794015bb2609ded232bb50d4478c3c7':
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
Dirk Dougherty [Fri, 29 May 2015 06:48:57 +0000 (06:48 +0000)]
am
08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
* commit '
08710f1b69e2188a439b54f1ae59a574f71681d0':
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
Dirk Dougherty [Fri, 29 May 2015 05:01:36 +0000 (22:01 -0700)]
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
Change-Id: I7824c45a81078c1527a5b8bc20b2a9ac6773a5ad
David Friedman [Fri, 29 May 2015 05:45:00 +0000 (05:45 +0000)]
am
2ed3a89c: am
90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '
2ed3a89c1b6c57b45b08ab9e6bcf29c33d82cdd2':
Docs: Corrects technical content of one sentence, and deletes another.
David Friedman [Fri, 29 May 2015 05:31:56 +0000 (05:31 +0000)]
am
90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '
90042a5f8c987582736f4eed714aeba9416003c6':
Docs: Corrects technical content of one sentence, and deletes another.
David Friedman [Fri, 29 May 2015 04:07:46 +0000 (21:07 -0700)]
Docs: Corrects technical content of one sentence, and deletes another.
Change-Id: Iaf894f9d9d68e4e2be9a1d1f8173b83a781241f4
Guang Zhu [Fri, 29 May 2015 03:50:03 +0000 (20:50 -0700)]
fix NPE in shutdown thread
null reboot reason is used when it's a simple reboot.
Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f
Andrew Solovay [Fri, 29 May 2015 02:28:05 +0000 (02:28 +0000)]
am
2f85475c: am
7d36a250: docs: Quick spelling fix
* commit '
2f85475c18d68d8719f20e4385dccb3ba0117d1a':
docs: Quick spelling fix
Yorke Lee [Fri, 29 May 2015 02:23:34 +0000 (02:23 +0000)]
am
d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
* commit '
d600966c396ce457062795893a7972f3bf2b3617':
Make ACTION_CONNECTION_SERVICE_CONFIGURE public
Glenn Kasten [Fri, 29 May 2015 02:23:22 +0000 (02:23 +0000)]
am
ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev
* commit '
ad43220384f2ee1627397cafeac34144dbfda8d6':
Improve error handling for AudioTrack write with PTS
Raph Levien [Fri, 29 May 2015 02:23:16 +0000 (02:23 +0000)]
am
71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
* commit '
71a2876497385cd61083cf3a7a86db068ae4b0b3':
Use getRunAdvance to position cursor
Alan Viverette [Fri, 29 May 2015 02:23:07 +0000 (02:23 +0000)]
am
a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev
* commit '
a4d66f3933d2369a87e7c3d36e69244ff2029e74':
Synchronize Theme.Material and Theme.Material light attributes
Makoto Onuki [Fri, 29 May 2015 02:23:01 +0000 (02:23 +0000)]
am
0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev
* commit '
0d889cdeb78410cd4cb7f05d7fa4820985f0d679':
CountryDetector no longer requires location permissions.
Yohei Yukawa [Fri, 29 May 2015 02:22:52 +0000 (02:22 +0000)]
am
5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
* commit '
5176b5451a8447de3ff86712a95efd6af93aa556':
Rely on IMM#focusOut() to close input session.
Brian Attwell [Fri, 29 May 2015 02:22:46 +0000 (02:22 +0000)]
am
19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
* commit '
19d9d0ca2e95eca34e8f7b28023aa10f15d82f88':
Rename "end" to "endExclusive" in addPhoneTtsSpan
Alan Viverette [Fri, 29 May 2015 02:22:41 +0000 (02:22 +0000)]
am
3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev
* commit '
3c436cb99f1cc0db82e342fb9dc145fd524f5029':
Postpone AnimatedVectorDrawable animator inflation until applyTheme()
Andres Morales [Fri, 29 May 2015 02:22:33 +0000 (02:22 +0000)]
am
a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
* commit '
a5705a4ada8e719ebf73ed757c514b74785e7ae3':
[partition checking] re-enable bootimage/bootloader, add recovery
Andrew Solovay [Fri, 29 May 2015 02:15:04 +0000 (02:15 +0000)]
am
7d36a250: docs: Quick spelling fix
* commit '
7d36a25097099b958262e90d22992ce4cac485c9':
docs: Quick spelling fix
John Spurlock [Fri, 29 May 2015 02:13:03 +0000 (22:13 -0400)]
Zen: Use account name instead of calendar id in event conditions.
- Migrate the existing calendar attribute in the event condition
from a long calendar id to the calendar account name. More
portable across a backup/restore.
- Also skip restoring transient state (like the current condition
state) from restored automatic rules.
Bug:
17755700
Change-Id: I9bdb421d2209e3ce90873008665c254d67c788d2
Sungsoo Lim [Fri, 29 May 2015 01:36:57 +0000 (01:36 +0000)]
Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev
Andrew Solovay [Fri, 29 May 2015 01:33:29 +0000 (18:33 -0700)]
docs: Quick spelling fix
Fix is quick and the misspelling was embarassing (spelled channel as
"chanel" three times) so I'm just going to +2 this myself.
Change-Id: Icc4dcd5f47ba2337db29cc81b6afe426e6986e95
Yorke Lee [Fri, 29 May 2015 00:55:11 +0000 (00:55 +0000)]
Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
Yohei Yukawa [Fri, 29 May 2015 00:29:14 +0000 (00:29 +0000)]
am
98e88900: am
85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev
* commit '
98e8890022119bc9d053b55d2f05617b6d7bacb9':
Clear the inset of previous IME when necessary.
Santos Cordon [Fri, 29 May 2015 00:29:02 +0000 (00:29 +0000)]
am
5144a0d8: am
7cb0925e: Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev
* commit '
5144a0d8c9e054bc361cc7c860e1a2baff865c6a':
Add extras to Connections/Calls. (1/3)
Amit Mahajan [Fri, 29 May 2015 00:28:57 +0000 (00:28 +0000)]
am
f1ff9cb2: am
ff0c25ce: Merge "Cleaning up logging in TelephonyManager." into mnc-dev
* commit '
f1ff9cb2ee598e68f419a1b7a0fc5a8e3f140e3a':
Cleaning up logging in TelephonyManager.
David Friedman [Fri, 29 May 2015 00:28:51 +0000 (00:28 +0000)]
am
9fa1be21: am
36756947: am
c397dde1: am
92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
* commit '
9fa1be2155db6af01cbe8762ec64639034c645fd':
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
Glenn Kasten [Fri, 29 May 2015 00:12:53 +0000 (00:12 +0000)]
Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev
Raph Levien [Fri, 29 May 2015 00:05:07 +0000 (00:05 +0000)]
Merge "Use getRunAdvance to position cursor" into mnc-dev
Alan Viverette [Thu, 28 May 2015 23:55:30 +0000 (23:55 +0000)]
Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev
Makoto Onuki [Thu, 28 May 2015 23:54:08 +0000 (23:54 +0000)]
Merge "CountryDetector no longer requires location permissions." into mnc-dev
Yohei Yukawa [Thu, 28 May 2015 23:52:49 +0000 (23:52 +0000)]
Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
Alan Viverette [Thu, 28 May 2015 23:52:29 +0000 (16:52 -0700)]
Synchronize Theme.Material and Theme.Material light attributes
Adds a few attributes that were missing from either theme, ensures all
the attributes match up so that it's easier to scan through for errors.
Bug:
21490615
Change-Id: Iabfed8f61a7bc121e618164dee4121c41e82db09
Brian Attwell [Thu, 28 May 2015 23:43:39 +0000 (23:43 +0000)]
Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
Alan Viverette [Thu, 28 May 2015 23:43:22 +0000 (23:43 +0000)]
Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev
Andres Morales [Thu, 28 May 2015 23:41:03 +0000 (23:41 +0000)]
Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
Raph Levien [Thu, 28 May 2015 23:16:24 +0000 (16:16 -0700)]
Use getRunAdvance to position cursor
TextLine used to use getTextRunAdvances on a substring to compute a
cursor position, but this had a number of problems, especially when
the substring is a wider than the full string (as can happen in
certain Tamil ligatures).
This patch changes the implementation to use getRunAdvance, which was
explicitly designed for this use case.
We should also change Layout.getHorizontal to use the dual
getOffsetForAdvance, but that's basically a performance optimization,
the functionality should be basically equivalent.
Bug:
21125816
Change-Id: I669b85eaecfbf6f7aa6c6a9dddbf1a210eb94571
Yohei Yukawa [Thu, 28 May 2015 23:35:28 +0000 (23:35 +0000)]
am
85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev
* commit '
85b883cae410bd2b8e1dc5c34265ed253d758e86':
Clear the inset of previous IME when necessary.
Doris Liu [Thu, 28 May 2015 23:30:29 +0000 (23:30 +0000)]
am
c11c1890: am
a9ac8354: Merge "Clean up calls to Rect.intersect()" into mnc-dev
* commit '
c11c1890f6478498de0ca30b720b628b0fbce45b':
Clean up calls to Rect.intersect()
Glenn Kasten [Thu, 28 May 2015 23:30:22 +0000 (23:30 +0000)]
am
b182d570: am
626f0dc7: Merge "Deprecations are warnings not errors" into mnc-dev
* commit '
b182d570c46330e95301dd46bc15c1b631e9ca42':
Deprecations are warnings not errors
Chris Craik [Thu, 28 May 2015 23:30:17 +0000 (23:30 +0000)]
am
7b2c58b3: am
da28c868: Merge "Fix round cap approximation to understand scale" into mnc-dev
* commit '
7b2c58b3e5a4c5b901a246b512d68273b7ae7b41':
Fix round cap approximation to understand scale
David Friedman [Thu, 28 May 2015 23:30:11 +0000 (23:30 +0000)]
am
aa720a99: am
b3af4f43: am
9ffbf9bd: am
ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
* commit '
aa720a99d5318004f8e7f1ff222ea42ecaf3a4ca':
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
Quddus Chong [Thu, 28 May 2015 23:30:05 +0000 (23:30 +0000)]
am
987e2403: am
2f9f8a38: am
01c4d8d3: am
dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
* commit '
987e2403ea67ab07f8c3a53f3547beb4d3b14608':
docs: Fixed training TOC formatting and broken link in TV training landing.
Wale Ogunwale [Thu, 28 May 2015 23:29:58 +0000 (23:29 +0000)]
am
0dbc5b58: am
c7cbdd11: Merge "Don\'t kill process with active service/receiver when task is removed." into mnc-dev
* commit '
0dbc5b582c40bf8830362fe0bb5b64d100d7fe5d':
Don't kill process with active service/receiver when task is removed.
Chris Craik [Thu, 28 May 2015 23:29:52 +0000 (23:29 +0000)]
am
94cb7ef3: am
2df124b8: Merge "Fix build" into mnc-dev
* commit '
94cb7ef35046c9dc9d94a3bfff18f695d635a308':
Fix build
Alan Viverette [Thu, 28 May 2015 23:29:47 +0000 (23:29 +0000)]
am
1d39d1bd: am
4562f0bc: Merge "Fix drawable CTS breakages" into mnc-dev
* commit '
1d39d1bdfbad545d7602ba198bcd1a03b48feb86':
Fix drawable CTS breakages
Brian Attwell [Thu, 28 May 2015 23:23:37 +0000 (16:23 -0700)]
Rename "end" to "endExclusive" in addPhoneTtsSpan
Bug:
21209482
Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025