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

44154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
65aef1517b Merge "fix failing thread object run" into gingerbread 2011-01-30 15:17:33 -08:00
Dheeraj Sharma
085787a402 am bd633b72: am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 
* commit 'bd633b7297c60771223f0e8799c418cdbce3017c':
  3404665 Preview window is blank after returning from playing exported movie
 2011-01-30 15:13:31 -08:00
Dheeraj Sharma
bd633b7297 am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 
* commit '167e7488af4d53673ff2fcc0723ae2a1584f5194':
  3404665 Preview window is blank after returning from playing exported movie
 2011-01-30 15:10:25 -08:00
Dheeraj Sharma
167e7488af Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 2011-01-30 15:08:12 -08:00
Jamie Gennis
4453b1a5b6 am 09443aeb: am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb 
* commit '09443aeb6470d66f5bc1938b70d74b3e2f9bbbb9':
  Reset ANativeWindow crop on buffer geometry changes.
 2011-01-30 15:05:42 -08:00
Jamie Gennis
09443aeb64 am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb 
* commit '628845056282a0c5b1a212ce5aeeaac092b91ec8':
  Reset ANativeWindow crop on buffer geometry changes.
 2011-01-30 15:03:03 -08:00
Jamie Gennis
6288450562 Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb 2011-01-30 15:00:44 -08:00
Dheeraj Sharma
c1a2f40005 3404665 Preview window is blank after returning from playing exported movie 
Change-Id: Idf2719953cbaf41e09eaf86de37e3459a1ea4aed
 2011-01-30 14:52:42 -08:00
Vasu Nori
4b91b4b117 Merge "bug:3385018 don't print finalizer warnings under certain conditions" 2011-01-30 14:45:40 -08:00
Vasu Nori
83ff97d840 bug:3385018 don't print finalizer warnings under certain conditions 
Change-Id: I06c49a464f61c26d3e6645a95f2dd38d444bf384
 2011-01-30 14:42:36 -08:00
Dianne Hackborn
3b024a6d28 Fix issue #3404571: Commit final APIs 
Change-Id: I7f01f8df9cfb82a9bb987e3df7c8eaa1c5aab81a
 2011-01-30 14:26:31 -08:00
Daniel Sandler
8199741357 am 935275cb: am 71a22b3b: Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb 
* commit '935275cbe058f5a60ac2cf1a3321fd49550fd37c':
  Dismiss the ticker early if the status bar is tapped.
 2011-01-30 13:42:52 -08:00
Daniel Sandler
935275cbe0 am 71a22b3b: Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb 
* commit '71a22b3bc7cb4a721378ef38d43bce94f5b0e5bd':
  Dismiss the ticker early if the status bar is tapped.
 2011-01-30 13:40:19 -08:00
Daniel Sandler
71a22b3bc7 Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb 2011-01-30 13:36:47 -08:00
Joe Onorato
ac6f09140b am aaf75d77: am f2057d90: Merge changes I09e8c4eb,I91a0e05f into honeycomb 
* commit 'aaf75d77b1c7ce7296a21db1e3ce23ae93e25817':
  Use a DateFormat that fits.
  Update the network info when the configuration changes.
 2011-01-30 13:22:17 -08:00
Joe Onorato
aaf75d77b1 am f2057d90: Merge changes I09e8c4eb,I91a0e05f into honeycomb 
* commit 'f2057d907b5d9c75086337e840f70b5061b2a5aa':
  Use a DateFormat that fits.
  Update the network info when the configuration changes.
 2011-01-30 13:19:57 -08:00
Joe Onorato
f2057d907b Merge changes I09e8c4eb,I91a0e05f into honeycomb 
* changes:
  Use a DateFormat that fits.
  Update the network info when the configuration changes.
 2011-01-30 13:18:16 -08:00
Joe Onorato
0c953f68f5 Use a DateFormat that fits. 
Bug: 3405724
Change-Id: I09e8c4ebf1d0142b8737fc1bf9500dee320332b7
 2011-01-30 13:07:53 -08:00
Daniel Sandler
2ed08d2e70 Dismiss the ticker early if the status bar is tapped. 
Tapping the ticker will still launch the notification's
contentIntent, but tapping anywhere else in the bar will
immediately hide the ticker.

Bug: 3365129
Change-Id: Ic1abd38fd4c5bdf32f3586b4e4aa5b833b11a9bd
 2011-01-30 16:07:28 -05:00
The Android Open Source Project
7f4b66cb92 am 5f773b9f: Reconcile gingerbread-plus-aosp and honeycomb 
* commit '5f773b9f72367ed8046df257d20881fd96f86929':
  resolved conflicts for merge of a314f32b to honeycomb-merge
 2011-01-30 12:54:18 -08:00
Dheeraj Sharma
9803b8435e Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI 
Change-Id: I6216e7e66be4bf0d7cfc74ee3bda7e22969a229a
 2011-01-30 12:50:23 -08:00
Jeff Brown
46bfd4a355 resolved conflicts for merge of c608e106 to master 
Change-Id: I49117966f43080d86763bab51848dbc50e55ecf8
 2011-01-30 12:50:09 -08:00
The Android Open Source Project
5f773b9f72 Reconcile gingerbread-plus-aosp and honeycomb 
Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434
 2011-01-30 12:40:39 -08:00
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge 
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
 2011-01-30 12:40:38 -08:00
Joe Onorato
99641836d8 Update the network info when the configuration changes. 
Bug: 3405559
Change-Id: I91a0e05f2e6d1c7766b89ba4f96d87ce07783318
 2011-01-30 12:17:27 -08:00
Gilles Debunne
12ab64593f Auto-clearing setError popup 
Bug 3403325

Error popup has to be dismissed whether or not the key was handled.

Change-Id: Ib6326b27fc521398f3cb0c546d29a7de9df18375
 2011-01-30 12:11:24 -08:00
Jeff Brown
c608e106a6 am 3c89f6d1: Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb 
* commit '3c89f6d1bd0821d0ae0205a5b48176156735aaac':
  Add "Use physical keyboard" option to system bar IME button.
 2011-01-30 12:10:07 -08:00
Jeff Brown
3c89f6d1bd Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb 2011-01-30 12:07:49 -08:00
Dianne Hackborn
4651e84411 am bdaee964: am e97a12e3: Fix screen size compatibility mode. 
* commit 'bdaee964f7d00806e714a7e453fff8d6a408c692':
  Fix screen size compatibility mode.
 2011-01-30 11:04:10 -08:00
Dianne Hackborn
bdaee964f7 am e97a12e3: Fix screen size compatibility mode. 
* commit 'e97a12e340dfdc246b531dfb49596628bd24e81b':
  Fix screen size compatibility mode.
 2011-01-30 11:02:29 -08:00
Dianne Hackborn
e97a12e340 Fix screen size compatibility mode. 
Change-Id: I2c06bbb586b4e54fc7ec52ec914cf95a18006217
 2011-01-30 10:31:30 -08:00
Joe Malin
69aedbedfe am f5002922: am 51990f9b: Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb 
* commit 'f50029220664be6cc5b2b4c18377b0efa9fe6ca5':
  sdk doc change: Copy/Paste/Drag/Drop
 2011-01-30 09:55:50 -08:00
Joe Malin
f500292206 am 51990f9b: Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb 
* commit '51990f9b0c7c0a22e1a3440c620ab97ebe4209c9':
  sdk doc change: Copy/Paste/Drag/Drop
 2011-01-30 09:48:49 -08:00
Joe Malin
51990f9b0c Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb 2011-01-30 09:45:59 -08:00
Dianne Hackborn
0e87a19bec am 371de969: am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d" 
* commit '371de9695508073fbbde8181eb230e99cb045206':
  Normalize output from aapt d
 2011-01-29 23:10:33 -08:00
Dianne Hackborn
371de96955 am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d" 
* commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234':
  Normalize output from aapt d
 2011-01-29 23:07:48 -08:00
Dianne Hackborn
a1f5e82f37 am a30063d8: am 25eb0464: Merge "Normalize output from aapt d" 
* commit 'a30063d80c08434ac3c7316f338c6d54110449ab':
  Normalize output from aapt d
 2011-01-29 23:04:50 -08:00
Dianne Hackborn
a30063d80c am 25eb0464: Merge "Normalize output from aapt d" 
* commit '25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
  Normalize output from aapt d
 2011-01-29 23:01:20 -08:00
Dianne Hackborn
25eb04642c Merge "Normalize output from aapt d" 2011-01-29 22:53:20 -08:00
Daniel Sandler
ec4c519368 am bda99568: am eec20286: Merge "Fix broken intitial notification panel animation." into honeycomb 
* commit 'bda99568d84530c6442af0602e9c12e6cb897780':
  Fix broken intitial notification panel animation.
 2011-01-29 22:41:42 -08:00
Daniel Sandler
bda99568d8 am eec20286: Merge "Fix broken intitial notification panel animation." into honeycomb 
* commit 'eec2028698cfb80734cd03356d81671f8be31c66':
  Fix broken intitial notification panel animation.
 2011-01-29 22:39:07 -08:00
Dianne Hackborn
8925761889 am 915bacf6: (-s ours) am 71bb59f9: (-s ours) am c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 
* commit '915bacf6c4e318a144f1b59213f8a4ed672cd839':
  DO NOT MERGE: Fix screen size compatibility mode.
 2011-01-29 22:38:32 -08:00
Daniel Sandler
eec2028698 Merge "Fix broken intitial notification panel animation." into honeycomb 2011-01-29 22:37:13 -08:00
Dianne Hackborn
915bacf6c4 am 71bb59f9: (-s ours) am c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 
* commit '71bb59f9e6799083830077dbb7e0f1effdd3faf7':
  DO NOT MERGE: Fix screen size compatibility mode.
 2011-01-29 22:35:42 -08:00
Dianne Hackborn
71bb59f9e6 am c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 
* commit 'c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
  DO NOT MERGE: Fix screen size compatibility mode.
 2011-01-29 22:30:57 -08:00
Dianne Hackborn
43abedde5f am c12cdda9: (-s ours) Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 
* commit 'c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
  DO NOT MERGE: Fix screen size compatibility mode.
 2011-01-29 22:27:16 -08:00
Daniel Sandler
8c9891840a Fix broken intitial notification panel animation. 
I also tuned the animation parameters a bit to get things to
look just a tiny bit smoother. The first run is still jerky
but it's not jumping all over the place in the wrong
direction.

Bug: 3404950
Change-Id: Id10c52f227e6d2db428dc860097023560d154356
 2011-01-30 01:24:09 -05:00
Dianne Hackborn
c12cdda949 Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 2011-01-29 22:20:05 -08:00
Ken Wakasa
428dbe0181 am 4e3f3a20: am 8710e76a: Follow up change to I741642ac 
* commit '4e3f3a2046a5743f02ebca665b771467ad900ce1':
  Follow up change to I741642ac
 2011-01-29 21:46:22 -08:00
Ken Wakasa
4e3f3a2046 am 8710e76a: Follow up change to I741642ac 
* commit '8710e76a897cd546a79ee4338a4147eeb9f3e068':
  Follow up change to I741642ac
 2011-01-29 21:42:30 -08:00