85366 Commits

Author SHA1 Message Date
Scott Main
9198495b27 am 19a39686: am b79d8ecc: udpate media formats for JB
* commit '19a39686b7bcf5c47cc0e2f99caca7beb9173212':
  udpate media formats for JB
2012-09-19 11:22:02 -07:00
Glenn Kasten
549be8bead Merge "New API for querying audio properties" into jb-mr1-dev 2012-09-19 11:13:58 -07:00
Craig Mautner
8863cca57d Fixes to Starting window and Wallpaper windows.
- Checking for found wallpaper to match either mWallpaperTarget
or mLowerWallpaperTarget keeps from swapping the layers while
transitioning between two wallpaper activities.

- Fade out RecentsActivity while bringing up selected activity. This
keeps the RecentsActivity from showing through a launching wallpaper
activity.

- When moving a starting window from one activity to another clear
the startingDisplayed flag in the old activity.

- When moving a starting window from one activity to another assign
the new activity's mAppAnimator to the starting window's mWinAnimator.

- Only treat a wallpaper transition as entering if the mWallpaperTarget
is visible and not being hidden. Keeps from assigning the wrong
animation when activities are launched back to back and the
mWallpaperTarget is still animating away.

Fixes bug 7148089.

Change-Id: Idd405b1ba113f3345ca2116d141b474abe5bd4c0
2012-09-19 11:11:46 -07:00
Scott Main
19a39686b7 am b79d8ecc: udpate media formats for JB
* commit 'b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
  udpate media formats for JB
2012-09-19 11:00:23 -07:00
Adam Powell
ab12f0f72c Merge "Implement resolving of icon attributes to resIds in AlertController" 2012-09-19 10:51:41 -07:00
Baligh Uddin
4d8fbcb228 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-19 09:28:07 -07:00
Baligh Uddin
7b6ec1f6fd Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-19 09:14:59 -07:00
Narayan Kamath
7047ea7568 am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev
* commit '5d1a870a25f7495755432a42cf8c81818dc369fa':
  Add APIs to enable SNI and session tickets on sockets.
2012-09-19 05:51:22 -07:00
Irfan Sheriff
48a9892dbd am 5d4206a5: Merge "Get strings in" into jb-mr1-dev
* commit '5d4206a55c5336a163408422ba3302f5fd8463f7':
  Get strings in
2012-09-19 05:50:40 -07:00
Jim Miller
b6adf0121a am 5d8d169b: Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev
* commit '5d8d169bbb0325665d600415bc7b4add2dbcaf75':
  Fix wrong pattern count in keyguard pattern security view.
2012-09-19 05:50:33 -07:00
Amith Yamasani
b8e362ae27 am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev
* commit '4adb9d34162b109db3c67e352ad50c76dc7f2d45':
  DevicePolicyManager per user
2012-09-19 05:50:07 -07:00
Narayan Kamath
5d1a870a25 Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 2012-09-19 01:31:36 -07:00
Scott Main
b79d8ecc27 udpate media formats for JB
Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c
2012-09-19 00:02:12 -07:00
Irfan Sheriff
5d4206a55c Merge "Get strings in" into jb-mr1-dev 2012-09-18 22:34:34 -07:00
Irfan Sheriff
7f0aaac7f2 Get strings in
Bug: 65904101
Bug: 7087564
Change-Id: Ic4887a737a640010e12efd2a16b24af2215ba72a
2012-09-18 22:06:13 -07:00
Jim Miller
5d8d169bbb Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev 2012-09-18 21:06:41 -07:00
Jim Miller
d2b82f70fe Fix wrong pattern count in keyguard pattern security view.
This fixes a bug introduced in I085c5ec8 where keyguard attempts to emulate
slippery windows with views.  In order to do so,  the code was overloading
dispatchTouchEvent().  It would allow the super (a ViewGroup) to dispatch
the events and then would dispatch them itself to sub views.  In the case
where an event overlaps an actual child view, it would  result in 2 copies of the event
per window layer (there are 2).  This results in 2 events per layer for the
top two views in the hierarchy. So each actual pattern attempt would count as 4
attempts to the system.

The solution is to overload onTouchEvent() at each level in the view hierarchy,
which means that we ignore events that were already handled by a child window
of the parent.

This change also disables slippery windows for keyguard because it causes
vertical patterns to be ignored.

Fixes bug 7191277

Change-Id: I4df217f2bf382134d93113b8d55b0d71e0e23677
2012-09-18 21:02:08 -07:00
Amith Yamasani
4adb9d3416 Merge "DevicePolicyManager per user" into jb-mr1-dev 2012-09-18 20:00:44 -07:00
Fabrice Di Meglio
69542e48c3 Fix some typos in Javadoc for Accessibility APIs
Change-Id: Ie3ca20e1c3bb11fb59bd7dcaed9ea92be320b3eb
2012-09-18 19:34:34 -07:00
Jason Sams
2534714375 am 2d95a33d: Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev
* commit '2d95a33dc3a463b197d4597b38f5ae124de25017':
  Fix build.  Missed current.txt in previous checkin.
2012-09-18 19:13:35 -07:00
Jason Sams
2d95a33dc3 Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev 2012-09-18 19:11:18 -07:00
Jason Sams
9e6e5ae243 Fix build. Missed current.txt in previous checkin.
Change-Id: I458944fbd9b04526068d03330620ad4805b5c993
2012-09-18 19:10:34 -07:00
Romain Guy
4843d1934b am 4e54f930: Merge "Add test for layer updates optimizations" into jb-mr1-dev
* commit '4e54f930d4dcd297f45507883b9404e1a5ef703b':
  Add test for layer updates optimizations
2012-09-18 19:03:36 -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
7501fbd36e am 2a81fe68: Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev
* commit '2a81fe68c208768ea202cd0353ad4a8212c2b066':
  Further tune config_minScalingSpan for small screen devices.
2012-09-18 18:52:40 -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
978c923f5a am 55db6865: Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev
* commit '55db6865ef708d66fd2382d6e96a845b68030f20':
  Clean up and publish the YUV to RGB intrinsic.
2012-09-18 18:48:53 -07:00
Adam Powell
171fa7f2c5 am 98c370e7: Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev
* commit '98c370e71d93ed2704018e2bc3455f00c08821a9':
  Make invalidateOptionsMenu asynchronous
2012-09-18 18:47:17 -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
Dianne Hackborn
ff88bee1c0 am 1e5aeecb: Merge "Don\'t allow more than 3 actively running users at a time." into jb-mr1-dev
* commit '1e5aeecb64827d2b71f429d73a05c25ffe4a5be8':
  Don't allow more than 3 actively running users at a time.
2012-09-18 18:30:08 -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
2e16d61257 am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev
* commit '6d4e887da4c8f2f0e246afd7961e2b2df0cc1aa4':
  Move X509TrustManagerExtensions to correct directory
2012-09-18 17:54:36 -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
4074f0817e am 954a5d61: Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev
* commit '954a5d61a2b66a64a841669f75e1cbd9103029b5':
  AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected
2012-09-18 17:15:35 -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
51f225bbe3 am 24755d2b: Merge "mutate() didn\'t work as advertised Bug #7162705" into jb-mr1-dev
* commit '24755d2b4248c2aa678e08a4703e8e97fd2e7dd1':
  mutate() didn't work as advertised Bug #7162705
2012-09-18 17:06:03 -07:00
Jim Miller
0c6c57e390 am 402f0c81: Merge "Refactor Carrier text as a movable module." into jb-mr1-dev
* commit '402f0c81230304379d7c4108745f928b34e052fa':
  Refactor Carrier text as a movable module.
2012-09-18 17:04:13 -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
Romain Guy
4247ec1d56 am ceb5a981: Merge "Minimize state changes when updating layers" into jb-mr1-dev
* commit 'ceb5a981296e57a5fb1be60f7b030c4d6c7e0acb':
  Minimize state changes when updating layers
2012-09-18 15:54:59 -07:00
Fabrice Di Meglio
eef4e625d3 am 9ffc6047: Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev
* commit '9ffc6047f14883f853b643a2913bd590995b9031':
  Fix bug #7173155 API REVIEW: android.view.View
2012-09-18 15:54:55 -07:00