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

42550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
3b024a6d28 Fix issue #3404571: Commit final APIs 
Change-Id: I7f01f8df9cfb82a9bb987e3df7c8eaa1c5aab81a
 2011-01-30 14:26:31 -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
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
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
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
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
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
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
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
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
4e3f3a2046 am 8710e76a: Follow up change to I741642ac 
* commit '8710e76a897cd546a79ee4338a4147eeb9f3e068':
  Follow up change to I741642ac
 2011-01-29 21:42:30 -08:00
Dheeraj Sharma
5618e037af Fix for issue 3404671 Crash when exporting movie in JNI 
Change-Id: Id2883d7be314ebd2138297b936bcbe6b55361ac5
 2011-01-29 21:29:49 -08:00
Dianne Hackborn
726318b56a DO NOT MERGE: Fix screen size compatibility mode. 
Cherry-picked from HC.

Change-Id: Icce2a64f187a56deefcddc3d9b22fa94effce431
 2011-01-29 18:02:18 -08:00
Ken Wakasa
8710e76a89 Follow up change to I741642ac 
Fix wrong constant.

bug: 3404788
Change-Id: Ic5f849e6640a78a70951cf819d7e8ce53a9c2585
 2011-01-30 11:02:09 +09:00
Dianne Hackborn
13cd966415 am e802b592: am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit 'e802b59280540ce24ea1db61907a0f1f22f01fad':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 15:08:07 -08:00
Dianne Hackborn
e802b59280 am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit '2107757dde0b3159119edcc9084fcb9a87985e88':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 15:05:30 -08:00
Dianne Hackborn
2107757dde am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit 'bbb5a5ce1922a168335811b177cd7341350c15cc':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 14:59:02 -08:00
Jean-Baptiste Queru
6670039749 Merge 3100207b from gingerbread-plus-aosp 
Change-Id: Ib2eaede8b9e400e1d273f981c08a6ef82f3dd588
 2011-01-29 14:51:17 -08:00
Jean-Baptiste Queru
3100207be5 am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:43:33 -08:00
Dianne Hackborn
bbb5a5ce19 Merge "Make AaptGroupEntry::getMncName accept mnc00" 2011-01-29 14:38:48 -08:00
Jean-Baptiste Queru
8f4a04f04c am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:32:04 -08:00
Jean-Baptiste Queru
7ea919c44b Merge 6b739dc7 from gingerbread 
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
 2011-01-29 12:59:20 -08:00
Jean-Baptiste Queru
1358b6a4fb Tweak to make merges easier 
Bug: 3364311

Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
 2011-01-29 12:54:09 -08:00
Jason parks
d4796c823b am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb 
* commit 'a2e765ef1ad2cb907a4ae0a93bb15e4764ebb59a':
  Update the encryption password when the device password is changed.
 2011-01-29 12:04:11 -08:00
Jason parks
a2e765ef1a Merge "Update the encryption password when the device password is changed." into honeycomb 2011-01-29 12:02:19 -08:00
Eric Fischer
5f3ba16de0 am 5f2def8c: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
  Import revised translations.  DO NOT MERGE
 2011-01-29 11:25:30 -08:00
Dirk Dougherty
51a6df010d am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
  Doc change: Add time-lapse video to 3.0 highlights.
 2011-01-29 11:16:13 -08:00
Andreas Huber
317e8c89f5 am b6c2e2b4: (-s ours) DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
* commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
 2011-01-29 11:16:07 -08:00
Jean-Baptiste Queru
80838d256d Merge 0ef57993 from gingerbread 
Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
 2011-01-29 11:04:41 -08:00
Jim Miller
a8d5dbbccd am 226e5756: (-s ours) Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 
* commit '226e57563c3110aa688fc41f10b7a96cd21b6231':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
 2011-01-29 11:00:28 -08:00