54742 Commits

Author SHA1 Message Date
Jesse Wilson
a11c2f8674 Merge "Track line and column when parsing JSON." 2011-07-18 14:39:39 -07:00
Jesse Wilson
febae4ed18 Track line and column when parsing JSON.
This is a prerequisite to skipping the BOM if it exists.
Bug: http://code.google.com/p/android/issues/detail?id=18508

Change-Id: I38b1c46f246d8526fa20859b50ca3e25c9f9b9d1
2011-07-18 14:37:22 -07:00
Jesse Wilson
1a1d731c9c Merge "Always escape chars that JavaScript treats as newlines." 2011-07-18 14:27:31 -07:00
Fabrice Di Meglio
989571eeca Merge "Fix resolution padding glitch" 2011-07-18 14:26:45 -07:00
Fabrice Di Meglio
46c7250798 Merge "Clean test APIs for Harfbuzz support" 2011-07-18 14:26:34 -07:00
Jamie Gennis
054d5c5740 Merge "EGL: update EGL_ANDROID_recordable extension." 2011-07-18 13:36:19 -07:00
Chet Haase
abb7d66049 Merge "Fixed animation ordering bug in LayoutTransition." 2011-07-18 13:07:34 -07:00
Jim Miller
b5d4f97126 Merge "Fix 5023708,4689527: Add popups and overlays to recents. Misc bug fixes." 2011-07-18 12:59:36 -07:00
Jim Miller
c0d2731047 Fix 5023708,4689527: Add popups and overlays to recents. Misc bug fixes.
Adds selection overlay to recents to comply with UX design.
Adds longpress popup for removal and inspection of items.

Change-Id: Ic23c3f135b6ed107cc5156505d8f163daa94c52e
2011-07-18 12:57:40 -07:00
Svetoslav Ganov
b44f8f4e22 Merge "Touch exploration separate setting and API to poll the latter state." 2011-07-18 12:57:02 -07:00
Jesse Wilson
0fc0edfd27 Always escape chars that JavaScript treats as newlines.
Related GSON Bug: http://code.google.com/p/google-gson/issues/detail?id=341
Change-Id: I41b1615c4b3b4526f2223a75191f9b0699cdda12
2011-07-18 12:56:42 -07:00
Conley Owens
88c2d4d26d am f139965e: (-s ours) am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'f139965e4acc8eadb57f1d18d34ea3a89ab622d0':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:55:22 -07:00
Conley Owens
f139965e4a am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '45ddd42544167494cee7213ecddcb6f8057c86c0':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:47:50 -07:00
Conley Owens
45ddd42544 am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '3edba93fd9bff8e2b22486271e6e816e3b233ae9':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:44:57 -07:00
Svetoslav Ganov
35bfedeaba Touch exploration separate setting and API to poll the latter state.
1. Seperated touch exploration to be a seperate setting rather being
   magically enabled by the system of accessiiblity is on the there
   is at leas one accessibility service that speaks enabled. Now
   there is a setting for requesting touch exploration but still the
   system will enabled it only if that makes sense i.e. accessibility
   is on and one accessibility service that speaks is enabled.

2. Added public API for checking of touch exploration is enabled.

3. Added description attribute in accessibility service declaration
   which will be shown to the user before enabling the service.

4. Added API for quick cloning of AccessibilityNodeInfo.

5. Added clone functionality to SparseArray, SparseIntArray, and
   SparseBooleanArray.

bug:5034010
bug:5033928

Change-Id: Ia442edbe55c20309244061cd9d24e0545c01b54f
2011-07-18 12:44:08 -07:00
Conley Owens
3edba93fd9 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:42:42 -07:00
Conley Owens
98fcc4041d Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2011-07-18 12:37:16 -07:00
Chet Haase
eb1d851e0e Fixed animation ordering bug in LayoutTransition.
This bug caused an artifact in Recent Apps where you might see things
pop to their end location before popping back and then animating correctly
into place.

Change-Id: Ia7313ec76cc42162528c3c167b8bc562284b14bc
2011-07-18 12:12:36 -07:00
Dianne Hackborn
d94b71de3b Merge "Work on death recipient leaks in Activity Manager and Content Service." 2011-07-18 11:30:16 -07:00
Jean-Michel Trivi
211f5af3bb Merge "Add option to query hardware decoders only" 2011-07-18 11:07:47 -07:00
Jean-Michel Trivi
56a37b0529 Add option to query hardware decoders only
Add an option to OMXCodec::QueryCodecs() to filter out
 software codecs.

Update stagefright command line tool to list the roles of codecs.

Change-Id: Icddb79118c30fe13cc3aea20f340174cc082c4e0
2011-07-18 10:57:50 -07:00
Mike Lockwood
55421aa80e Merge "NetInitiatedActivity: support AUTO response feature for SUPL IOT" 2011-07-18 10:27:42 -07:00
Narayan Kamath
c79c0792a4 Merge "Few minor TTS clean ups." 2011-07-18 10:12:56 -07:00
Alexy Shin
7adcdecf80 NetInitiatedActivity: support AUTO response feature for SUPL IOT
Change-Id: I38a9ed0b03cb7f9ce2b81e0742ef48508d8392af
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-18 09:42:55 -07:00
Andreas Huber
919511a6da Merge "Always consider playlists corresponding to different bandwidths different." 2011-07-18 09:04:28 -07:00
Andreas Huber
e16b295529 Merge "Fix seek behaviour at startup and teardown of media session that hasn't been started" 2011-07-18 09:04:22 -07:00
The Android Open Source Project
a4497ccd7d Reconcile with gingerbread-release
Change-Id: I74130bf01f70959376b8453e0288c4436cdbec2b
2011-07-18 08:10:06 -07:00
Narayan Kamath
90e5650f96 Few minor TTS clean ups.
(a) Remove unnecessary null check.
(b) Remove unused function.
(c) Clean up for TextToSpeech#shutdown.

Change-Id: I3ec5bccc327437064da130634a14aaf7d48eca4d
2011-07-18 16:00:49 +01:00
Narayan Kamath
be4ad4ac66 Fix a few threading issues in the AudioPlaybackHandler.
Also fixes a bug where PlaybackSynthesisCallback would
continue to pump audio to the audio playback thread after
being stopped.

Change-Id: I3233eb4858245b6e7c7df72e241a0708c668f1b4
2011-07-18 12:01:30 +01:00
Narayan Kamath
f564ed8792 Merge "Improve TextToSpeech#isSpeaking()" 2011-07-18 02:52:35 -07:00
Mike Lockwood
3bfa72b119 Merge "MTP: Use a single packet for the data phase" 2011-07-18 00:05:24 -07:00
Svetoslav Ganov
952d073373 Merge "Update the style of the action bar share UI" 2011-07-17 23:06:35 -07:00
Svetoslav Ganov
414051b8b1 Update the style of the action bar share UI
1. Made the background of the default and expand buttons change when pressed.

2. When the share UI is shown on the overflow the "Show all" menu item was
   present event if all items are shown.

3. The width of the popup for picking an item was different for the action
   view and overflow case.

bug:5039747

Change-Id: I72afbcf86c93596c7eba4d70c002eab060ff31f8
2011-07-17 22:59:25 -07:00
Jamie Gennis
8fdb8a4dd3 EGL: update EGL_ANDROID_recordable extension.
This change adds an enum value and a description of the expected
implementations to the EGL_ANDROID_recordable extension specification.
It also adds the new enum value to the 'eglext.h' header.

Change-Id: Ia0de2d5613708445ff83b85a7e550f9417531ee4
2011-07-17 18:42:09 -07:00
Dianne Hackborn
1b64e0d865 Work on death recipient leaks in Activity Manager and Content Service.
This should fix a leak of process death recipients in the activity manager.

Also add debugging of content observers to try to track down what looks
like a leak of them in the content service.

Change-Id: Id6823679493ef0cde5307bb66490ebe31b878556
2011-07-17 17:50:37 -07:00
Adam Powell
8f2fe87e25 Merge "Make View#setBackgroundDrawable a no-op if setting the same background." 2011-07-17 17:16:37 -07:00
Eric Laurent
8bf1f5b17c Merge "Audio preprocessing wrapper for webrtc." 2011-07-17 17:12:42 -07:00
Adam Powell
4d36ec11f2 Make View#setBackgroundDrawable a no-op if setting the same background.
Change-Id: Idd3e0ae80609557d82a5564daa1cfb0abca42ded
2011-07-17 16:44:16 -07:00
Jeff Sharkey
bd029f64f2 Merge "Data usage notifs, newly installed apps, defaults." 2011-07-17 16:29:11 -07:00
Jeff Sharkey
02e21d6a5b Data usage notifs, newly installed apps, defaults.
Only show warning/limit notifications for active networks, since they
aren't actionable for inactive IMSI.  Include IMSI in debug output on
engineering builds.

Move default policy warning to be configured through overlay.  Watch
for newly installed packages to enforce global policy.

Bug: 5038729, 5038541, 4979026, 5023634
Change-Id: I8fc8ab4c23c440a3091504ea16133ed6ababf58e
2011-07-17 16:28:02 -07:00
Elliott Hughes
f9cf814440 Stop attempting to call the removed -Xdeadlockpredict option.
Bug: 5038293
Change-Id: If834f07355c110eb02cc8a96e25b432c508462cd
2011-07-17 15:58:30 -07:00
Dianne Hackborn
c9b5970df5 Fix build.
Change-Id: I06243c668b85c0816fc7b1b8318bbcc28f88dc71
2011-07-17 15:23:09 -07:00
Eric Laurent
484e320fe0 Audio preprocessing wrapper for webrtc.
This wrapper implements the interworking layer between the audio effect
interface defined by the effect framework for audio preprocessing
and the native interface of webrtc audio processing module.

Change-Id: I3f9319730c102599cdf0dda520a53d90b4165114
2011-07-17 14:33:52 -07:00
Dianne Hackborn
066836fce9 Merge "Fix a couple static leaks." 2011-07-17 14:30:25 -07:00
Dianne Hackborn
1078609d44 Merge "Rework and fix "adb shell dumpsys meminfo"" 2011-07-17 14:29:54 -07:00
Adam Powell
9c7b5ec073 Merge "Fix bug 5037642 - Refine back button behavior for action bar modes." 2011-07-17 14:29:20 -07:00
Dianne Hackborn
de4c26fa1a Fix a couple static leaks.
Change-Id: If2564dc822fbcb3bb3baf270ad2b3c29c78bf421
2011-07-17 13:49:27 -07:00
Dianne Hackborn
0e3328fbdd Rework and fix "adb shell dumpsys meminfo"
We now collect more detailed information splitting the maps into
additional useful categories.

Fixed some bugs in account, such as not correctly handling all of
the current dalvik allocations.

The activity manager now prints a final summary of all pss organized
by the apps and the categories.

Change-Id: Iafc5f27c998095812b1483c6803b8e0f0587aeae
2011-07-17 13:48:37 -07:00
Jeff Sharkey
9cbf8e270d Merge "Acquire wakelock during network stats collection." 2011-07-17 13:06:38 -07:00
Adam Powell
b80d332e74 Fix bug 5037642 - Refine back button behavior for action bar modes.
Action modes for the action bar used to aggressively hijack the back
button before the view hierarchy got a chance to respond to it. Loosen
this. New ordering is: view hierarchy => window feature-level modes
(action bar modes e.g. CAB/search) => Activity/window callback
behavior.

Change-Id: Iac1b22997713be968a94f77f9fa6cebaf6f923f0
2011-07-17 13:04:37 -07:00