drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,030 Commits 1 Branch 0 Tags
Commit Graph

41030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Shapiro
48e8ec611a am 366d15d5: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs."" into honeycomb 
* commit '366d15d5425aaa090d9c1a1d7273f13e2c85c43b':
  Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
 2011-01-21 15:08:04 -08:00
Carl Shapiro
366d15d542 Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."" into honeycomb 2011-01-21 15:05:26 -08:00
Nick Pelly
a4f26c3d03 am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread 
* commit '4d3ac03ade6184504ad3881def5e86133ae5f2f6':
  hange the default IsoDep timeout to 300ms (docs update).
 2011-01-21 15:03:19 -08:00
Mathias Agopian
80f3376b3a am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread 
* commit 'b92a40ebfaf49783f942b75b413e1499e149c3bb':
  fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
 2011-01-21 15:02:26 -08:00
Amith Yamasani
d75ee6f13a am 7c93e52f: (-s ours) am 68153821: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread 
* commit '7c93e52fac25fb76a67a82f1ccaa4ff6ad42e6ed':
  Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
 2011-01-21 15:02:18 -08:00
Gilles Debunne
48617a5134 am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb 
* commit 'b5e5b2d99b6b56798f863b24b786c351d9b22cf3':
  Tapping inside an EditText should always pop up the IME.
 2011-01-21 14:55:50 -08:00
Gilles Debunne
b5e5b2d99b Merge "Tapping inside an EditText should always pop up the IME." into honeycomb 2011-01-21 14:53:44 -08:00
Carl Shapiro
d6c276a5ef Revert "Make AwesomePlayer's reset process more verbose to track down ANRs." 
This reverts commit 90c656574175bd54ed8d258f406f158177e5e91c.

Bug: 3378444
Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
 2011-01-21 14:52:51 -08:00
Amith Yamasani
610dff54fc am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb 
* commit 'b58b5db4ba8edc075f6524df200aa8d3c678e267':
  Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
 2011-01-21 14:49:34 -08:00
Michael Kolb
b2b830774f am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb 
* commit 'debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
  Add public API for on screen zoom controls
 2011-01-21 14:49:30 -08:00
Amith Yamasani
b58b5db4ba Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb 2011-01-21 14:47:32 -08:00
Michael Kolb
debb5bbe81 Merge "Add public API for on screen zoom controls" into honeycomb 2011-01-21 14:47:30 -08:00
Andreas Huber
3564d9eada am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded to a surface." into honeycomb 
* commit '63d64a14790ae21db31b60747864b4a7565b33c3':
  Properly rotate video that's marked as such and decoded to a surface.
 2011-01-21 14:44:21 -08:00
Andreas Huber
63d64a1479 Merge "Properly rotate video that's marked as such and decoded to a surface." into honeycomb 2011-01-21 14:42:22 -08:00
Irfan Sheriff
135531b20a am ef76b830: am 4170b463: Merge "Do not add unsolicited events to queue" into gingerbread 
* commit 'ef76b8306fd6147d9dd7e3b7dce10354eff8033c':
  Do not add unsolicited events to queue
 2011-01-21 14:37:14 -08:00
Jeff Brown
4f76290026 am b26c516c: (-s ours) am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread 
* commit 'b26c516c03beffaf60460d3589b3807c0799c344':
  Filter virtual keys after touches.  (DO NOT MERGE)
 2011-01-21 14:37:07 -08:00
Brad Fitzpatrick
7f1b722dd1 am 02bbbc11: am 069e810c: Merge "Fixing memory leak in PreferenceScreen." 
* commit '02bbbc1122eac6ab02c10c3c1bb34092914e3743':
  Fixing memory leak in PreferenceScreen.
 2011-01-21 14:36:54 -08:00
Brad Fitzpatrick
8a82de2fca am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager" 
* commit '4bb180d62f71658d04a7d6800707de83c10b01a5':
  frameworks/base: remove redundant code in WindowManager
 2011-01-21 14:36:43 -08:00
Martijn Coenen
ed0c705f3e am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly(). 
* commit 'c4eee776ad9d3de99032984fe20f5de395888bc7':
  Check NDEF before calling makeReadOnly().
 2011-01-21 14:36:33 -08:00
Nick Pelly
ed8bb922c2 Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-01-21 14:34:03 -08:00
Leon Scroggins
12871245c7 am 60130138: Merge "Restart input when the webpage changes the text." into honeycomb 
* commit '6013013829d1f97970d3ed426006d2522303826f':
  Restart input when the webpage changes the text.
 2011-01-21 14:33:03 -08:00
Andreas Huber
5e9dc94a3c Properly rotate video that's marked as such and decoded to a surface. 
Change-Id: I1e9144db3447e58c99aac3f47702ad471678789c
related-to-bug: 3378148
 2011-01-21 14:32:31 -08:00
Jason Sams
0629ac78fc am 8418474d: Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb 
* commit '8418474dab412596c44c71497c0f4a3c39de597e':
  fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking.
 2011-01-21 14:30:56 -08:00
Leon Scroggins
6013013829 Merge "Restart input when the webpage changes the text." into honeycomb 2011-01-21 14:30:50 -08:00
Jason Sams
8418474dab Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb 2011-01-21 14:28:55 -08:00
Yu Shan Emily Lau
58fc2d39e8 am 588b1e45: Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb 
* commit '588b1e4511d67f080449c3d49fd0d4bfc2bec79f':
  Change the default ssid from GoogleGuest to the opennet for the power test.
 2011-01-21 14:28:52 -08:00
Yu Shan Emily Lau
588b1e4511 Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb 2011-01-21 14:27:06 -08:00
Michael Kolb
5840cd294a Add public API for on screen zoom controls 
http://b/issue?id=3378224
    This is a simple unhide.
    Allow the use of WebView pinch-to-zoom gestures
    without the on screen zoom controls.
    Currently, enabling pinch to zoom with the public API also shows the
    on screen zoom buttons.
    If the zoom buttons are not wanted, a custom implementation of pinch to
    zoom is required, which can't be done correctly at this point.

Change-Id: I3f94080471c3a4b498b11c91603fff9994dc3c2c
 2011-01-21 14:15:16 -08:00
Leon Scroggins
a51063c059 Restart input when the webpage changes the text. 
Bug:3375518
Change-Id: I0a18d0ca764ce428d86bd5f6d13f8764668acea6
 2011-01-21 17:14:36 -05:00
Yu Shan Emily Lau
3d273da8fa Change the default ssid from GoogleGuest to the opennet for the power test. 
Change-Id: I63bae360d283dc5224790aaccbd879015402187d
 2011-01-21 14:06:22 -08:00
Nick Pelly
8bb36dbbf3 resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp 
Change-Id: Idd58a1d4e9b9156e123ccbcbc17a59eedd46af4c
 2011-01-21 14:01:54 -08:00
Gilles Debunne
c3e85a712b Tapping inside an EditText should always pop up the IME. 
Bug 3374062

When the tap in slightly off the EditText, it receives focus from its parent layout
which dispatches the event. However, the touch event is (correctly) not propagated
in that case.

onFocusChanged should hence do actions similar to what is done on touch up events.

Change-Id: Ia5c04546674fc6239aa4d0b8d051f4951ca91352
 2011-01-21 13:35:29 -08:00
Romain Guy
11ad95c49b am d8b9d7cd: Merge "Don\'t set a Toast\'s view to null when enqueued several times. Bug #3374386" into honeycomb 
* commit 'd8b9d7cd1b2327b02e41edcddf94e64d481419d1':
  Don't set a Toast's view to null when enqueued several times. Bug #3374386
 2011-01-21 13:25:02 -08:00
Romain Guy
d8b9d7cd1b Merge "Don't set a Toast's view to null when enqueued several times. Bug #3374386" into honeycomb 2011-01-21 13:23:25 -08:00
Andreas Huber
9a62d902ea am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb 
* commit '05aa082770d812c5921d6b2f9b3559f1fd1536a8':
  Some tweaks to HTTP live / nuplayer behaviour
 2011-01-21 13:17:42 -08:00
Patrick Dubroy
338ebe1492 am 40c37043: Merge "Update Bitmap.recycle() doc for heap-allocated pixel data" into honeycomb 
* commit '40c37043367f7cefd3467c41c57ec7be169b681f':
  Update Bitmap.recycle() doc for heap-allocated pixel data
 2011-01-21 13:15:37 -08:00
Andreas Huber
05aa082770 Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb 2011-01-21 13:14:30 -08:00
Patrick Dubroy
40c3704336 Merge "Update Bitmap.recycle() doc for heap-allocated pixel data" into honeycomb 2011-01-21 13:13:17 -08:00
Jason Sams
ed5bab93c6 fix bug 3375251 
Copying arrays of objects would generate an exception
due to excessive internal type checking.

Change-Id: Ic89c24962408f1a95dc0385b74618a70d6ff5859
 2011-01-21 13:08:02 -08:00
Huahui Wu
48c4199ee6 am 17d25c56: Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb 
* commit '17d25c564da50cfdcef6705ccc592ced2bd7c960':
  b/3369602 Using Math.round() to convert float coordinates to integers.
 2011-01-21 13:05:24 -08:00
Huahui Wu
17d25c564d Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb 2011-01-21 13:03:49 -08:00
Leon Scroggins
62fd9903a7 am d5188657: Do a better job of lining up text with page text. 
* commit 'd5188657dcde0f40a6954a00d569c0575bf6095a':
  Do a better job of lining up text with page text.
 2011-01-21 12:59:05 -08:00
Leon Scroggins
d5188657dc Do a better job of lining up text with page text. 
Bug:3085564
Bug:3196224
Bug:3321608

Remove Touch.getMaxScrollX(), which is incorrect for my
purpose, and is not used anywhere else.  Instead use the
layout to determine the maximum horizontal scroll of a
textfield.

Now that textareas use layers, scroll the layer's picture
in the UI thread for vertical movement.  When passing a
click to webcore, also pass a message to scroll the actual
textarea so the click will be in the correct place.

Lastly, do not override bringPointIntoView, which allows
moving the insertion handler beyond the edge of a field to
scroll it.  Instead, override requestRectangleOnScreen to
do nothing, since my actual goal is to prevent the TextView
from changing the scroll of the WebView, which is done by
webkit.

Requires a change to external/webkit.

Change-Id: Ib91907599b792287c373d3678cb04e0cb5e34471
 2011-01-21 15:42:03 -05:00
Jesse Wilson
b5fe803ff5 am 276677f2: Merge "Move URLTest tests to libcore." into honeycomb 
* commit '276677f2ac821e5eb8a7f6a4204242ee47501d6e':
  Move URLTest tests to libcore.
 2011-01-21 12:36:24 -08:00
Jason parks
a55e367027 am 0512d080: Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb 
* commit '0512d080a5ae7eccb154be4302aaf4b5fb8aa5a6':
  Add and enforce the permission for encrypting/decrypting.
 2011-01-21 12:36:20 -08:00
Jason parks
bee8a7686d am 0f2ef34b: Merge "Update encryption commands." into honeycomb 
* commit '0f2ef34b5a7158ab105edfb0d6c5904ae23e89fa':
  Update encryption commands.
 2011-01-21 12:36:01 -08:00
Romain Guy
2152ca58c2 Don't set a Toast's view to null when enqueued several times. 
Bug #3374386

Change-Id: I0fc6f96b37c8866ad1e890813054dafbaf2cc13e
 2011-01-21 12:31:53 -08:00
Jesse Wilson
276677f2ac Merge "Move URLTest tests to libcore." into honeycomb 2011-01-21 12:13:11 -08:00
Patrick Dubroy
a383b3f646 Update Bitmap.recycle() doc for heap-allocated pixel data 2011-01-21 12:08:51 -08:00
Jason parks
0512d080a5 Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb 2011-01-21 11:59:15 -08:00