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

43546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
3324784c8f am 13cd9664: am e802b592: am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit '13cd966415a5cf83934868751f19bf69fa4ff9df':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 15:10:20 -08: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
d2ed82fb94 am 66700397: Merge 3100207b from gingerbread-plus-aosp 
* commit '66700397496fc6f6d26f9f0b56ead8ef610b9654':
  Tweak to make merges easier
 2011-01-29 14:54:43 -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
1358b6a4fb Tweak to make merges easier 
Bug: 3364311

Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
 2011-01-29 12:54:09 -08:00
Jason parks
450536b6a6 am d4796c82: am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb 
* commit 'd4796c823b92866d5895acf610e5571e9b5724d9':
  Update the encryption password when the device password is changed.
 2011-01-29 12:06:39 -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
satok
6e6bba8b6a am f163b4d3: am e40dea0d: Fix a bug that IME switch disappiers at switching IME subtype. 
* commit 'f163b4d3318d3cedd1ef633ae45ab6b822c1d24f':
  Fix a bug that IME switch disappiers at switching IME subtype.
 2011-01-29 09:53:34 -08:00
satok
f163b4d331 am e40dea0d: Fix a bug that IME switch disappiers at switching IME subtype. 
* commit 'e40dea0d06ec1c04db80191fd2965363b4fac781':
  Fix a bug that IME switch disappiers at switching IME subtype.
 2011-01-29 09:50:03 -08:00
Jean-Baptiste Queru
2d4f411e05 am d9e6bda6: (-s ours) am 34ebb5bf: (-s ours) am 87d19759: Delete browerplugin tests - do not merge 
* commit 'd9e6bda6b9d12f002345c8e45cf3a94c3500851a':
  Delete browerplugin tests - do not merge
 2011-01-29 09:37:46 -08:00
Jean-Baptiste Queru
23aa07c699 am 6ace65d2: (-s ours) am 88d7300d: (-s ours) am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit '6ace65d25f5d004117c27f45dbf4499b82581470':
  Delete browerplugin tests - do not merge
 2011-01-29 09:37:38 -08:00
Jean-Baptiste Queru
d9e6bda6b9 am 34ebb5bf: (-s ours) am 87d19759: Delete browerplugin tests - do not merge 
* commit '34ebb5bfec0794d5852b47edaa8b9d4cea22e515':
  Delete browerplugin tests - do not merge
 2011-01-29 09:36:02 -08:00
Jean-Baptiste Queru
6ace65d25f am 88d7300d: (-s ours) am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit '88d7300d2abaf638c2c0b5505b657b401f881c14':
  Delete browerplugin tests - do not merge
 2011-01-29 09:35:55 -08:00
Robert Greenwalt
b46062bc08 am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69':
  Add some network types that OEM's are asking for.
 2011-01-29 09:35:28 -08:00
Robert Greenwalt
f8fdec50c7 resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
 2011-01-29 09:32:04 -08:00
Eric Fischer
f8f37d97ce am a0e51ef2: (-s ours) am 287fbba5: (-s ours) am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'a0e51ef2a4d5d16ed68b360851c5428b17e75eb4':
  Import revised translations.  DO NOT MERGE
 2011-01-29 09:18:14 -08:00
Eric Fischer
a0e51ef2a4 am 287fbba5: (-s ours) am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4':
  Import revised translations.  DO NOT MERGE
 2011-01-29 09:13:21 -08:00
satok
e40dea0d06 Fix a bug that IME switch disappiers at switching IME subtype. 
Bug: 3404788

Change-Id: I741642ac690a1b4c6ca1225ee271bffe39164170
 2011-01-30 02:03:48 +09:00
Dirk Dougherty
7588fc0609 am 51bae7e7: am 30a85ec7: am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 
* commit '51bae7e74aa63b2ff455631c5b7954cfa1927b2f':
  Doc change: Add time-lapse video to 3.0 highlights.
 2011-01-29 09:00:41 -08:00
Andreas Huber
9e55b78846 am c2bee3ae: (-s ours) am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
* commit 'c2bee3ae2d6cebdaf588a102ff64499717e43cc7':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
 2011-01-29 09:00:38 -08:00
Jean-Baptiste Queru
b7a6563d17 am 4eeb1047: Merge 13212f83 from gingerbread-plus-aosp 
* commit '4eeb10470ffafe8c508027f363ac66b58da5bf00':
  Fix issue 2988031.
 2011-01-29 08:57:47 -08:00
Dirk Dougherty
51bae7e74a am 30a85ec7: am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 
* commit '30a85ec7e8d79448fbd0d0af3ac25b656f8428c4':
  Doc change: Add time-lapse video to 3.0 highlights.
 2011-01-29 08:57:25 -08:00
Andreas Huber
c2bee3ae2d am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
* commit '70888c00a0371692a07132f0dd94208456dd44c1':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
 2011-01-29 08:57:21 -08:00
Jean-Baptiste Queru
4eeb10470f Merge 13212f83 from gingerbread-plus-aosp 
Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
 2011-01-29 08:54:06 -08:00
Jim Miller
346cb24d05 am 4876c29f: (-s ours) am 145643ca: (-s ours) am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 
* commit '4876c29f48dda11a2fd13d9a61050783565e7595':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
 2011-01-29 08:53:01 -08:00
Jean-Baptiste Queru
52d3320815 am bf9f3ea7: Merge 34afc2cd from gingerbread-plus-aosp 
* commit 'bf9f3ea72ea3201415acb3bb016de3009d3ed1b3':
  API: Make close() throw an IOException.
 2011-01-29 08:50:38 -08:00
Jim Miller
4876c29f48 am 145643ca: (-s ours) am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 
* commit '145643ca4bb98a88977026ea4d7866e391d53dce':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
 2011-01-29 08:47:55 -08:00
Jean-Baptiste Queru
bf9f3ea72e Merge 34afc2cd from gingerbread-plus-aosp 
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
 2011-01-29 08:45:29 -08:00