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

16719 Commits

Author SHA1 Message Date
Vasu Nori
16057fad00 fix broken logTimeStat stuff 
log time in the following 2 situations
1. all transactions. time measured = wall time between begin-commit
2. queries (which are not in tranactions)

Change-Id: I67be9487a96072695aff3529ba4a257f4c8ec596
 2011-03-18 16:10:39 -07:00
Huahui Wu
a492e1a14b am ddba200b: am 9691d3f3: am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 
* commit 'ddba200b425c56b3b66ead23e8d5fd51a17c6cc4':
  b/3392594 keep the remain touch points when one is ended.
 2011-03-14 15:22:12 -07:00
Scott Main
a51a6beeed am 9e173ece: am 2213a4ac: am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget 
* commit '9e173ececf985c1dcd32e3cc2627499919fc329b':
  docs: update search dev guide with SearcView widget
 2011-03-14 15:19:21 -07:00
Huahui Wu
9691d3f318 am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 
* commit 'b71020ef4018195a21d2538ea3767b901610daf4':
  b/3392594 keep the remain touch points when one is ended.
 2011-03-14 14:46:27 -07:00
Scott Main
c899d32e8b docs: update search dev guide with SearcView widget 
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
 2011-03-14 14:44:41 -07:00
Huahui Wu
b71020ef40 Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 2011-03-14 14:43:46 -07:00
Scott Main
2213a4aca0 am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget 
* commit '462012db70fb73431bb25909d73e45fea9fc5911':
  docs: update search dev guide with SearcView widget
 2011-03-14 14:42:51 -07:00
Scott Main
462012db70 am abdf0d53: docs: update search dev guide with SearcView widget 
* commit 'abdf0d533c292709e51cee2c1213d5e44baca963':
  docs: update search dev guide with SearcView widget
 2011-03-14 14:36:56 -07:00
Michael Jurka
e3f075622d Merge "Removing TextView predraw listeners sooner" 2011-03-14 14:23:47 -07:00
Wink Saville
c3853f3664 Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 2011-03-14 13:41:26 -07:00
Wink Saville
c15cf6353e Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 2011-03-14 13:40:58 -07:00
Michael Jurka
2b942d5329 Removing TextView predraw listeners sooner 
Solves issue where the listeners were being run on every frame
 2011-03-14 13:31:03 -07:00
Scott Main
abdf0d533c docs: update search dev guide with SearcView widget 
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
 2011-03-14 13:27:53 -07:00
Huahui Wu
2d3ef37ae6 b/3392594 keep the remain touch points when one is ended. 
This is the Java side code change for b/3392594.
It adds an action index into the touch event data and pass it
to the native side.

Change-Id: Ibb393e62a590d0fff1dd3172041748e2b10501d6
 2011-03-14 13:21:23 -07:00
Robert Greenwalt
04cac40ff8 Do not merge: Add some input checking to prevent problems 
Adding nulls can cause unhappiness.  It's suspected as a cause of 3495045.

bug:3495045
Change-Id: I925c965ef64032fc57849bf15fe9b11f4bc99351
 2011-03-14 12:25:09 -07:00
Wink Saville
9d7d62801d Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support" 
This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
and is the first of the LTE commits in master being back ported
to the LTE branch.

Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
 2011-03-14 12:25:04 -07:00
Nick Pelly
d1c49d681c am a64e2ad4: resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
* commit 'a64e2ad4da3612586594a19489a2b5d44f3f23a0':
  Implement new NFC-EE API's as shared library (frameworks/base).
 2011-03-14 12:04:51 -07:00
Gilles Debunne
e1fb6ebd13 Merge "Removed empty block warnings in TextView" 2011-03-14 11:28:31 -07:00
Gilles Debunne
2b63ffc536 Merge "Wrong null check in TextView" 2011-03-14 11:28:20 -07:00
Nick Pelly
a64e2ad4da resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
 2011-03-14 10:28:11 -07:00
Mike Lockwood
0c5820ad8e am 151c74b3: am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 
* commit '151c74b3c679a1799d01f210a2a3f4a658154320':
  Add a dialog to ask user to start an application for a USB device or accessory
 2011-03-14 07:10:07 -07:00
Mike Lockwood
151c74b3c6 am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 
* commit 'e976ff4a2203e5a01c9a1c1a018ba9e5ab7777f7':
  Add a dialog to ask user to start an application for a USB device or accessory
 2011-03-14 06:55:24 -07:00
Mike Lockwood
bce6f8f249 Add a dialog to ask user to start an application for a USB device or accessory 
This is used when there is only one application available and the user has
not chosen to start it by default.
If more than one application is available we continue to use UsbResolverActivity

Bug: 4074719

Change-Id: Id61f2ccc6de5b9ac70fb4670006ff1fee2028d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-13 19:18:08 -04:00
Dianne Hackborn
df35762758 am ce3bcbad: am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 
* commit 'ce3bcbade5ca3eac5bae2e06fa37d17f00006a15':
  Fix issues #4087362 and #4087356
 2011-03-11 23:10:55 -08:00
Mike Lockwood
e1976e5c61 am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 
* commit '3b473d958c46ea6511b9599f727b47636e5cbc4a':
  USB: minor cleanup work
 2011-03-11 23:10:41 -08:00
Dianne Hackborn
ce3bcbade5 am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 
* commit '9ff6483843bfa23751b1acf32b169fca9ad97f7f':
  Fix issues #4087362 and #4087356
 2011-03-11 18:04:04 -08:00
Dianne Hackborn
9ff6483843 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 2011-03-11 18:01:47 -08:00
Mike Lockwood
3b473d958c am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 
* commit '9fffd9a8bb73e9b225878686862d49b27e98c659':
  USB: minor cleanup work
 2011-03-11 17:54:23 -08:00
Mike Lockwood
9fffd9a8bb Merge "USB: minor cleanup work" into honeycomb-mr1 2011-03-11 17:52:36 -08:00
Gilles Debunne
d40cc3c58a Removed empty block warnings in TextView 
Change-Id: Ieec52faa6fa7160fb3f8fca30cdd25125ccd51ee
 2011-03-11 16:59:32 -08:00
Gilles Debunne
6a85508e94 Wrong null check in TextView 
Bug 4087576

Change-Id: I907cb08b24b23715f3900bc076de2cc856650981
 2011-03-11 16:51:41 -08:00
Adam Powell
e5c1bdfa98 am f7db87f0: am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 
* commit 'f7db87f0730ce91e3230b798b3a85bb47f655ba8':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances
 2011-03-11 16:44:09 -08:00
Adam Powell
f7db87f073 am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 
* commit '87584f51a865cfe8ef19c2b24e858a63cb3e475c':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances
 2011-03-11 16:41:50 -08:00
Adam Powell
87584f51a8 Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 2011-03-11 16:39:42 -08:00
Mike Lockwood
62cfeeb821 USB: minor cleanup work 
Bug: 4067029

Change-Id: Icd8f912ab8732b5f770a217b9b3731092597ce02
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 18:51:29 -05:00
Nicolas Roard
9a3595c2c8 am c6c311f7: am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 
* commit 'c6c311f77459c3852d4a8c887657f6a135ad4cdf':
  HTML5 Video improvements
 2011-03-11 15:18:46 -08:00
Nicolas Roard
c6c311f774 am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 
* commit 'f0230cca194c840684bab959856c56725fc40b87':
  HTML5 Video improvements
 2011-03-11 15:11:14 -08:00
Nicolas Roard
f0230cca19 Merge "HTML5 Video improvements" into honeycomb-mr1 2011-03-11 14:35:32 -08:00
Nicolas Roard
0e778a1ab0 HTML5 Video improvements 
- add support for the fullscreen button

counterpart webkit CL: https://android-git.corp.google.com/g/#change,101484

bug:2126902
Change-Id: Ibcc8c5b115089ad1f30ebe76e4d5c31b2d6389f9
 2011-03-11 14:29:05 -08:00
Dianne Hackborn
cf407ad88b Fix issues #4087362 and #4087356 
4087362: Provide a safer way to call DialogFragment.dismiss()
4087356: PreferenceActivity.invalidateHeaders() can cause
IllegalStateException: Can not perform this action after onSaveInstanceState

These are very safe; the first is just a new public API that
allows you to use an existing feature in DialogFragment, and the
second just uses the version of commit that avoids the failure if
happening at a point where the operation would be lost if restored
from the last state (which is no big deal for preferences).

Change-Id: I53971c9fb1efdcd599694cdcd4585b81afc156b8
 2011-03-11 13:48:32 -08:00
Mike Lockwood
b46ecb3526 am 75c95e9a: am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* commit '75c95e9a6d5a91b660af62f72b5a3bac0f5c3811':
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 11:53:13 -08:00
Adam Powell
c37308f116 Fix bug 4083825 - Gesture zoom locked along content edges under some 
circumstances

Tune the procedure used to handle "zoom slop" during a webview
pan+zoom gesture.

Change-Id: Ia706722ba6a46e64cce8814d4668e3857b16e562
 2011-03-11 11:44:08 -08:00
Mike Lockwood
75c95e9a6d am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* commit '0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 11:37:14 -08:00
Christopher Tate
08758fad84 am ab1f2a82: am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 
* commit 'ab1f2a824ba55ac7cabd2a342ab78a798408f44f':
  Broaden the filter for wallpaper restore
 2011-03-11 11:03:30 -08:00
Mike Lockwood
0eb7b697b7 Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* changes:
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 10:57:06 -08:00
Christopher Tate
ab1f2a824b am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 
* commit '9856fbd40470c9f441b6c38b980210cfdef821e9':
  Broaden the filter for wallpaper restore
 2011-03-11 10:48:46 -08:00
Christopher Tate
9856fbd404 Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 2011-03-11 10:45:17 -08:00
Gilles Debunne
05bb0105bf Merge "Refactor in TextView's HandleViews." 2011-03-11 09:45:35 -08:00
Mike Lockwood
a75075e167 UsbManager: Hide APIs not needed for USB host or accessory support. 
Bug: 4067029

Change-Id: Ib63ab95a6571d6a691834bfb583a68d2e4cfd22e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 11:26:38 -05:00
Mike Lockwood
acc29cc91b UsbDevice: Move IO related methods to new UsbDeviceConnection class 
UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.

Bug: 4067029

Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 10:24:21 -05:00