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

75945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Hines
790accafa8 am a7228c88: Merge "Unhide FONT." into jb-dev 
* commit 'a7228c882c468aabaed41e4499805aa5474f0dec':
  Unhide FONT.
 2012-05-01 15:56:37 -07:00
Stephen Hines
2f99df4500 am 10e3e9a4: Merge "Move mesh to end of test list until we fix LLVM." into jb-dev 
* commit '10e3e9a41a2f2a401f2a7c17d5b87582b4d1b7fe':
  Move mesh to end of test list until we fix LLVM.
 2012-05-01 15:56:35 -07:00
Stephen Hines
a7228c882c Merge "Unhide FONT." into jb-dev 2012-05-01 15:54:16 -07:00
Stephen Hines
10e3e9a41a Merge "Move mesh to end of test list until we fix LLVM." into jb-dev 2012-05-01 15:54:10 -07:00
Guang Zhu
80fbdcbdea am 7fdde0ce: Merge "remove extra semi colon" into jb-dev 
* commit '7fdde0cee2ac90da6603585f4789644fbf00925d':
  remove extra semi colon
 2012-05-01 15:49:48 -07:00
Guang Zhu
7fdde0cee2 Merge "remove extra semi colon" into jb-dev 2012-05-01 15:47:28 -07:00
Jean-Baptiste Queru
8e2f7ade24 am 78821e8e: (-s ours) am 1b34c1bc: Merge "stagefright: Remove useless declarations" 
* commit '78821e8e22930214c4cd79192f988ca2266fa8cc':
  stagefright: Remove useless declarations
 2012-05-01 15:44:37 -07:00
Adam Cohen
16f36e8215 am c9ca7f38: Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev 
* commit 'c9ca7f38bccfa56bbca44998758869ec8c71f4d3':
  Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)
 2012-05-01 15:38:35 -07:00
Jean-Baptiste Queru
78821e8e22 am 1b34c1bc: Merge "stagefright: Remove useless declarations" 
* commit '1b34c1bc240e6c2e085eee2b03c728b56b049e23':
  stagefright: Remove useless declarations
 2012-05-01 15:37:18 -07:00
Adam Cohen
c9ca7f38bc Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev 2012-05-01 15:36:21 -07:00
Jean-Baptiste Queru
1b34c1bc24 Merge "stagefright: Remove useless declarations" 2012-05-01 14:48:06 -07:00
Amith Yamasani
159e62427e am d72ad2ac: Merge "Fix a bug in appwidget migration to multiuser directory." into jb-dev 
* commit 'd72ad2ac88ae8477a95e18a800062446a58c524d':
  Fix a bug in appwidget migration to multiuser directory.
 2012-05-01 14:01:10 -07:00
Amith Yamasani
d72ad2ac88 Merge "Fix a bug in appwidget migration to multiuser directory." into jb-dev 2012-05-01 13:57:53 -07:00
Amith Yamasani
e0eb39b548 Fix a bug in appwidget migration to multiuser directory. 
Bug: 6393606

Migrate the old appwidgets.xml if the file doesn't exist,
not if the directory doesn't exist. It worked earlier because
this was the first service that I migrated to multi-user :(

Change-Id: I59bcbc31ff9d101e44dff5e5f44b3cab8f08dc06
 2012-05-01 13:48:48 -07:00
Eric Fischer
de22c77ad8 am dd8412d4: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'dd8412d4fb57fbf53b25460cda8458cdf9dfac07':
  Import translations. DO NOT MERGE
 2012-05-01 13:44:59 -07:00
Eric Fischer
dd8412d4fb Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-01 13:42:13 -07:00
James Dong
ea1d7f43ac am cb6662ac: Merge "Add video scaling mode support with a new public method in MediaPlayer.java class" into jb-dev 
* commit 'cb6662ac532beeba0d3adb85fa37d307838b4325':
  Add video scaling mode support with a new public method in MediaPlayer.java class
 2012-05-01 13:38:45 -07:00
Andreas Huber
9d16f3f9c6 am f72d392f: Merge "Make java constants consistent with native counterparts." into jb-dev 
* commit 'f72d392f5deeda68af6a8a9b4a8c62f215331129':
  Make java constants consistent with native counterparts.
 2012-05-01 13:35:58 -07:00
James Dong
cb6662ac53 Merge "Add video scaling mode support with a new public method in MediaPlayer.java class" into jb-dev 2012-05-01 13:34:28 -07:00
Andreas Huber
f72d392f5d Merge "Make java constants consistent with native counterparts." into jb-dev 2012-05-01 13:32:18 -07:00
Chris Craik
d95c556e5d am 37a8370b: Merge "Revert "Add header for forward compatibility"" into jb-dev 
* commit '37a8370b6279c5359f6d32b5abb3c3fd37e826b3':
  Revert "Add header for forward compatibility"
 2012-05-01 13:24:41 -07:00
Chris Craik
37a8370b62 Merge "Revert "Add header for forward compatibility"" into jb-dev 2012-05-01 13:22:08 -07:00
Daniel Sandler
eee84b48bc am 73b61d67: Merge "Move legacy menu key to bottom right on sw600dp." into jb-dev 
* commit '73b61d67109c9a4267b93c238bb9cbab7b1304c4':
  Move legacy menu key to bottom right on sw600dp.
 2012-05-01 13:02:27 -07:00
Adam Cohen
ffc46a5c7c Preventing onClickPendingIntents from being set on collection widget items (issue 5961701) 
Change-Id: If60f98c5e1be66ca840cbd4953841ef2c57a012b
 2012-05-01 12:58:12 -07:00
Daniel Sandler
73b61d6710 Merge "Move legacy menu key to bottom right on sw600dp." into jb-dev 2012-05-01 12:58:09 -07:00
Brian Colonna
6de7210c30 am f4197bf9: Merge "Fix 6395288: Added lock to avoid unbind race condition" into jb-dev 
* commit 'f4197bf93532b333dbea13792c422b65b0ceebf3':
  Fix 6395288: Added lock to avoid unbind race condition
 2012-05-01 12:56:55 -07:00
Brian Colonna
f4197bf935 Merge "Fix 6395288: Added lock to avoid unbind race condition" into jb-dev 2012-05-01 12:54:02 -07:00
Steven Ross
1b4538c77d am d9a00323: Merge "Don\'t show Face Unlock on initial boot fixes 6396685" into jb-dev 
* commit 'd9a00323126cb4abae9e93089cf0a27ec8c7122d':
  Don't show Face Unlock on initial boot fixes 6396685
 2012-05-01 12:54:01 -07:00
Steven Ross
d9a0032312 Merge "Don't show Face Unlock on initial boot fixes 6396685" into jb-dev 2012-05-01 12:49:28 -07:00
Andreas Huber
48dc91b514 Make java constants consistent with native counterparts. 
Change-Id: I481dfc18c170b4c60682ef1b38b57e10fb73d004
 2012-05-01 12:27:26 -07:00
James Dong
454014e55f Add video scaling mode support with a new public method in MediaPlayer.java class 
o related-to-bug: 5454345

Change-Id: I379b679eb6dd87f47f87a58791a5d0c7251b3a74
 2012-05-01 12:22:35 -07:00
Eric Fischer
48c220df10 Import translations. DO NOT MERGE 
Change-Id: I50b9a3a66234f1570955532c6383570cade19232
 2012-05-01 12:19:31 -07:00
Gilles Debunne
43b32a1cd4 am 8ed491b7: Merge "API fix, AutoCompleteTextView" into jb-dev 
* commit '8ed491b75b08df3944481a9509dea2606a265857':
  API fix, AutoCompleteTextView
 2012-05-01 12:01:05 -07:00
Gilles Debunne
dceca730d3 am 1dcd2bfc: Merge "API fix in TextView" into jb-dev 
* commit '1dcd2bfcabf565aa860fabc69ef54c8d66128a45':
  API fix in TextView
 2012-05-01 12:01:03 -07:00
Gilles Debunne
8ed491b75b Merge "API fix, AutoCompleteTextView" into jb-dev 2012-05-01 11:58:35 -07:00
Gilles Debunne
1dcd2bfcab Merge "API fix in TextView" into jb-dev 2012-05-01 11:58:26 -07:00
Michael Jurka
38abb6bdab am c81a0751: Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev 
* commit 'c81a075196a6e0feed452b689ef523e156701f95':
  Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"
 2012-05-01 11:50:22 -07:00
Michael Jurka
c81a075196 Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev 2012-05-01 11:47:36 -07:00
Winson Chung
0b3d3a3a56 Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)" 
This reverts commit 7ced8f9cabfed2e11c125a1a6b4ff18f1cc50060
 2012-05-01 11:46:09 -07:00
Chris Craik
92bc5d086a Revert "Add header for forward compatibility" 
GPL build fix mistakenly merged into master

This reverts commit fd862e9828d544f593a622f2914d1257366ae802.
 2012-05-01 11:20:20 -07:00
Dianne Hackborn
6d01aea3ef am a25c8a97: Merge "Add new APIs for permission group flags and priorities." into jb-dev 
* commit 'a25c8a97aff5f67a70857e6776bba8b4c517a286':
  Add new APIs for permission group flags and priorities.
 2012-05-01 11:18:16 -07:00
Dianne Hackborn
a25c8a97af Merge "Add new APIs for permission group flags and priorities." into jb-dev 2012-05-01 11:15:51 -07:00
Chet Haase
2bee5f4f1a am 3b83dc42: Merge "Fix launcher invisibility bug" into jb-dev 
* commit '3b83dc42df8d2d2b97bfa63a00f2d0c742fe8dfc':
  Fix launcher invisibility bug
 2012-05-01 11:14:28 -07:00
Chet Haase
3b83dc42df Merge "Fix launcher invisibility bug" into jb-dev 2012-05-01 11:11:52 -07:00
Winson Chung
aa43480538 am 7e400cfb: Merge "Adding getters/setters for StackView xml attrs. (Bug 6104219)" into jb-dev 
* commit '7e400cfb715858a168add7fa6eaa262ab8ad0695':
  Adding getters/setters for StackView xml attrs. (Bug 6104219)
 2012-05-01 10:58:56 -07:00
Winson Chung
7e400cfb71 Merge "Adding getters/setters for StackView xml attrs. (Bug 6104219)" into jb-dev 2012-05-01 10:55:14 -07:00
Eric Laurent
60420e14e2 am 94affdd8: Merge "fix unmute from volume panel on tablets" into jb-dev 
* commit '94affdd80e20c334dd5bfff170aee878992195ad':
  fix unmute from volume panel on tablets
 2012-05-01 10:50:30 -07:00
Daniel Sandler
4f85eb5872 Move legacy menu key to bottom right on sw600dp. 
It's too easy to press if it's *all* the way to the right,
though, so there a 2dp margin separating it from the bezel.

Bug: 6399312
Change-Id: If4ebcd4cfcee0c667bcc6142af86c04445f41fea
 2012-05-01 13:50:29 -04:00
Eric Laurent
94affdd80e Merge "fix unmute from volume panel on tablets" into jb-dev 2012-05-01 10:47:57 -07:00
James Dong
e481686464 am 59eaa907: Merge "Fix a race condition in Camera API for handling focus" into jb-dev 
* commit '59eaa907fef9454f6f5ff2ab727eef43bdf7f88d':
  Fix a race condition in Camera API for handling focus
 2012-05-01 10:27:59 -07:00