84837 Commits

Author SHA1 Message Date
Jason Sams
9e6e5ae243 Fix build. Missed current.txt in previous checkin.
Change-Id: I458944fbd9b04526068d03330620ad4805b5c993
2012-09-18 19:10:34 -07:00
Romain Guy
4e54f930d4 Merge "Add test for layer updates optimizations" into jb-mr1-dev 2012-09-18 19:01:26 -07:00
Romain Guy
189ff17caa Add test for layer updates optimizations
Optimizations are following.

Change-Id: I120e1d0c08d8068fcac46515f37a4ae510e5f3a3
2012-09-18 18:59:59 -07:00
Adam Powell
2a81fe68c2 Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev 2012-09-18 18:49:32 -07:00
Jason Sams
55db6865ef Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev 2012-09-18 18:43:52 -07:00
Adam Powell
98c370e71d Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 2012-09-18 18:42:59 -07:00
Adam Powell
4b6d93fd04 Make invalidateOptionsMenu asynchronous
Process any pending menu invalidations on the animation tick, before
traversals are performed. Collapse multiple menu invalidations
together.

Bug 7189372

Change-Id: I7a33ae9813980eb8fbcc958804de2c03328ecca8
2012-09-18 18:37:28 -07:00
Jason Sams
e69e9e6b6e Clean up and publish the YUV to RGB intrinsic.
Change-Id: Iffb346a5d751f0bae123455869bda8db37d542ff
2012-09-18 18:23:15 -07:00
Dianne Hackborn
1e5aeecb64 Merge "Don't allow more than 3 actively running users at a time." into jb-mr1-dev 2012-09-18 18:22:15 -07:00
Dianne Hackborn
bb1aeff320 Don't allow more than 3 actively running users at a time.
Change-Id: Ic047c62b518a0faaa7b507343909330044ec290b
2012-09-18 18:20:43 -07:00
Andy Stadler
6d4e887da4 Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev 2012-09-18 17:51:09 -07:00
Andy Stadler
8071124375 Move X509TrustManagerExtensions to correct directory
Also removed unused imports.

Original Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600

Change-Id: I66886ee9792c23a1e421022fd1f675fdf35ea049
2012-09-18 17:40:14 -07:00
Mike Lockwood
954a5d61a2 Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev 2012-09-18 17:12:37 -07:00
Romain Guy
24755d2b42 Merge "mutate() didn't work as advertised Bug #7162705" into jb-mr1-dev 2012-09-18 17:03:04 -07:00
Xavier Ducrohet
f43f5c7aaa Add --output-text-symbols option to aapt. do not merge.
Library projects in the SDK are built using --non-constant-id
to generate a temporary R.java class.
When the library is packaged with the application to generate an
apk, the R class is recreated with the proper IDs due to all the
resources coming from the app and all the libraries.

However for large apps with many libraries (each with their own
R class in their package), this means a lot of unnecessary IDs:
all R classes contains all the IDs including for resources from
by projects they don't have access through the dependency graph.

For really large apps (X,000 resources), with lots of libraries
(10+), this can generate tens of thousands of resources, which
can trigger dalvik's limit of 65K fields and methods per dex
files.

This changes lets aapt generate not only the R class but a simple
text file containing the list of all those IDs so that it is
easier to parse back. The SDK build system will not ask aapt
to generate the R class of the libraries (through the
--extra-packages option), instead it will then read this
file to know what IDs are needed for each library and generate
a much smaller R class for each library (using the same text
file output from compiling all the resources to get the final
integer value).

Chery-picked from f5de650ff1e161ea135c828e43515895343d2c0f

Change-Id: I0e08ceb6e4ceb3feb169ce17df21dd35a2505e7f
2012-09-18 17:02:34 -07:00
Jim Miller
402f0c8123 Merge "Refactor Carrier text as a movable module." into jb-mr1-dev 2012-09-18 17:00:38 -07:00
Romain Guy
684385ddde mutate() didn't work as advertised
Bug #7162705

Change-Id: I15b2663fa7f1c71a2a3479134b8b7f37bfcbc607
2012-09-18 16:56:11 -07:00
Elliott Hughes
9ccf13cd6b Fix formatDateRange month names for Farsi.
This removes the LLLs seen in Calendar and Settings, for example.

Bug: 6811327
Change-Id: I87c2ab9ee8d897171ce7ca4fe06cfa8b11d36536
2012-09-18 16:40:20 -07:00
Jeff Sharkey
3fe5bf6d69 Make getMediaStorageDirectory() user-aware.
Bug: 7173591
Change-Id: I4513afbd8c3d6a31cd66d8a149be4071d5a4d24c
2012-09-18 15:54:52 -07:00
Jeff Sharkey
0b81be6f79 Lockdown should only augment connected networks.
Bug: 7148397
Change-Id: I20e2194c874544b272b9ec8b63391d91b0a22f49
2012-09-18 15:44:16 -07:00
Romain Guy
ceb5a98129 Merge "Minimize state changes when updating layers" into jb-mr1-dev 2012-09-18 15:43:05 -07:00
Fabrice Di Meglio
9ffc6047f1 Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev 2012-09-18 15:42:34 -07:00
Romain Guy
35643ddc68 Minimize state changes when updating layers
Change-Id: I407fcc80bd3178f9f09a3b379ceb7f7ce0749e08
2012-09-18 15:41:16 -07:00
Romain Guy
29d0aa73a0 Merge "Compute GradientDrawable's opacity correctly" into jb-mr1-dev 2012-09-18 15:39:30 -07:00
Raph Levien
be456f2e81 Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family
This change adds the Roboto Thin and Thin Italic font variants, which
are accessible through, for example, Typeface.create("sans-serif-thin",
Typeface.NORMAL).

The version checked in is Roboto_1.100150 as obtained from Christian.
The other fonts in the family should probably be rev'ed as well, but
that would be a separate change.

I verified that the fonts work, that they're thin, that kerning and
ligatures work, and that the "kern" table (redundant and bulky) is
missing.

This should close bug 7173069: Integrate roboto thin to support jb mr1
time displays

Change-Id: I5c950a1843675668b83c005234b44abbe924d9fe
2012-09-18 15:37:43 -07:00
Romain Guy
e91aa0fa64 Compute GradientDrawable's opacity correctly
The current implementation of GradientDrawable always assumes the shape needs
to be blended. This causes all windows to be considered translucent by default.
This change recomputes the opacity as needed to ensure windows are marked
opaque when they should.

Change-Id: Iaf291d889a6c5122ab00c9f5781df3e7f61547fa
2012-09-18 15:37:24 -07:00
Geremy Condra
ad79342786 Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev 2012-09-18 15:37:22 -07:00
Mathias Agopian
29e0bd2f5a GLSurfaceView defaults to 888 instead of 565
Change-Id: Ie00fe578136365031e4bb878a04b68dc40e24b9e
2012-09-18 15:36:10 -07:00
Winson Chung
688ca4708b Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)" into jb-mr1-dev 2012-09-18 15:34:37 -07:00
Jim Miller
6eac514a02 Merge "Remove trailing period from missing SIM string" into jb-mr1-dev 2012-09-18 15:33:49 -07:00
Fabrice Di Meglio
c11f77fbae Fix bug #7173155 API REVIEW: android.view.View
- remove getFocusRect(Rect) as it was redundant
- fix Javadoc

Change-Id: I3784c4b0a38770cba5d3ba09196f9271050a3c20
2012-09-18 15:33:07 -07:00
Jim Miller
772db427a7 Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev 2012-09-18 15:32:04 -07:00
Irfan Sheriff
7d0882be6d Merge "send connection broadcast on client disconnect" into jb-mr1-dev 2012-09-18 15:26:16 -07:00
Irfan Sheriff
5ef9c59fff send connection broadcast on client disconnect
Bug: 7188646
Change-Id: I69f2c2581004b08730407930fb056cc1fe54feec
2012-09-18 15:17:56 -07:00
Elliott Hughes
6323b6c617 Use localized digits for Time formatting.
This fixes the digits in places like Settings' data usage page
and Calendar's drop-down, for languages such as Arabic.

Bug: 6811327
Change-Id: I2dafcc342e3279937735697b3748b47fdfc8e691
2012-09-18 15:16:00 -07:00
Mike Lockwood
db45484e4b AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected
Bug: 7051259

Change-Id: I5b5fb3ad7c7e38dbf49700d893fd49354eaecf51
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-09-18 14:55:52 -07:00
Jeff Sharkey
6281d7cf32 Merge "Multi-user MTP." into jb-mr1-dev 2012-09-18 14:52:46 -07:00
Fabrice Di Meglio
8b3560d3e6 Merge "Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev 2012-09-18 14:50:47 -07:00
Fabrice Di Meglio
20586fa035 Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev 2012-09-18 14:48:48 -07:00
Adam Cohen
642258a29b Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev 2012-09-18 14:48:48 -07:00
Winson Chung
84dbf462f8 Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)
Change-Id: I63fe4b229a8a460170df153e71b7ad65655dfad1
2012-09-18 14:48:00 -07:00
Fabrice Di Meglio
dbed514e13 Merge "Fix bug #7172699" into jb-mr1-dev 2012-09-18 14:46:59 -07:00
Adam Powell
aff9d529b5 Further tune config_minScalingSpan for small screen devices.
Bug 7189429

Change-Id: Ia031551d2e1cd2569d21ce4901b454866c4d88c3
2012-09-18 14:46:56 -07:00
Geremy Condra
fd5a80f6e9 Code cleanup for X509TrustManagerExtensionsTest.java
Change-Id: I85584f7a9dbc726be811f783d125efcf70c9f6af
2012-09-18 14:44:54 -07:00
Adam Cohen
60264730c1 Tweaking how settings adds keyguard widgets
-> Fix for issue 7173587
-> Fix for issue 7173877

Change-Id: I60cd3952113335df60292f67461d50f6c8bd2ed3
2012-09-18 14:38:04 -07:00
Jamie Gennis
94998c9c4e Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 2012-09-18 14:32:01 -07:00
Amith Yamasani
599dd7ce9a DevicePolicyManager per user
Bug: 7136483

Store device policy information for each user and apply them when user switches.

Global proxy can only be controlled by owner.
Camera restriction applies to all users, if any one has an admin that disables it.
Storage encryption can only be controlled by owner, although other users can query the state.
Wipe data will only remove the user if non-zero, wipe the device, if zero.

Change-Id: I359be46c1bc3828fd13d4be3228f11495081c8f2
2012-09-18 14:28:33 -07:00
Andy Stadler
ab3d0fd684 Merge "Move files to make eclipse-java happy" into jb-mr1-dev 2012-09-18 14:20:30 -07:00
Chet Haase
48618c987e Merge "Fix GL shader bugs" into jb-mr1-dev 2012-09-18 14:13:57 -07:00
Roozbeh Pournader
315a7c0335 Use proper digits in formatElapsedTime and format3339
Use getZeroDigit() instead of a hard-coded '0' for formatting times using
formatElapsedTime, so locales with different digits like Arabic and Persian
could display the elapsed time properly. This is visible in Settings' list
of running apps.

Also changed android.text.format.Time's format3339 method to always use ASCII
digits, irrespective of the locale.

Change-Id: I731c96c21b3712ec347d9526e4ec3fe884dec276
2012-09-18 14:11:55 -07:00