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

46769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Li
82910e7db5 Merge "Added screenshot after glDraw* option to GLES2 Debugger" 2011-03-09 10:05:38 -08:00
David Li
717cd2e0e6 Merge "Initial commit of GLESv2 debugger server" 2011-03-09 10:04:46 -08:00
Wink Saville
f5bf454d01 Merge "Telephony: Corrections to LTE and eHRPD constant values." 2011-03-09 09:48:05 -08:00
Irfan Sheriff
eddeecf059 am 86587185: am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1 
* commit '865871850bcedd4b9da0536c8b41f3c1816e5f43':
  Persist wifi override in airplane mode
 2011-03-09 09:36:40 -08:00
Irfan Sheriff
865871850b am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1 
* commit '7ad85eb62f9f332cc8002ec996cd359333ba590e':
  Persist wifi override in airplane mode
 2011-03-09 09:32:55 -08:00
Irfan Sheriff
7ad85eb62f Merge "Persist wifi override in airplane mode" into honeycomb-mr1 2011-03-09 09:30:28 -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
Jeff Brown
29c6c81584 am 1baae5c9: (-s ours) am 36b077d5: Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1 
* commit '1baae5c9b635f8672a8f0b8d83f23d5b9ec72297':
  Eliminate some accidental log spam.  (DO NOT MERGE)
 2011-03-09 02:51:45 -08:00
Jeff Brown
1baae5c9b6 am 36b077d5: Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1 
* commit '36b077d558727ead246434b08de0ce7b955508e1':
  Eliminate some accidental log spam.  (DO NOT MERGE)
 2011-03-09 02:48:18 -08:00
Jeff Brown
36b077d558 Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 02:45:59 -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
Adam Powell
4fdda70026 am 4763777e: am 1250c94b: Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1 
* commit '4763777ebfa9d0d40ea7d117a351eaf96c5ac816':
  Bug 3509417 - Refine touch event serialization
 2011-03-08 23:53:40 -08:00
Nicolas Roard
f610c421ea am acafb26d: am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1 
* commit 'acafb26d34963807fc8f4c1a46763c51821d194e':
  Partial invalidation of the browser textures
 2011-03-08 23:53:26 -08:00
Romain Guy
3391435afd am 812dba1f: Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1 
* commit '812dba1fcaa1a374124c2fe0694c1b4f21e3dea9':
  Prevents NPE when a View was detached Bug #4068284
 2011-03-08 23:53:06 -08:00
Scott Main
48dbbb2c8b am ae850caf: am 57e42c37: am b0355410: docs: replace misc screenshots from Mac with shots from Windows bug: 3490831 
* commit 'ae850caf9413db4b91a058f1d360e736140c7a9c':
  docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
 2011-03-08 23:53:06 -08:00
Romain Guy
812dba1fca Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1 2011-03-08 23:51:02 -08:00
Irfan Sheriff
658772f0e6 Persist wifi override in airplane mode 
Persist the setting of wifi override in airplane mode
so that it can be restored on reboot

Bug: 3250824
Change-Id: I2af38c282ba55fc150fd9ef783d43600f0d4260f
 2011-03-08 21:52:35 -08:00
Ramesh Sudini
a2c2daf02a Telephony: Corrections to LTE and eHRPD constant values. 
LTE and EHRPD values are not consistent with ril.h

Change-Id: I93c4912b22c06afe09bdbd58548385d4db5ca11b
 2011-03-08 21:35:23 -08:00
Adam Powell
4763777ebf am 1250c94b: Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1 
* commit '1250c94b50a3322e44c8ded7ab15bd6da9cc82a7':
  Bug 3509417 - Refine touch event serialization
 2011-03-08 20:02:44 -08:00
Adam Powell
1250c94b50 Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1 2011-03-08 20:00:25 -08:00
Carl Shapiro
9b8c5f6143 Merge "Remove unused JNI global references." 2011-03-08 19:49:47 -08:00
Mike Lockwood
d591357524 Close USB dialogs if their corresponding accessory or device has disconnected 
BUG: 4060065

Change-Id: Ib517e5e4a5422f9f0c8fca601308cecf7743c5d1
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-08 22:47:08 -05:00
Nicolas Roard
acafb26d34 am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1 
* commit 'f986d496c56fc8ae44b03f982e3e1ed437cdb996':
  Partial invalidation of the browser textures
 2011-03-08 19:06:17 -08:00
Nicolas Roard
f986d496c5 Merge "Partial invalidation of the browser textures" into honeycomb-mr1 2011-03-08 19:02:33 -08:00
Amith Yamasani
ad8479ddcc am f9b9bd53: am 1f111f11: Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1 
* commit 'f9b9bd538d846d8931eb9cc4f05d51f4d19a318d':
  Searchview layout cleanup. Some more tweaks required for Market.
 2011-03-08 18:43:37 -08:00
Jim Miller
3e95ab97a2 am 88d2d039: am 3de6a9b6: Merge "Fix 4025684: Don\'t include wallpaper dimensions in bounds calculation" into honeycomb-mr1 
* commit '88d2d0390d41eb37481936872f1a03db39b8526d':
  Fix 4025684: Don't include wallpaper dimensions in bounds calculation
 2011-03-08 18:42:18 -08:00
Dianne Hackborn
2bf0410bd2 am 0aa403c3: am 09a31662: Merge "Fix issue #3505861: Need to decide large/xlarge screen size limits" into honeycomb-mr1 
* commit '0aa403c3bddc1289537130a20f1b96b2863bbb7e':
  Fix issue #3505861: Need to decide large/xlarge screen size limits
 2011-03-08 18:42:12 -08:00
Justin Ho
1464d1d98a am 6f761209: am 7b27dc12: Merge "Updated text cursor assets" into honeycomb-mr1 
* commit '6f7612094a568b5ad477440bb865b6c673a476b2':
  Updated text cursor assets
 2011-03-08 18:42:04 -08:00
Xavier Ducrohet
6f1cd44c2f am 0ab34279: am f596d697: Merge "LayoutLib: fix Capabilities and getDimensionPixelSize" into honeycomb-mr1 
* commit '0ab34279a5e7d52843a3f7163ece4adc7da6bc46':
  LayoutLib: fix Capabilities and getDimensionPixelSize
 2011-03-08 18:41:56 -08:00
Adam Cohen
00b9ea7daf am d8bf8911: am f10615d8: Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1 
* commit 'd8bf89116b30a13ea48e3b057897ad83058095b1':
  Fixing inconsistency between invalidate region and draw region
 2011-03-08 18:41:29 -08:00
Andy Stadler
a90ad2ced2 am bdec2e56: am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1 
* commit 'bdec2e565bd1f086d65a956db432bf54cdf78f6d':
  Clarify rules about encryption of emulated storage.
 2011-03-08 18:41:20 -08:00
Romain Guy
cf0f9a0b62 am 1e415023: am 3d7796c1: Merge "Correctly handle opaque fading views Bug #3475554" into honeycomb-mr1 
* commit '1e415023ee4c8aef2bfcb51e4293e62eb32eb23f':
  Correctly handle opaque fading views Bug #3475554
 2011-03-08 18:41:15 -08:00
Jim Miller
9b33ab8f45 am 979bd339: am ccdeb60c: Merge "Fix 4025690,4027061: Minor tweaks to recent applications layouts" into honeycomb-mr1 
* commit '979bd339b56633803700ab98e77fc12b479c0fce':
  Fix 4025690,4027061: Minor tweaks to recent applications layouts
 2011-03-08 18:41:10 -08:00
Huahui Wu
388b0768e1 am f7a3169f: am 8496ddc5: Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1 
* commit 'f7a3169fd85db08538809d17d802795ea4e62b0c':
  b/3307761 Tuning two fingers pan.
 2011-03-08 18:40:46 -08:00
Scott Main
ae850caf94 am 57e42c37: am b0355410: docs: replace misc screenshots from Mac with shots from Windows bug: 3490831 
* commit '57e42c372698e38195640ac2130c19206082fcb0':
  docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
 2011-03-08 18:40:04 -08:00
Scott Main
57e42c3726 am b0355410: docs: replace misc screenshots from Mac with shots from Windows bug: 3490831 
* commit 'b0355410bb161c5e61408e57dc2adc085d337be9':
  docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
 2011-03-08 18:37:37 -08:00
Mike Lockwood
3a68b8338b USB: Add API and dialog for apps to request permissions for USB devices and accessories 
New APIs:

UsbManager.hasPermission returns true if the caller has permission
for the given device or accessory

UsbManager.requestPermission poses a dialog to allow the user to give the caller
permission for the device or accessory.
Result is returned via a PendingIntent.
No dialog is displayed if the caller already has permission.

Also moved UsbResolverActivity to SystemUI package

BUG: 4069037

Change-Id: I93be769501a8776b49ac26e468af19f8fa2114c9
 2011-03-08 21:22:19 -05:00