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
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
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
kmccormick
8706df1cb7
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 '326e8bf8264b8b89bc3deb1faa0c98a79ca7cac1':
Doc update: clarify rules for rate param
2013-03-28 18:12:01 -07:00
kmccormick
326e8bf826
am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
...
* commit '84bba9528c5d3baf22656746255b74e72b4555ff':
Doc update: clarify rules for rate param
2013-03-28 18:10:08 -07:00
kmccormick
84bba9528c
am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
...
* commit '297409fefcfb2704162536562db9395903476b44':
Doc update: clarify rules for rate param
2013-03-28 18:07:59 -07:00
kmccormick
297409fefc
am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
...
* commit '3abd5a00ab24299de00b6dfa9c73ff59e3f3360c':
Doc update: clarify rules for rate param
2013-03-28 18:05:44 -07:00
kmccormick
3abd5a00ab
am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
...
* commit 'ef47a8c48a29ae73e4a7a1386def8fcd10b0044c':
Doc update: clarify rules for rate param
2013-03-28 18:04:31 -07:00
kmccormick
ef47a8c48a
am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
...
* commit '6d9ff5033e2985ed106b24d63a2bf5a8827170ed':
Doc update: clarify rules for rate param
2013-03-28 18:03:07 -07:00
kmccormick
6d9ff5033e
Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
2013-03-29 01:00:11 +00:00
kmccormick
a230b3cb96
Doc update: clarify rules for rate param
...
"Bug: 5581113"
Change-Id: Ic87f1c331fba2b08de295b2d77832739bf823500
2013-03-28 17:58:57 -07:00
kmccormick
a16db651bf
am d0bc2d8d: am 798bb617: am 5652935a: am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit 'd0bc2d8d7f087558d5ec0db349347df2cc555afd':
Doc update: fix broken XML causing prob in View
2013-03-28 17:31:52 -07:00
kmccormick
d0bc2d8d7f
am 798bb617: am 5652935a: am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit '798bb6175ffdb473dd135f3167f01559fd5db9ef':
Doc update: fix broken XML causing prob in View
2013-03-28 17:29:27 -07:00
Romain Guy
cd93fb986c
Update layers to clear them
...
Bug #8489505
A layer should be updated even with an empty deferred display list. It is
possible for a layer to request an update just to execute a clear which
will be handled by LayerRenderer::prepareDirty().
Change-Id: Iffb98bd71d6caa8d4a701df98197676f9423c0c2
2013-03-28 17:28:53 -07:00
kmccormick
798bb6175f
am 5652935a: am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit '5652935aef0a1a9ecb6eef5550eb0e6a52999135':
Doc update: fix broken XML causing prob in View
2013-03-28 17:27:26 -07:00
kmccormick
5652935aef
am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit '5a5ff0b807f456055a7eadb46bca7f674585529d':
Doc update: fix broken XML causing prob in View
2013-03-28 17:25:18 -07:00
kmccormick
5a5ff0b807
am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit '6754e05b4e034a5118d669a547708c7adebd3202':
Doc update: fix broken XML causing prob in View
2013-03-28 17:23:03 -07:00
kmccormick
6754e05b4e
am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit 'c1fbc91b78b0cb9ff6c6398846d984afc2fd541f':
Doc update: fix broken XML causing prob in View
2013-03-28 17:20:48 -07:00
kmccormick
c1fbc91b78
am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
...
* commit 'a42ddee1c2fad01521812ffde5968b9e92487caa':
Doc update: fix broken XML causing prob in View
2013-03-28 17:18:12 -07:00
kmccormick
a42ddee1c2
Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs
2013-03-29 00:16:21 +00:00
kmccormick
ac7122d984
Doc update: fix broken XML causing prob in View
...
"Bug: 5873694"
Change-Id: I2b2a822538886825f8a863c741f2aebb665883f8
2013-03-28 17:04:00 -07:00
Kenny Root
2706b60e8a
am 005f90b5: am 709f140b: am e89ebc76: am ce7f2723: Merge "AndroidKeyStore: add Builder for param spec"
...
* commit '005f90b5bec2f789dbf6031ef3d1cfbb5e52f503':
AndroidKeyStore: add Builder for param spec
2013-03-28 16:58:54 -07:00
Geremy Condra
3868a19759
am a54e0643: am 9d034deb: am 24948d3c: am 946a5c91: Merge "Save off the seinfo value with packages.list."
...
* commit 'a54e064365706d40c55c2984cca1f15a6bf3e8fb':
Save off the seinfo value with packages.list.
2013-03-28 16:58:51 -07:00
Kenny Root
005f90b5be
am 709f140b: am e89ebc76: am ce7f2723: Merge "AndroidKeyStore: add Builder for param spec"
...
* commit '709f140bea3974a30c68e99f507563854acad1dd':
AndroidKeyStore: add Builder for param spec
2013-03-28 16:57:27 -07:00
Geremy Condra
a54e064365
am 9d034deb: am 24948d3c: am 946a5c91: Merge "Save off the seinfo value with packages.list."
...
* commit '9d034debdd7226ea33530143710fcb962144be22':
Save off the seinfo value with packages.list.
2013-03-28 16:57:25 -07:00