Kenny Root
5cb5cec6a4
KeyStore: add API to query storage type
...
Add an API to keystore daemon to query what kind of storage is currently
in use.
(cherry picked from commit a738e2a1aee26e0be3944c11820724aeca313f83)
Change-Id: I52c84449a27b1cefc49372a6406b7132c2bbddee
2013-03-29 14:21:10 -07:00
kmccormick
0525c09bc0
am 138ad7ba: am a80a7164: am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit '138ad7ba1b59f6105d1f79966e616f5970970ef3':
Doc update: typos in code snippets.
2013-03-29 14:18:12 -07:00
kmccormick
138ad7ba1b
am a80a7164: am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit 'a80a71648ac9cb306007e67afbc4bedb4debf899':
Doc update: typos in code snippets.
2013-03-29 14:15:43 -07:00
kmccormick
36b8beec20
Doc update: obsolete ant target.
...
"Bug: 8435577"
Change-Id: Iaec80cef09f70ccc5d0421b4d2d9a16ada0bd12d
2013-03-29 14:15:10 -07:00
kmccormick
a80a71648a
am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit '859a4301d83bf894ffd79e4f3d8abf82ce1143c5':
Doc update: typos in code snippets.
2013-03-29 14:12:44 -07:00
kmccormick
859a4301d8
am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit '4e259b2cde9cc028fbaddcd650934b6d422e0dff':
Doc update: typos in code snippets.
2013-03-29 14:10:16 -07:00
Kenny Root
557ec55641
Merge "KeyStore: add API to query storage type"
2013-03-29 21:09:25 +00:00
kmccormick
4e259b2cde
am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit '0e6691be2abbc11af2d50f1dfdebf3f11285993d':
Doc update: typos in code snippets.
2013-03-29 14:07:54 -07:00
Michael Wright
bf02096088
Finish any event in the current input queue
...
When the pipelining optimization was added we never updated
handleImeFinishedEvent to look through the whole queue of items, so it was only
looking at the head.
Bug: 8498214
Change-Id: I79c62392a93b47e3e1eab3f4fe54a5c999dfb566
2013-03-29 14:06:43 -07:00
kmccormick
0e6691be2a
Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
2013-03-29 21:05:00 +00:00
Romain Guy
fb47d83951
Prevent crash when a single layer is enqueued several times for updates
...
Bug #8504687
Change-Id: I9b01bbc4e3f37af23dfe5e68d3d03ad3d238b94a
2013-03-29 14:04:54 -07:00
kmccormick
741b2f20a1
Doc update: typos in code snippets.
...
"Bug: 8475026"
Change-Id: If516a2a6c6416f1fb10c0d4f0c94bd5e849e0cc9
2013-03-29 14:03:20 -07:00
kmccormick
bea4797dd2
am da58f7f1: am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit 'da58f7f1c396c71fa89d58bc2c25e6ed30cb573f':
Doc update: emulator bug fix
2013-03-29 13:58:57 -07:00
kmccormick
da58f7f1c3
am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit 'd80f58095b5b1358c40c9bdf50afceaaa7ce87e5':
Doc update: emulator bug fix
2013-03-29 13:57:22 -07:00
kmccormick
d80f58095b
am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit '7c805a0e0eb42244438c83678f103c4bb7071a4b':
Doc update: emulator bug fix
2013-03-29 13:56:05 -07:00
kmccormick
7c805a0e0e
am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit '404eb8d36a2e6ebea3f16ad1e013423f7f1d4d13':
Doc update: emulator bug fix
2013-03-29 13:54:15 -07:00
kmccormick
404eb8d36a
am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit 'a243e162542cd4dcfc3ffd7b46b111efe402972f':
Doc update: emulator bug fix
2013-03-29 13:51:07 -07:00
kmccormick
a243e16254
am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit '82a42a25e3e7dceefdca41096ce6e768f285076c':
Doc update: emulator bug fix
2013-03-29 13:49:31 -07:00
Jatin Lodhia
98c762bf7c
am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev
...
* commit 'ce66fd747928fd1af119bcdc120bfcfb5add05b1':
AccountManager changes for profile seeding.
2013-03-29 13:47:38 -07:00
kmccormick
82a42a25e3
Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
2013-03-29 20:47:11 +00:00
kmccormick
84cb2be8ea
Doc update: emulator bug fix
...
"Bug: 7990692"
Change-Id: I767c5662cebf7fe8f578190bc9730d72e97abeb1
2013-03-29 13:45:03 -07:00
Jatin Lodhia
ce66fd7479
Merge "AccountManager changes for profile seeding." into jb-mr2-dev
2013-03-29 20:44:49 +00:00
Romain Guy
254f80823f
am 77ebbbe0: Merge "Prevent crash when a single layer is enqueued several times for updates Bug #8504687 " into jb-mr2-dev
...
* commit '77ebbbe042dc4d5c162da5e2d3b379ebc8514fc9':
Prevent crash when a single layer is enqueued several times for updates Bug #8504687
2013-03-29 13:32:14 -07:00
Romain Guy
77ebbbe042
Merge "Prevent crash when a single layer is enqueued several times for updates Bug #8504687 " into jb-mr2-dev
2013-03-29 20:29:11 +00:00
Fabrice Di Meglio
b365f91688
Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug
...
- use private flag bit field for ViewGroup.MarginLayoutParams
- make ViewDebug support "byte" type for FlagMapping
Change-Id: Iff7c31544e3ce2d29919c9424425f2bf87042b8b
2013-03-29 13:12:07 -07:00
Fabrice Di Meglio
3526196d1f
am 3dc52ce7: Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
...
* commit '3dc52ce711a6345d9f18dd31e39344792116597c':
Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
2013-03-29 12:42:05 -07:00
Fabrice Di Meglio
3dc52ce711
Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
2013-03-29 19:38:50 +00:00
Romain Guy
02b49b70ed
Prevent crash when a single layer is enqueued several times for updates
...
Bug #8504687
Change-Id: I9b01bbc4e3f37af23dfe5e68d3d03ad3d238b94a
2013-03-29 12:37:16 -07:00
Kenny Root
a738e2a1ae
KeyStore: add API to query storage type
...
Add an API to keystore daemon to query what kind of storage is currently
in use.
Change-Id: I5a83ae92250ca63b691dcf1beb8b3e1703797745
2013-03-29 11:16:43 -07:00
Irfan Sheriff
2b2845b0c1
am 964a6a7e: Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev
...
* commit '964a6a7e209b0db262c827721ae5fde3f98ca763':
Scope certs for wifi UID and handle migration
2013-03-29 10:36:38 -07:00
Irfan Sheriff
964a6a7e20
Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev
2013-03-29 17:32:44 +00:00
Raph Levien
2adf34e389
am 76a40744: Merge "Switch indic fonts to Noto" into jb-mr2-dev
...
* commit '76a407442e0567e6c658cab546c32efc92711dc0':
Switch indic fonts to Noto
2013-03-29 10:06:04 -07:00
Raph Levien
0a91410720
am 8fed6bc8: Merge "Make zero width space a line breaker" into jb-mr2-dev
...
* commit '8fed6bc894a993a195ebcb8e8772b725cd828f0d':
Make zero width space a line breaker
2013-03-29 10:02:16 -07:00
Raph Levien
76a407442e
Merge "Switch indic fonts to Noto" into jb-mr2-dev
2013-03-29 17:01:31 +00:00
Raph Levien
8fed6bc894
Merge "Make zero width space a line breaker" into jb-mr2-dev
2013-03-29 16:58:33 +00:00
Dianne Hackborn
d680287b42
am cb5a4bf2: Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev
...
* commit 'cb5a4bf2ee4a2089c8dd6b71d197c63319a97ff6':
Apparently SystemUI no longer needs the carousel.
2013-03-29 09:57:54 -07:00
The Android Open Source Project
d3289c6083
am 3cea00ac: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '3cea00acfa2f2e9722ad7db4b674f9f0d0f52f8d':
Update layers to clear them Bug #8489505
Crank up the mOomMinFreeHigh values by 50%.
Fix an action bar menu order of operations bug
Fix bug #8487785 Notification shade has text overlapping the icon
2013-03-29 09:54:34 -07:00
Jean-Michel Trivi
99bd302cfe
am bc43b4c2: RemoteControlClient can report current position, speed
...
* commit 'bc43b4c2f24fd03c0d0546895c97918c1736d9fb':
RemoteControlClient can report current position, speed
2013-03-29 09:54:15 -07:00
Dianne Hackborn
cb5a4bf2ee
Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev
2013-03-29 16:53:54 +00:00
The Android Open Source Project
3cea00acfa
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I82cfbeb6b54a3bb1225321fb5bb9d57b6ce1d821
2013-03-29 09:48:56 -07:00
Jean-Michel Trivi
bc43b4c2f2
RemoteControlClient can report current position, speed
...
Extend RemoteControlClient class to support reporting the
current playback position, and the playback speed.
Define listener for an application to receive new playback
position to seek to (use of listener to be implemented).
Update IRemoteControlDisplay implementations to new interface.
bug 8120740
Change-Id: I2654daeca1ac49713d325df8226dceb85943c020
2013-03-29 09:47:48 -07:00
Raph Levien
8d087c349f
Make zero width space a line breaker
...
This patch makes ZWSP (U+200B, zero width space) a potential line break
in text layouts. This is a fix for bug 8501809.
Change-Id: I18c1f8464e6c821ff75f819141bacc714a878700
2013-03-29 09:25:48 -07:00
Victoria Lease
3395e12541
am fef08dc1: am a4b68908: Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev
...
* commit 'fef08dc1c23fc3c7582e36df10d8a12acd22fb62':
bidiFlags != SkPaint::Flags
2013-03-29 08:59:30 -07:00
Victoria Lease
fef08dc1c2
am a4b68908: Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev
...
* commit 'a4b68908bdfefdf6c79a8b2c3d7bda00c543532f':
bidiFlags != SkPaint::Flags
2013-03-29 08:56:04 -07:00
Victoria Lease
a4b68908bd
Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev
2013-03-29 15:00:50 +00:00
Fabrice Di Meglio
618e3aafdd
Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
...
- title should be "viewStart"
- link speed should be also "viewStart"
Change-Id: I8d85dd8b6850f8ae4c972dad40642c33b9004dce
2013-03-28 20:23:23 -07:00
Lorenzo Colitti
4d25dd94aa
am 742056ee: am 2fb669e6: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev
...
* commit '742056ee37e94cd51390527fea835112b29c8a94':
Stop clat if it's no longer in use.
2013-03-28 18:25:52 -07:00
Lorenzo Colitti
742056ee37
am 2fb669e6: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev
...
* commit '2fb669e68f771f07517b8d5087ca875025b9bcfb':
Stop clat if it's no longer in use.
2013-03-28 18:22:04 -07:00
Lorenzo Colitti
2fb669e68f
Merge "Stop clat if it's no longer in use." into jb-mr2-dev
2013-03-29 01:17:45 +00:00
kmccormick
58367ad362
am 8706df1c: am 326e8bf8: am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
...
* commit '8706df1cb7a3964d9a6570a795368f4a78a58cf7':
Doc update: clarify rules for rate param
2013-03-28 18:15:02 -07:00