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

92396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
c4c0b54e8e am cb4fa357: am 581c5703: am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev 
* commit 'cb4fa3575a1214adcfc383fed48f03052ed32a08':
  Fixes for QS:
 2012-10-17 11:13:27 -07:00
Daniel Sandler
cb4fa3575a am 581c5703: am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev 
* commit '581c5703fc5304548590b4ef5e692c7e7704b342':
  Fixes for QS:
 2012-10-17 11:10:15 -07:00
Daniel Sandler
581c5703fc am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev 
* commit 'f06125aab027c809095304f30d109d627cd995a6':
  Fixes for QS:
 2012-10-17 11:07:56 -07:00
Daniel Sandler
f06125aab0 Merge "Fixes for QS:" into jb-mr1-dev 2012-10-17 11:05:20 -07:00
Justin Ho
8814ec3796 am 47270268: am 8598646e: am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '472702687d174c126752259485b83c39f3eb2801':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 10:58:21 -07:00
Justin Ho
472702687d am 8598646e: am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '8598646e5b93e8adf4bcd2489365900d2a4776c6':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 10:56:33 -07:00
Kenny Root
ebf5569880 am 63a183c4: Merge "resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp" into jb-mr1-dev-plus-aosp 
* commit '63a183c41f26e4eb475dfbcc4386b37372eb5fba':
  Fix mistaken removal of setfilecon
 2012-10-17 10:53:51 -07:00
Dianne Hackborn
61d5c431fd am 0307bb5d: am e7819f86: am dec9e164: Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev 
* commit '0307bb5de2db991f2427f12702c106aaedf662b9':
  Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)
 2012-10-17 10:53:47 -07:00
Justin Ho
8598646e5b am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '144d405511e9ed685568e50db87b22cc42b6a252':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 10:53:43 -07:00
Kenny Root
63a183c41f Merge "resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp" into jb-mr1-dev-plus-aosp 2012-10-17 10:51:26 -07:00
Dianne Hackborn
0307bb5de2 am e7819f86: am dec9e164: Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev 
* commit 'e7819f86e3d2986b8c487216244498102411c805':
  Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)
 2012-10-17 10:50:43 -07:00
Justin Ho
144d405511 Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 2012-10-17 10:50:39 -07:00
Kenny Root
367400491a resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp 
Change-Id: I6075e2bf98b0f8310c93fac649c34cbbbd89707f
 2012-10-17 10:50:14 -07:00
Dianne Hackborn
e7819f86e3 am dec9e164: Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev 
* commit 'dec9e1640a7ae0b20f7fe79fa9c8cecacc4e07a9':
  Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)
 2012-10-17 10:47:48 -07:00
Justin Ho
57fca90ac6 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." 
This reverts commit dcf59629beed8182759a1068ab8ee997935bef82

Change-Id: I27426a0ffe993973ffb0b05ce1ed3afe73fcd87d
 2012-10-17 10:47:39 -07:00
Dianne Hackborn
dec9e1640a Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev 2012-10-17 10:45:08 -07:00
Daniel Sandler
6e2810bb98 Fixes for QS: 
- don't show clear all on the settings page if a
   notification comes in
 - delay makeExpandedInvisible when all panels are collapsed
   to ensure that the last frame of panel animation can show
   in its entirety

Bug: 7362346
Change-Id: I5303f03ea5ee654e222aff0b62ab69f98dc16978
 2012-10-17 13:42:57 -04:00
Bart Sears
7dbf63665b am ae232842: am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev 
* commit 'ae232842c86f108da5a73c047eff5a09e9c9c222':
  Fix native crash while saving a panorama.
 2012-10-17 10:28:52 -07:00
Bart Sears
ae232842c8 am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev 
* commit 'b112bb6684b336dc4f3287af65708e0934933d3d':
  Fix native crash while saving a panorama.
 2012-10-17 10:26:22 -07:00
Bart Sears
b112bb6684 am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev 
* commit '0ee71adde01298784a2cbb667c4c1570bdbf0af0':
  Fix native crash while saving a panorama.
 2012-10-17 10:23:42 -07:00
Bart Sears
0ee71adde0 Merge "Fix native crash while saving a panorama." into jb-mr1-dev 2012-10-17 10:20:50 -07:00
Kenny Root
115198ba1a am ed3ce513: Fix bad merge 
* commit 'ed3ce513a64b9f26358dc77187d6d04fe91abae9':
  Fix bad merge
 2012-10-17 10:10:27 -07:00
Kenny Root
ed3ce513a6 Fix bad merge 
Change-Id: I9f05f96e3607b994368a8d4e1e454af8fe84424d
 2012-10-17 10:06:17 -07:00
Kenny Root
21dc0aa5a4 am ad0090e7: resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp 
* commit 'ad0090e7b8c70cf44609aafbfea8c3946e2802a9':
  Remove HAVE_SELINUX guards
 2012-10-17 10:05:58 -07:00
Kenny Root
ad0090e7b8 resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp 
Change-Id: I9ae49075935f0e9ec432ce9d828ee26a4fcdb44c
 2012-10-17 10:02:22 -07:00
Kenny Root
40f2f751ac Merge "Fix mistaken removal of setfilecon" 2012-10-17 09:57:15 -07:00
Kenny Root
57c63d8f9b Fix mistaken removal of setfilecon 
Previous commit attempted to move setfilecon above chown, but mistakenly
squashed libdir and pkgdir setfilcon into one incorrect setfilecon.

Change-Id: I1ad00eae8a0e69ae88ce47cd5571558ce1ad2145
 2012-10-17 09:50:37 -07:00
Kenny Root
85f9ba9e7f Merge "Remove HAVE_SELINUX guards" 2012-10-17 09:35:35 -07:00
Chet Haase
babf588cb5 am 9cb417b7: am c894029a: am be29d82f: Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev 
* commit '9cb417b76fa72b3a53c6ce6d4017b389f553a2b8':
  Correctly adjust clip regions that lie offscreen
 2012-10-17 07:59:23 -07:00
Chet Haase
9cb417b76f am c894029a: am be29d82f: Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev 
* commit 'c894029a8e398502c058c2f5332bfe75d4b01735':
  Correctly adjust clip regions that lie offscreen
 2012-10-17 07:57:04 -07:00
Chet Haase
c894029a8e am be29d82f: Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev 
* commit 'be29d82f740fea2ed35d89bd9aa4644f4c042762':
  Correctly adjust clip regions that lie offscreen
 2012-10-17 07:54:16 -07:00
Chet Haase
be29d82f74 Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev 2012-10-17 07:51:46 -07:00
Wu-cheng Li
4b63f14c96 Fix native crash while saving a panorama. 
YuvToJpegEncoder should handle the case when the height is not
multiples of 16.

bug:7165606

Change-Id: I02f142b233c4f5c0cd8df5e3d1eaebbf62d28052
 2012-10-17 18:06:59 +08:00
Kenny Root
c9a1aabc49 Remove HAVE_SELINUX guards 
Change-Id: I6c2161471f657aa1645695ffd56ff434b0c2b426
 2012-10-16 23:32:31 -07:00
Daniel Sandler
fcc6b461b7 am a98e7502: am f1dacd0e: am 91ffeddb: Hide settings button from tablet notification panel. 
* commit 'a98e7502815d961911aac12fa4b24ca2118a48df':
  Hide settings button from tablet notification panel.
 2012-10-16 22:21:26 -07:00
Daniel Sandler
a98e750281 am f1dacd0e: am 91ffeddb: Hide settings button from tablet notification panel. 
* commit 'f1dacd0e89d98ad6b1b4d7d74107ef9c471cf537':
  Hide settings button from tablet notification panel.
 2012-10-16 22:18:40 -07:00
Daniel Sandler
f1dacd0e89 am 91ffeddb: Hide settings button from tablet notification panel. 
* commit '91ffeddb8b6ceec9a18ae34f88bd56560335de7f':
  Hide settings button from tablet notification panel.
 2012-10-16 22:16:11 -07:00
Daniel Sandler
91ffeddb8b Hide settings button from tablet notification panel. 
Bug: 7363279
Change-Id: I90f4286a596527485c462773f2553ed4986f60b2
 2012-10-17 01:11:05 -04:00
Amith Yamasani
10b0dad0d8 am fbb417f8: am 6facef70: am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev 
* commit 'fbb417f8744714792ff5cb242d78dcf88d47a28c':
  Do cleanup when Stopping users
 2012-10-16 21:48:54 -07:00
Amith Yamasani
fbb417f874 am 6facef70: am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev 
* commit '6facef70b5d6588450c6ee59a676a0cf3bfc745e':
  Do cleanup when Stopping users
 2012-10-16 21:45:59 -07:00
Romain Guy
0f4d103e87 am e557b0ca: am 3d2ecafd: am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev 
* commit 'e557b0ca62cc690d0d6d2d640bb06c7ec8375a5a':
  workaround to unbreak the build (deadlock during boot)
 2012-10-16 21:44:40 -07:00
Amith Yamasani
6facef70b5 am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev 
* commit 'b6c171b1afa871aa092dd2ec2ed25f48275ef194':
  Do cleanup when Stopping users
 2012-10-16 21:43:20 -07:00
Romain Guy
e557b0ca62 am 3d2ecafd: am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev 
* commit '3d2ecafd7742a93a3ca83993cf12f352aa998112':
  workaround to unbreak the build (deadlock during boot)
 2012-10-16 21:42:47 -07:00
Amith Yamasani
b6c171b1af Merge "Do cleanup when Stopping users" into jb-mr1-dev 2012-10-16 21:41:28 -07:00
Romain Guy
3d2ecafd77 am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev 
* commit 'ec5acee17a2210c3abcb25406c087901fda77757':
  workaround to unbreak the build (deadlock during boot)
 2012-10-16 21:40:18 -07:00
Daniel Sandler
c54a99cae9 am 87540b22: am cce71837: am b6454adb: Merge "Quickening." into jb-mr1-dev 
* commit '87540b2264158faf2cb8c715d8ed7c5832cfb62b':
  Quickening.
 2012-10-16 21:37:57 -07:00
Romain Guy
ec5acee17a Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev 2012-10-16 21:37:07 -07:00
Daniel Sandler
87540b2264 am cce71837: am b6454adb: Merge "Quickening." into jb-mr1-dev 
* commit 'cce71837337e91e03c1519b26fd8aaa3e77e3ffb':
  Quickening.
 2012-10-16 21:36:00 -07:00
Daniel Sandler
cce7183733 am b6454adb: Merge "Quickening." into jb-mr1-dev 
* commit 'b6454adb6c36290550105dd7e085c0d97e07c46f':
  Quickening.
 2012-10-16 21:32:36 -07:00
Daniel Sandler
b6454adb6c Merge "Quickening." into jb-mr1-dev 2012-10-16 21:30:23 -07:00