Fabrice Di Meglio
3330ae59ff
Merge "Improve Toast RTL support" into jb-mr1-dev
2012-07-30 14:40:32 -07:00
Peter Ng
a3b69d1fa4
am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev
...
* commit '81a9bece12ef855092b27c33a997f3fa7b7f2d98':
copy and image updates to patterns and building blocks
2012-07-30 14:39:54 -07:00
Adam Powell
859a62ce92
Merge "Enforce a maximum size for action button icons." into jb-mr1-dev
2012-07-30 14:37:46 -07:00
Peter Ng
81a9bece12
Merge "copy and image updates to patterns and building blocks" into jb-dev
2012-07-30 14:37:26 -07:00
Adam Powell
c0047d4e11
Enforce a maximum size for action button icons.
...
Change-Id: Id9b5c1573cd40012229921fa8497cbe5ce340b1e
2012-07-30 14:30:51 -07:00
Fabrice Di Meglio
bf0bc63def
Improve Toast RTL support
...
- use Locale from Context
Change-Id: Ic93bb6e3f9310d54d879c20754c9310154940565
2012-07-30 14:06:58 -07:00
Romain Guy
0a088f5d46
Fix android.opengl.Matrix frustum's generation
...
External bug report: http://code.google.com/p/android/issues/detail?id=35646
Change-Id: I845783c05da46855f0c1d824c9a367f0e4673b85
2012-07-30 14:06:35 -07:00
James Dong
7267babae3
Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev
2012-07-30 13:37:08 -07:00
Nick Pelly
48c5eb018b
DO NOT MERGE. Add package-name-prefix blacklist for location updates.
...
The Settings.Secure value locationPackagePrefixBlacklist and
locationPackagePrefixWhitelist contains comma seperated package-name
prefixes.
Location & geo-fence updates are silently dropped if the receiving
package name has a prefix on the blacklist. Status updates are
not affected. All other API's work as before.
A content observer is used so run-time updates to the blacklist
apply immediately. There is both a blacklist and a whitelist.
The blacklist applies first, and then exemptions are allowed
from the whitelist. In other words, if your package name prefix
matches both the black AND white list, then it is allowed.
Change-Id: I4ea2ad56fa6bd75d32151bc250ac25c26a5777c4
2012-07-30 13:17:30 -07:00
Adam Powell
e72a6e977b
am fc92eb94: am 2ffb1acb: Merge " Fix preload classname for phone policy."
...
* commit 'fc92eb94c413ebae1016d10460ee62e92f0c1a64':
Fix preload classname for phone policy.
2012-07-30 13:13:22 -07:00
Adam Powell
fc92eb94c4
am 2ffb1acb: Merge " Fix preload classname for phone policy."
...
* commit '2ffb1acbb704fa9d87fe496d5b7f3053e02799df':
Fix preload classname for phone policy.
2012-07-30 13:10:06 -07:00
Ying Wang
2d6cc0968e
Import translations. DO NOT MERGE
...
Change-Id: Ic5a1446767d3a1e29bd62eeb080215a73a0728c0
Auto-generated-cl: translation import
2012-07-30 12:15:36 -07:00
Fabrice Di Meglio
619e4dca8e
Merge "Improve ListPopupWindow RTL support" into jb-mr1-dev
2012-07-30 11:29:20 -07:00
Fabrice Di Meglio
1d3d7da331
Improve ListPopupWindow RTL support
...
- add Javadoc for new method setLayoutDirection()
- fix one issue where the layout direction would not be set
when the popup was recreated
Change-Id: Ic53a8b0d01dc86e03e9bf5f09195af77404dca39
2012-07-30 11:27:31 -07:00
Adam Powell
2ffb1acbb7
Merge " Fix preload classname for phone policy."
2012-07-30 10:46:12 -07:00
Andreas Röhl
f750b8ce3c
Fix SurfaceView notifies on invalid surfaces.
...
SurfaceView notifies registered callbacks on invalid
Surfaces.
Change-Id: Iddc9a5cd073fb73a0e7e9b9ca64ff4fac0777ca7
2012-07-30 15:34:55 +02:00
Jake Wharton
825992f503
Return early when checking divider before child zero.
...
Previously the `getChildAt` method would be called with an index of -1 which
would lead to an exception being thrown and caught. This is unnecessary since
we know there will never be a divider before the first child. It also avoids
additional object creation since this method can be invoked quite frequently.
Change-Id: Iab44520d5d52f96a829a009cdd1201696edbf9a4
2012-07-28 21:40:04 -07:00
Brian Carlstrom
5ea68db37f
Improve test key names to reproduce public issue
...
Also fixes other unrelated test failures.
Bug: http://code.google.com/p/android/issues/detail?id=34577
Bug: 6837950
(cherry-picked from f4019af04a1fc4b16aa5972cbcbba703caa5d78d)
Change-Id: I5b32b5ccac80f04a4d0fd6b21b8caa11e42995a7
2012-07-27 22:41:42 -07:00
Jeff Brown
fa14d824d2
Merge "Move and rename user activity event type constants." into jb-mr1-dev
2012-07-27 18:23:22 -07:00
Jeff Brown
af3fb2325e
Merge "Flatten power manager wake lock constants." into jb-mr1-dev
2012-07-27 18:21:19 -07:00
Jeff Brown
e288e180bb
Merge "Implement equals() and hashCode() like a good little object." into jb-mr1-dev
2012-07-27 18:18:51 -07:00
Jeff Brown
722565a67d
Merge "Fix inconsistency in user activity types." into jb-mr1-dev
2012-07-27 18:17:28 -07:00
Jeff Brown
b696de5c10
Move and rename user activity event type constants.
...
Change-Id: Ie565808796773b6896e71ddfac6aaaf8031de846
2012-07-27 18:14:56 -07:00
Jeff Brown
155fc70252
Flatten power manager wake lock constants.
...
We only support a few basic kinds of wake locks. Rather than
pretend that we could support other weird combinations of features,
just get rid of the feature bits.
Deprecated other wake lock types. We really want to encourage
developers to use FLAG_KEEP_SCREEN_ON instead of managing
their own wake locks, even though its behavior is not
exactly equivalent.
Change-Id: Idfeb0bc6efff0ef2736e47f72a06e69e5a16996e
2012-07-27 18:14:54 -07:00
Jeff Brown
94838913ab
Implement equals() and hashCode() like a good little object.
...
Change-Id: I06fc8f96586c72095ffa142d52fbd71af05cee97
2012-07-27 18:14:53 -07:00
Jeff Brown
df693de4fe
Fix inconsistency in user activity types.
...
Looks like BatteryStats was not updated when we reduced the number
of user activity types from 7 to 3.
Change-Id: I7465f86c78baa561a6555c33f681553b870827f2
2012-07-27 18:14:52 -07:00
James Dong
a0ba79473b
Enabled application using VideoView to get information events from MediaPlayer
...
o related-to-bug: 6851811
Change-Id: I78a73a33b6ddfaea76f2ba13b6990c153fb696c6
2012-07-27 18:05:11 -07:00
Adam Cohen
6089a88ca5
am 86371474: am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev
...
* commit '86371474de700494d9b7b324c8650858d9b18b50':
No longer parceling FixedSizeRemoteViewsCaches
2012-07-27 17:45:00 -07:00
Adam Cohen
86371474de
am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev
...
* commit '47db02bad8fed67025669c41ef0c0dd9cafe7ed2':
No longer parceling FixedSizeRemoteViewsCaches
2012-07-27 17:42:30 -07:00
Dirk Dougherty
f852a1d3f5
am 9ddc6ed3: am 36e055bd: Doc change: fix typo.
...
* commit '9ddc6ed30f2fa23d6946fca2ef0ddb17f23845b5':
Doc change: fix typo.
2012-07-27 17:42:12 -07:00
Adam Cohen
47db02bad8
Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev
2012-07-27 17:40:34 -07:00
Dirk Dougherty
9ddc6ed30f
am 36e055bd: Doc change: fix typo.
...
* commit '36e055bd2e55d9b8f13d0d0d37259fa0ce5507d1':
Doc change: fix typo.
2012-07-27 17:39:42 -07:00
Dirk Dougherty
36e055bd2e
Doc change: fix typo.
...
Change-Id: Icd0d01a3047e86544dcea9188499e1433778184a
2012-07-27 17:36:07 -07:00
Romain Guy
c3e4f0a72b
Merge "Rename drawGeneralText to drawText" into jb-mr1-dev
2012-07-27 16:42:52 -07:00
Romain Guy
c25259519f
Rename drawGeneralText to drawText
...
Change-Id: I5062ea5b0605fc7af27f410fafc930d10f38e926
2012-07-27 16:41:22 -07:00
Jeff Sharkey
ab88f9864e
Merge "Split NST handler events away from CS internals." into jb-mr1-dev
2012-07-27 16:04:56 -07:00
Adam Cohen
4a9df8dda5
No longer parceling FixedSizeRemoteViewsCaches
...
-> Related to issue 6854767
Change-Id: Ib9a9ef827a739ef9efbe6f11dcc4765004fa0c51
2012-07-27 16:04:40 -07:00
Romain Guy
a0aa479c0e
am 97e27072: am dfac68ea: Merge "Corrected typo when checking InputStream methods"
...
* commit '97e270721bf29d25b513c1f2be71a8543d048f5d':
Corrected typo when checking InputStream methods
2012-07-27 15:54:30 -07:00
Daniel Sandler
fbf3089665
am 5cb62df6: am dd4ef49f: Persistent \'emergency calls\' banner in the notification panel.
...
* commit '5cb62df6bdac4aaab7a1c1b1ef849ec213ff028b':
Persistent 'emergency calls' banner in the notification panel.
2012-07-27 15:51:31 -07:00
Jason Sams
e9f5f8e020
Merge "Fix readback lengths" into jb-mr1-dev
2012-07-27 15:51:01 -07:00
Romain Guy
97e270721b
am dfac68ea: Merge "Corrected typo when checking InputStream methods"
...
* commit 'dfac68eacc60c130e54345d98bd45c99573cb627':
Corrected typo when checking InputStream methods
2012-07-27 15:49:23 -07:00
Daniel Sandler
5cb62df6bd
am dd4ef49f: Persistent \'emergency calls\' banner in the notification panel.
...
* commit 'dd4ef49f4545dad2a6503d29e129472aba5392fc':
Persistent 'emergency calls' banner in the notification panel.
2012-07-27 15:46:20 -07:00
Robert Greenwalt
432139b5c3
Reduce log spam.
...
Turn off DBG in SignalStrength.java
Change-Id: Ida1bded2551272956115aef5f3eda0f2a8cf3aed
2012-07-27 15:44:16 -07:00
Stephen Hines
5590027b9b
Merge "Add vignette filter to Image Processing test" into jb-mr1-dev
2012-07-27 15:21:08 -07:00
Fabrice Di Meglio
d395ea124b
Merge "Fix the build" into jb-mr1-dev
2012-07-27 14:48:10 -07:00
Nick Kralevich
89630ec877
Merge "ClipData: html attribute values should always be escaped" into jb-mr1-dev
2012-07-27 14:46:19 -07:00
Fabrice Di Meglio
f2c278551c
Fix the build
...
- update current.txt
Change-Id: I98d6cfbe71564dcded8d8d757dd183ba678d4184
2012-07-27 14:45:44 -07:00
Jean-Michel Trivi
72787c1b7a
Merge "Relax rules for media apps to stay on RemoteControlDisplay" into jb-mr1-dev
2012-07-27 14:43:41 -07:00
Jason Sams
3655e44d8b
Fix readback lengths
...
Change-Id: I4c5f29af03ed3babceef741aa3a982244cfc65d1
2012-07-27 14:33:50 -07:00
Craig Mautner
39df578acd
Fix build.
...
Change-Id: I52bbebae38912a4fb71c96174b3d4d8eb6be10c1
2012-07-27 14:30:59 -07:00