ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
28,167 Commits 2 Branches 0 Tags 54 MiB
b4fa0885f6
Commit Graph

28167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dharmaray Kundargi
b4fa0885f6 am ff843254: Merge "Merging the same files on top of tree." into honeycomb 
* commit 'ff8432548eb96655190486ee0f0fa08de5451e66':
  Merging the same files on top of tree.
 2011-01-30 16:35:03 -08:00
Jean-Baptiste Queru
d45c61dfcf am 1314bdb2: am e88fa50b: Merge from open-source gingerbread 
* commit '1314bdb2b22ae3613c3e08ae278dbc70f90b965c':
  fix failing thread object run
 2011-01-30 16:32:44 -08:00
Dharmaray Kundargi
af0bb2a24b Merge "Merging the same files on top of tree." into honeycomb 2011-01-30 16:32:07 -08:00
Jean-Baptiste Queru
9bfc45e3c3 am e88fa50b: Merge from open-source gingerbread 
* commit 'e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
  fix failing thread object run
 2011-01-30 16:19:59 -08:00
Adam Powell
f10add6590 am c9cb3083: Merge "Fix bug 3405899 - android.view.WindowManager" into honeycomb 
* commit 'c9cb30837116b138a91b251e5217a644231eebef':
  Fix bug 3405899 - android.view.WindowManager$BadTokenException
 2011-01-30 16:14:54 -08:00
Adam Powell
648b6f41ed Merge "Fix bug 3405899 - android.view.WindowManager$BadTokenException" into honeycomb 2011-01-30 16:12:56 -08:00
Dianne Hackborn
397b332c75 am 54ad3611: Merge "Fix issue #3404571: Commit final APIs" into honeycomb 
* commit '54ad36119460b850641556a12b845eadc9875cb4':
  Fix issue #3404571: Commit final APIs
 2011-01-30 16:11:36 -08:00
Joe Onorato
aad0183c2e am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 
* commit '4de68baed4bf18b33dc38f89f25410d3d5edfecf':
  Check for the STATUS_BAR permission for the system UI properties.
 2011-01-30 16:03:59 -08:00
Dianne Hackborn
bf150ab172 Merge "Fix issue #3404571: Commit final APIs" into honeycomb 2011-01-30 16:01:36 -08:00
Joe Onorato
eceabb02be Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 2011-01-30 16:00:52 -08:00
Gilles Debunne
c3b6271184 am 236b9872: Merge "Auto-clearing setError popup" into honeycomb 
* commit '236b9872140599d1856d48e53b8e109e506fd88f':
  Auto-clearing setError popup
 2011-01-30 15:53:03 -08:00
Gilles Debunne
a8abeba7c6 Merge "Auto-clearing setError popup" into honeycomb 2011-01-30 15:49:38 -08:00
Jean-Baptiste Queru
02bac86968 Merge from open-source gingerbread 
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
 2011-01-30 15:30:03 -08:00
Dheeraj Sharma
6acc3a3488 am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 
* commit '45911e1969fd1843bac5806e06f351123b67f596':
  Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
 2011-01-30 15:22:39 -08:00
Dheeraj Sharma
0c4a66082b Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 2011-01-30 15:20:49 -08:00
Jean-Baptiste Queru
9b1515590c Merge "fix failing thread object run" into gingerbread 2011-01-30 15:17:33 -08:00
Dheeraj Sharma
ef57e6c0ec 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
a1ff4e5645 Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 2011-01-30 15:08:12 -08:00
Jamie Gennis
c043fa28b9 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
da04384f18 Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb 2011-01-30 15:00:44 -08:00
Daniel Sandler
4b175081b4 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
5646744581 Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb 2011-01-30 13:36:47 -08:00
Joe Onorato
1d67a554b6 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
82b4f8b396 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
The Android Open Source Project
6842a0ed37 Reconcile gingerbread-plus-aosp and honeycomb 
Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434
 2011-01-30 12:40:39 -08:00
The Android Open Source Project
b36560f33e Mass merge from gingerbread - do not merge 
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
 2011-01-30 12:40:38 -08:00
Jeff Brown
f5f7359e8b 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
ce94d2db16 Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb 2011-01-30 12:07:49 -08:00
Dianne Hackborn
fc312cf7b0 am e97a12e3: Fix screen size compatibility mode. 
* commit 'e97a12e340dfdc246b531dfb49596628bd24e81b':
  Fix screen size compatibility mode.
 2011-01-30 11:02:29 -08:00
Joe Malin
77b6f87445 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
c172ee845a Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb 2011-01-30 09:45:59 -08:00
Dianne Hackborn
402960177f 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
a8eea2f3d9 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
e68d8b8810 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
73431999ab Merge "Normalize output from aapt d" 2011-01-29 22:53:20 -08:00
Daniel Sandler
50168d71e8 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
9477e08a9d Merge "Fix broken intitial notification panel animation." into honeycomb 2011-01-29 22:37:13 -08:00
Dianne Hackborn
ca35ea9054 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
e0128485a8 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
e2acfbeb83 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
Dianne Hackborn
a7ba815307 Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 2011-01-29 22:20:05 -08:00
Ken Wakasa
6e9757eba0 am 8710e76a: Follow up change to I741642ac 
* commit '8710e76a897cd546a79ee4338a4147eeb9f3e068':
  Follow up change to I741642ac
 2011-01-29 21:42:30 -08:00
Dianne Hackborn
76535fafa9 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
c8d5a70b2c 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
695a059c50 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
37150e5b19 Merge 3100207b from gingerbread-plus-aosp 
Change-Id: Ib2eaede8b9e400e1d273f981c08a6ef82f3dd588
 2011-01-29 14:51:17 -08:00
Jean-Baptiste Queru
bc790c4ae5 am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:43:33 -08:00
Dianne Hackborn
141ef82df3 Merge "Make AaptGroupEntry::getMncName accept mnc00" 2011-01-29 14:38:48 -08:00
Jean-Baptiste Queru
0fffe1b208 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
39e41351f0 Merge 6b739dc7 from gingerbread 
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
 2011-01-29 12:59:20 -08:00