76870 Commits

Author SHA1 Message Date
Jeff Brown
51f2430217 Support toast cancellation.
Change-Id: Idd00b9c6e3049822e437afaf56351575a5c167df
2012-05-20 12:09:37 -07:00
Raphael Moll
6c255a3a37 Merge "AAPT: support a new --ignore-assets flag."
AAPT has a fixed built-in list of files and directories
to ignore when parsing resource files. Over the years we
always had developers requiring specific patterns.

Added a command-line option for it:
  aapt di --ignore-assets "foo*:*.blah"

If the env var ANDROID_AAPT_IGNORE is set, it is parsed
to find which file/directory patterns to ignore.

Otherwise a default is used that matches the current behavior.

SDK Bug: 5343 24067

(cherry-pick from AOSP 90897ed87bce639bf6bb2ccf15fbabb59b131bab)

Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
2012-05-18 20:34:44 -07:00
Dianne Hackborn
13a0271cb8 Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev 2012-05-18 19:39:09 -07:00
Dianne Hackborn
9275197d35 Add aapt support for generating proguard rules for onClick methods.
Also fix Activity menu inflater when using the dark on light
theme wrapper to still be able to find onClick listeners.

Change-Id: Ie206db26d1df96041bc477804e476b02ad99dc9d
2012-05-18 19:23:19 -07:00
Dianne Hackborn
35013d0e8b Merge "DO NOT MERGE: Remove a few left-over layout direction things." into jb-dev 2012-05-18 18:04:11 -07:00
alanv
9c3e0e6826 Fix accessibility actions in AbsListView.
Check adapter for position enabled state, check selection index.

Bug: 6508142
Change-Id: If25a133533a7316ef7eba8761522bd2ee4f6338d
2012-05-18 17:43:35 -07:00
John Wang
df7bbfd7c2 Only reset time from NITZ in zone fix.
When timezone property gets reset by mcc change, SST only adjusts time to
reflect new timezone settings if there is NITZ string w/o timezone.

bug:6465783
Change-Id: I1a27b3f371f79aa532de1c94ec5cb12285bdfdb4
2012-05-18 17:36:31 -07:00
Romain Guy
52fcdd0139 Merge "Fix documentation" into jb-dev 2012-05-18 17:34:42 -07:00
Dianne Hackborn
39af624f31 DO NOT MERGE: Remove a few left-over layout direction things.
Change-Id: Id66b171594af939df4716aa0e0baa25fe47eecee
2012-05-18 17:34:06 -07:00
Adam Powell
52bfe0ff51 Merge "Sentence case is the best case. Just Once is not a special case." into jb-dev 2012-05-18 17:32:52 -07:00
Craig Mautner
255632d160 Merge "Prevent dim surface from flashing." into jb-dev 2012-05-18 17:32:48 -07:00
Romain Guy
d2aed40a37 Fix documentation
Change-Id: Id3a5d3b6b43ce684c2328f046e4991e64e97575a
2012-05-18 17:32:08 -07:00
Romain Guy
9579bf821e Merge "Gallery, we need to talk..." into jb-dev 2012-05-18 17:29:58 -07:00
Adam Powell
265f1c7b00 Sentence case is the best case. Just Once is not a special case.
Bug 6459691

Change-Id: Iaf90d51258047f4469f0f74470ae699f2fef07ba
2012-05-18 17:22:28 -07:00
Craig Mautner
067ca32a52 Prevent dim surface from flashing.
This fix keeps the dim surface below the highest shown layer. If
two shown layers were both dim it was ambiguous where the dim surface
would appear causing dialogs to first be dimmed and then flash when
the dim was put behind them.

Fixes bug 6497476.

Change-Id: I360cf2d23d58fc4c03edbbed16d79c08c29e48b9
2012-05-18 17:19:51 -07:00
John Wang
8834538a4e Change "uk" to "gb" in COUNTRY_CODES.
Since MccTable uses "gb" instead of "uk" for United Kingdom.

bug:6465783
Change-Id: Ifc2e2e7e72bd8405c698474d2ab9d01cb4ca006b
2012-05-18 17:16:12 -07:00
Romain Guy
5a418c771d Gallery, we need to talk...
Change-Id: Ie4b62df03c27161565d303d11447e3d7ff3115c4
2012-05-18 17:09:53 -07:00
Mathias Agopian
2598a5c89f Merge "drop frame in case of error in updateTexImage" into jb-dev 2012-05-18 17:09:10 -07:00
Mathias Agopian
df071486e0 drop frame in case of error in updateTexImage
Bug: 6476587
Change-Id: I864a7d0997761150a3db2ddd5890ed820d792e56
2012-05-18 16:58:00 -07:00
Romain Guy
43a760ba84 Merge "Don't crash on Surface.unlockAndPost() but log & try again Bug #6482593" into jb-dev 2012-05-18 16:25:41 -07:00
Dianne Hackborn
fb5c3dba4d Fix issue #6440173: MenuItem.setIcon(Drawable) scaling incorrectly...
...when resource is aliased

We were not correctly using the final resolved configuration when
retrieving a drawable through Resources.getDrawable().  (It already
does the correct behavior when going through TypedArray.getDrawable()).

Change-Id: I9032b788b592412178e31e2e6b0181b92c20fe45
2012-05-18 15:51:27 -07:00
Romain Guy
dddcd22b7e Don't crash on Surface.unlockAndPost() but log & try again
Bug #6482593

Change-Id: Ib477b58e2b7a6cb19a87d05f2aa0448e04d82f7c
2012-05-18 15:33:57 -07:00
Dianne Hackborn
d51ac09fd7 Merge "Fix activity resolver, issues #6519130 and #6507239" into jb-dev 2012-05-18 15:14:41 -07:00
Dianne Hackborn
5320eb8938 Fix activity resolver, issues #6519130 and #6507239
6519130: Starting ResolverActivity with no arguments crashes system_server
6507239: ResolverActivity may bypass signature permissions

Change-Id: I64534f781bc6b7eb45e85dbe3a55d351ee28e85c
2012-05-18 15:04:53 -07:00
Justin Ho
00d1c3a7b1 Merge "Updating default wallpaper." into jb-dev 2012-05-18 14:38:59 -07:00
Winson Chung
23c87915d9 Updating default wallpaper.
Change-Id: I18273a7c6b50473f3a6cd9554c69c0125a1fa3b5
2012-05-18 14:37:03 -07:00
Jeff Sharkey
9cb660fa34 Merge "Guard against apps breaking CHOOSER contract." into jb-dev 2012-05-18 14:20:02 -07:00
Jeff Sharkey
1c29700c5f Guard against apps breaking CHOOSER contract.
Bug: 6520937
Change-Id: I677a644cf7765bbb046f9c82e1ebd8a40968cee6
2012-05-18 13:55:47 -07:00
Dianne Hackborn
e312c61f93 Merge "Improve fitSystemWindows() documentation." into jb-dev 2012-05-18 12:55:05 -07:00
Jeff Sharkey
787c9ec558 Merge "Transition from DEV network stats to XT." into jb-dev 2012-05-18 11:40:42 -07:00
Dianne Hackborn
d5333f9289 Improve fitSystemWindows() documentation.
Change-Id: I6528f2530e6514344e454510f2fa037b55daebb7
2012-05-18 11:23:32 -07:00
Romain Guy
196a7dae63 Merge "Sanitize display list properties" into jb-dev 2012-05-18 11:13:13 -07:00
Romain Guy
f26c8be01b Sanitize display list properties
The comparisons used in the various properties setters could fail badly
in some specific conditions. The scale properties in particular did not
use the same comparisons.

This change also clamps alpha to the 0..1 range which avoids overflow
issues with lowp registers in GLSL computations.

Change-Id: I3e73b584e907a14e2c33d0865ca0d2d4d5bff31d
2012-05-18 10:58:45 -07:00
Elliott Hughes
4b51e293d8 Merge "Fix the preloaded-classes tool for JellyBean." into jb-dev 2012-05-18 10:36:34 -07:00
Daniel Sandler
7e22a223af Merge "Updated disconnected rssi icons." into jb-dev 2012-05-18 08:11:12 -07:00
Daniel Sandler
ce77ce1d2b Updated disconnected rssi icons.
Bug: 6449811
Change-Id: Ic7a1c4f9f75971783f8f9e49f65fdc25f5c83649
2012-05-18 10:26:20 -04:00
satok
0a1bcf4e0d Consolidate the initialization of InputMethodManagerService not to use resource values until system ready
Bug: 6477193
InputMethodManagerService have used the resource value of "isDefault" in the constructor. We should wait to use that value until system ready.
Change-Id: I682fc109c303d8c7fd33d494c59e8e28d6dc6fa5
2012-05-18 16:00:40 +09:00
Matthew Xie
dabb19fcd1 Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev 2012-05-17 21:49:55 -07:00
Jim Miller
af0a15c820 Merge "Fix 6516240: Remove unused bottom margins from owner info textview" into jb-dev 2012-05-17 21:00:48 -07:00
Jim Miller
9da2452f61 Merge "Fix 6441282: confine search gesture region on tablet navbar" into jb-dev 2012-05-17 21:00:32 -07:00
Nick Pelly
1ca4399706 Merge "Enforce the minTime parameter in LocationManager#requestLocationUpdates" into jb-dev 2012-05-17 20:57:56 -07:00
John Reck
88b756cd24 Merge "Don't show the touch highlight for double taps" into jb-dev 2012-05-17 20:03:17 -07:00
John Reck
aa5af8d004 Don't show the touch highlight for double taps
Bug: 6490959

Change-Id: I5a6cfa3d36f1df28d9c3b03e120f59581ee22c01
2012-05-17 19:57:08 -07:00
Jim Miller
161538985e Fix 6441282: confine search gesture region on tablet navbar
Depending on the device, this will be one of the id's in the navbar
view hierarchy used in the source.  It will default to the navbar
view if one isn't found.

Change-Id: I388412d4f247f7d2d102768708237711d722de3d
2012-05-17 19:48:43 -07:00
Adam Powell
93563d21a9 Merge "Log a warning when action bar view states cannot be restored." into jb-dev 2012-05-17 19:35:00 -07:00
Adam Powell
fb5f1bc085 Log a warning when action bar view states cannot be restored.
Some apps can get into a case where the saved view hierarchy states
for action bar views are missing. Log a warning instead of crashing.

Bug 6510800

Change-Id: I95ede64ec584892e6e76ca9ab9d53e9d3689984f
2012-05-17 19:30:35 -07:00
Pannag Sanketi
b5af71f2b1 Fixing the weird preview size w/ effects on camera
The aspect ratio sent from the camera app to the SurfaceTextureTarget
filter  does not really matter now since the camera app handles
the re-sizing. Hence, the SurfaceTextureTarget filter needs to be render
in "stretch" mode all the time even though the aspect ratio sent to the
filter might indicate otherwise. The filter still needs the correct
frame size for things other than determining aspect ratio.

Fix b/6430124

Change-Id: Ie7fa5cd2adf2a8d41e6e005418f6c6fd738ed85d
2012-05-17 19:29:33 -07:00
Jim Miller
77a5c61f9a Fix 6516240: Remove unused bottom margins from owner info textview
Change-Id: Ia5194b87cf7eddd0a55ad5c94c9e61ee4eb1180a
2012-05-17 19:29:29 -07:00
Romain Guy
c8c4ced838 Merge "Call invalidate() immediately when a frame is available" into jb-dev 2012-05-17 19:04:51 -07:00
Jim Miller
f7a44e8168 Merge "Fix 6398209: Increase outer ring size for search gesture on 600dp device" into jb-dev 2012-05-17 18:34:01 -07:00