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

20536 Commits

Author SHA1 Message Date
Wei-Ta Chen
1f507be1c1 am a2048056: am 2498b4b8: Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1 
* commit 'a204805627eddeac0a1777c69ce62d31d339d4cd':
  Fix 3510563: memory leak in BitmapRegionDecoder.
 2011-03-09 16:27:25 -08:00
Wei-Ta Chen
a204805627 am 2498b4b8: Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1 
* commit '2498b4b8c6b02d553f46f9b48eee9d5295d36f16':
  Fix 3510563: memory leak in BitmapRegionDecoder.
 2011-03-09 16:25:24 -08:00
Wei-Ta Chen
2498b4b8c6 Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1 2011-03-09 16:21:53 -08:00
Dianne Hackborn
460d2c1886 am de478eca: am 7b5cb3c0: Merge "Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1 
* commit 'de478eca19adc263c033d777b0e6a33c8113fd24':
  Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl...
 2011-03-09 15:53:46 -08:00
Dianne Hackborn
de478eca19 am 7b5cb3c0: Merge "Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1 
* commit '7b5cb3c033f758368580664a8bdad43b47f3682d':
  Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl...
 2011-03-09 15:50:34 -08:00
Dianne Hackborn
7b5cb3c033 Merge "Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1 2011-03-09 15:47:24 -08:00
Huahui Wu
23ad53d231 am a1555b8f: am 37c2e3e5: Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1 
* commit 'a1555b8fa613b6374d2453fa73ff8eb1c1dfffc3':
  b/4075349 Make the pinch to zoom more responsive after limits.
 2011-03-09 15:42:14 -08:00
Huahui Wu
a1555b8fa6 am 37c2e3e5: Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1 
* commit '37c2e3e55641e91dd0ec3dbd296bc6bc7c7641cf':
  b/4075349 Make the pinch to zoom more responsive after limits.
 2011-03-09 15:39:56 -08:00
Huahui Wu
37c2e3e556 Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1 2011-03-09 15:37:56 -08:00
Huahui Wu
ff6f4c2eff b/4075349 Make the pinch to zoom more responsive after limits. 
Change-Id: I66ea0aa95ff6a471b7c2ae2cb1ce2fdd0f18ce01
 2011-03-09 15:13:01 -08:00
Mathias Agopian
c3e8bddecf am 176e7108: am 838aa45b: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1 
* commit '176e71081b17787652c778cd115e079199dac536':
  fix [4026375] SensorManager quaternion functions can call sqrt with a negative number
 2011-03-09 14:36:05 -08:00
Mathias Agopian
176e71081b am 838aa45b: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1 
* commit '838aa45b99f504596971063003fa8a75e89e4c41':
  fix [4026375] SensorManager quaternion functions can call sqrt with a negative number
 2011-03-09 14:32:47 -08:00
Mathias Agopian
838aa45b99 Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1 2011-03-09 14:30:16 -08:00
Leon Scroggins
2408954d7b am e1413a9e: am 23c5861c: Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1 
* commit 'e1413a9e9cdb2dd2792d318542db483b188276c8':
  Scroll textfield onscreen when the IME shows.
 2011-03-09 14:25:10 -08:00
Leon Scroggins
e1413a9e9c am 23c5861c: Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1 
* commit '23c5861cde7efef568fa3c61e0f1fa4fe97c7cfa':
  Scroll textfield onscreen when the IME shows.
 2011-03-09 14:22:50 -08:00
Leon Scroggins
23c5861cde Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1 2011-03-09 14:21:17 -08:00
Huahui Wu
02d7fe1326 am 45e5db99: am 166b190e: Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1 
* commit '45e5db99979d9f85e7c3cad3e750b886e3abb105':
  b/3307761 Clean up the flag mIsHandlingMultiTouch.
 2011-03-09 14:07:20 -08:00
Huahui Wu
45e5db9997 am 166b190e: Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1 
* commit '166b190efc35b7ddad6b011ba537c177e88a2336':
  b/3307761 Clean up the flag mIsHandlingMultiTouch.
 2011-03-09 14:04:52 -08:00
Dianne Hackborn
32de2f67ea Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl... 
...addHistoryRecordLocked(BatteryStatsImpl.java:1210)

It was doing a bunch of stuff without holding a lock!

Change-Id: Ie5b56514370e0bfc87ba7737d75e01df0859817e
 2011-03-09 14:03:35 -08:00
Huahui Wu
166b190efc Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1 2011-03-09 13:55:35 -08:00
Leon Scroggins
d69b701284 Scroll textfield onscreen when the IME shows. 
Bug:4079218
Change-Id: I69fe49582effe664c2288401871922a2cacc7c9c
 2011-03-09 16:18:28 -05:00
Ed Heyl
e888b25fb5 am cc7d3c53: am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1 
* commit 'cc7d3c539abd4affd5e95cff8740d9303deac63d':
  UsbManager: Fix broken Javadoc links
 2011-03-09 13:06:36 -08:00
Ed Heyl
cc7d3c539a am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1 
* commit 'b22bb1dae1213fe9383020a53eeb89de40e7bbd0':
  UsbManager: Fix broken Javadoc links
 2011-03-09 12:56:17 -08:00
Ed Heyl
b22bb1dae1 Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1 2011-03-09 12:53:38 -08:00
Mike Lockwood
980f0430c1 UsbManager: Fix broken Javadoc links 
Change-Id: Ia8ec7b29a7532feb00a28d6d325c129a9e041d2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-09 15:49:13 -05:00
Eric Laurent
18632db49a am 2dc78477: am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1 
* commit '2dc78477364bd4accb9a603baaafca9a5523dcec':
  Fix issue 3439872: video chat and bluetooth SCO
 2011-03-09 11:00:22 -08:00
Eric Laurent
2dc7847736 am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1 
* commit 'cc34967fdcbf64826a068901d6fb1bd8bb1fa99f':
  Fix issue 3439872: video chat and bluetooth SCO
 2011-03-09 10:57:49 -08:00
Eric Laurent
cc34967fdc Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1 2011-03-09 10:56:01 -08:00
Shimeng (Simon) Wang
2598bf600c am 246b2b31: am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1 
* commit '246b2b313cb545da9d6f791b90d5a1cc4316114e':
  Consider mInitialScale when setting min zoom scale.
 2011-03-09 10:53:44 -08:00
Shimeng (Simon) Wang
246b2b313c am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1 
* commit '12c37cafe184d5a6ac2a7a097c2fc616e5c1a6c8':
  Consider mInitialScale when setting min zoom scale.
 2011-03-09 10:51:26 -08:00
Mike Lockwood
e18a4067e0 am 094c9900: am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1 
* commit '094c9900de383f0934f74cedef0d24b6d8a14905':
  Change UsbManager.requestPermission to only grant permission temporarily
 2011-03-09 10:51:16 -08:00
Shimeng (Simon) Wang
12c37cafe1 Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1 2011-03-09 10:48:57 -08:00
Mike Lockwood
094c9900de am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1 
* commit '2c3ed82600af117e791a087330a198fe90d298b7':
  Change UsbManager.requestPermission to only grant permission temporarily
 2011-03-09 10:48:13 -08:00
Mike Lockwood
c6f23e8521 Change UsbManager.requestPermission to only grant permission temporarily 
If the user approves an application to access a USB device or accessory
without choosing it as the default application, then permission is granted
only until the device or accessory is disconnected.
Only applications chosen as the default choice have permissions assigned persistently.

BUG: 4061035

Change-Id: Ic4f6271a91b2fc56bbeef82c579e26d88c63ae56
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-09 12:33:00 -05:00
Huahui Wu
9386a24eb1 b/3307761 Clean up the flag mIsHandlingMultiTouch. 
The flag mIsHandlingMultiTouch was used to remove the out of order
touchMove events. After the fix b/3307761, it is no more needed.

Change-Id: I4d03131e2a22c53cc79c4105e39f078f1bea88ca
 2011-03-09 09:26:36 -08:00
Patrick Scott
888f0654fd am 5d534f28: am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1 
* commit '5d534f288d0c29337458e267fd207236bc23fec5':
  Pass the auto login header information to the app.
 2011-03-09 05:10:34 -08:00
Patrick Scott
5d534f288d am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1 
* commit 'ea44c7c71431adbce348cf9ef3f22d9561bb7fc1':
  Pass the auto login header information to the app.
 2011-03-09 05:08:15 -08:00
Patrick Scott
ea44c7c714 Merge "Pass the auto login header information to the app." into honeycomb-mr1 2011-03-09 05:05:21 -08:00
Bjorn Bringert
6a5ecc0900 Merge "Exception handling clean-up in TextToSpeech.java" 2011-03-09 04:38:08 -08:00
Kristian Monsen
39dc4b1e14 am b4ca8b76: am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1 
* commit 'b4ca8b7696ea8559fced8bcdf36e11ed28785c7c':
  Fix for bug 3469242 Turn of extra debugging before shipping
 2011-03-09 04:34:31 -08:00
Kristian Monsen
b4ca8b7696 am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1 
* commit '9e697ee9fc9dcc21348d799e1e0bc83dd3abdb18':
  Fix for bug 3469242 Turn of extra debugging before shipping
 2011-03-09 04:32:28 -08:00
Kristian Monsen
9e697ee9fc Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1 2011-03-09 04:29:45 -08:00
Mike Lockwood
77e1a4c57e am 093cf07f: am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1 
* commit '093cf07f3c58a6553c415d750edba1a75b269f05':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
 2011-03-09 03:57:14 -08:00
Mike Lockwood
093cf07f3c am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1 
* commit '9e8e4ea0a839b561d329758cddbfd0f7ea23f593':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
 2011-03-09 03:54:28 -08:00
Mike Lockwood
9e8e4ea0a8 Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1 
* changes:
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
 2011-03-09 03:52:47 -08:00
Adam Powell
27230862b1 am 529eb76b: am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1 
* commit '529eb76b8add903c67ecf0178b6b4603edd64ebb':
  Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
 2011-03-09 00:28:29 -08:00
Adam Powell
529eb76b8a am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1 
* commit '12230eaa5f446cb22032d6645074a1aaca146df9':
  Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
 2011-03-09 00:25:10 -08:00
Adam Powell
12230eaa5f Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1 2011-03-09 00:22:53 -08:00
Adam Powell
2b0952b197 Fix bug 4065021 - Adjust spacing of the "home" action bar item to be 
consistent with the "up" indicator

Make sure that the "home" affordance in the action bar always occupies
the same amount of space regardless of whether or not the "up"
indicator is visible. This means centering the application icon/logo
in the remaining space after the "up" indicator has been added.

Change-Id: I3c81cfe8255546d4dd676af913895713baba4f13
 2011-03-09 00:17:42 -08:00
Romain Guy
3d2b75ac0f am 3391435a: am 812dba1f: Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1 
* commit '3391435afd7fa69e12cde17754e1d1f98f9d77e9':
  Prevents NPE when a View was detached Bug #4068284
 2011-03-08 23:56:26 -08:00