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

86477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chet Haase
d348ec204b am d95316e2: Merge "Skip drawing offscreen objects" into jb-mr1-dev 
* commit 'd95316e2c78c7e6cfacac9cced66f7ace36d6497':
  Skip drawing offscreen objects
 2012-10-17 12:38:53 -07:00
Romain Guy
f223282b06 am 16627347: Merge "Enable mipmapping, without a deadlock this time Bug #7353771" into jb-mr1-dev 
* commit '16627347ef5c22914ccb69ff7b7035c9c9d7ab07':
  Enable mipmapping, without a deadlock this time Bug #7353771
 2012-10-17 12:36:51 -07:00
Chet Haase
d95316e2c7 Merge "Skip drawing offscreen objects" into jb-mr1-dev 2012-10-17 12:36:24 -07:00
Romain Guy
16627347ef Merge "Enable mipmapping, without a deadlock this time Bug #7353771" into jb-mr1-dev 2012-10-17 12:32:50 -07:00
Romain Guy
5243957080 Enable mipmapping, without a deadlock this time 
Bug #7353771

Change-Id: I89a08a58608e374f1c604a26ee0769d5850b2f7b
 2012-10-17 12:14:11 -07:00
Daniel Sandler
b838ba6934 am 26f544ae: Merge "For Matias." into jb-mr1-dev 
* commit '26f544aef2b28412d4185b22e5c5660f4293f21b':
  For Matias.
 2012-10-17 11:58:55 -07:00
Daniel Sandler
26f544aef2 Merge "For Matias." into jb-mr1-dev 2012-10-17 11:56:14 -07:00
Irfan Sheriff
f5d46fd0ca am d4a149d9: Merge "Frequency conflict handling" into jb-mr1-dev 
* commit 'd4a149d9d06f3a1914babf70c93131f7211eaa2b':
  Frequency conflict handling
 2012-10-17 11:54:44 -07:00
Irfan Sheriff
d4a149d9d0 Merge "Frequency conflict handling" into jb-mr1-dev 2012-10-17 11:52:14 -07:00
Chet Haase
b78ee0ef60 Skip drawing offscreen objects 
Previous logic in ViewRoot would schedule and perform a draw
when it was requested by offscreen objects. The problem was that the
logic checking for an interesection between the offscreen invalidation rectangle
and the onscreen display rectangle was flawed. The fix was to use the return value
from Rect.intersect() to do the right thing and skip drawing.

Issue #7366568 Offscreen invalidates can cause useless work for framework

Change-Id: Ie4e277c695dacee39848a8a223f0c4ee34d9bb4d
 2012-10-17 11:32:01 -07:00
Yu Shan Emily Lau
ee974a469b am fc2652ef: Merge "Fix the NPE for the memwriter." into jb-mr1-dev 
* commit 'fc2652efedeaae40c4a3748a8de9ee833e1443e1':
  Fix the NPE for the memwriter.
 2012-10-17 11:23:55 -07:00
Fabrice Di Meglio
52d8458562 am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 
* commit 'e9a33c6098f51c687665adbed799860df2569ad0':
  Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
 2012-10-17 11:21:03 -07:00
Yu Shan Emily Lau
fc2652efed Merge "Fix the NPE for the memwriter." into jb-mr1-dev 2012-10-17 11:20:26 -07:00
Fabrice Di Meglio
e9a33c6098 Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 2012-10-17 11:18:13 -07:00
Fabrice Di Meglio
19f5b3e2ab am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev 
* commit '161cfef36d8fac79f8665ecdb78d3f8f8f5ba5af':
  Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow
 2012-10-17 11:16:01 -07:00
Daniel Sandler
cdd2e3d673 am b702e5df: Merge "Fix Bluetooth QS tile." into jb-mr1-dev 
* commit 'b702e5df25a4537e8471d9b14c3cff4f3d2cb468':
  Fix Bluetooth QS tile.
 2012-10-17 11:15:55 -07:00
Daniel Sandler
9d1177d4aa am 25e1456e: Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev 
* commit '25e1456ed8de57be3c551b39bf510dd0218a0d2b':
  Fade out the notification/settings panels just before close.
 2012-10-17 11:15:52 -07:00
Daniel Sandler
badf7651c1 am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev 
* commit 'f06125aab027c809095304f30d109d627cd995a6':
  Fixes for QS:
 2012-10-17 11:15:49 -07:00
Fabrice Di Meglio
161cfef36d Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev 2012-10-17 11:13:20 -07:00
Justin Ho
abaf7731f9 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 11:10:33 -07:00
Yu Shan Emily Lau
87b8a1c3b6 Fix the NPE for the memwriter. 
Change-Id: Id3a5c8f29b0f6be994ea95eb62f1a0eec8fe75b5
 2012-10-17 11:10:32 -07:00
Dianne Hackborn
ab61e562c8 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 11:10:24 -07:00
Bart Sears
0cb8a638b7 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 11:10:19 -07:00
Chet Haase
b6b52483a2 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 11:09:57 -07:00
Daniel Sandler
595703cd39 am 91ffeddb: Hide settings button from tablet notification panel. 
* commit '91ffeddb8b6ceec9a18ae34f88bd56560335de7f':
  Hide settings button from tablet notification panel.
 2012-10-17 11:09:44 -07:00
Amith Yamasani
3727bef869 am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev 
* commit 'b6c171b1afa871aa092dd2ec2ed25f48275ef194':
  Do cleanup when Stopping users
 2012-10-17 11:09:36 -07:00
Romain Guy
f094d96394 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-17 11:09:31 -07:00
Daniel Sandler
783bd686d5 am b6454adb: Merge "Quickening." into jb-mr1-dev 
* commit 'b6454adb6c36290550105dd7e085c0d97e07c46f':
  Quickening.
 2012-10-17 11:09:25 -07:00
Baligh Uddin
1b9a1418ad am c3984879: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c39848793c4067f2597d1ee8f0b6966b4c4e0bef':
  Import translations. DO NOT MERGE
 2012-10-17 11:09:19 -07:00
Baligh Uddin
19b304e79a am 779a19fe: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '779a19fe447a1be43a4a435c43718357b127c852':
  Import translations. DO NOT MERGE
 2012-10-17 11:09:10 -07:00
Daniel Sandler
b702e5df25 Merge "Fix Bluetooth QS tile." into jb-mr1-dev 2012-10-17 11:06:21 -07:00
Daniel Sandler
25e1456ed8 Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev 2012-10-17 11:06:21 -07:00
Daniel Sandler
f06125aab0 Merge "Fixes for QS:" into jb-mr1-dev 2012-10-17 11:05:20 -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
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
025e7cb4a1 Fade out the notification/settings panels just before close. 
Bug: 7362346
Change-Id: I437a98f4400c0a14b038c268ccf78a322d992681
 2012-10-17 13:42:58 -04: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
Irfan Sheriff
9f452d0b5c Frequency conflict handling 
We now show a dialog to user and let him handle whether to choose wifi
or p2p when there is a frequency conflict.

If user chooses to disable wifi tempoarily, we disconnect wifi until
p2p connection is established and removed.

Bug: 6590401
Change-Id: I73871ddcb3732ae61997d8771b6aa90ad56270af
 2012-10-17 10:35:39 -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
Daniel Sandler
ebaefec787 Fix Bluetooth QS tile. 
Changes in the connection state were causing QuickSettings
to clobber the enabled state of the adapter.

Bug: 7365388
Change-Id: I9611cb492d143bc9e7246c3e210664705586a85d
 2012-10-17 11:38:44 -04:00
Daniel Sandler
040c2e4ace For Matias. 
<3, dsandler.

Bug: 7348917
Change-Id: I193a94ab82a9e59068c95624c2e8d375543f71f7
 2012-10-17 11:06:50 -04: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
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
b6c171b1af Merge "Do cleanup when Stopping users" into jb-mr1-dev 2012-10-16 21:41:28 -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
b6454adb6c Merge "Quickening." into jb-mr1-dev 2012-10-16 21:30:23 -07:00
Mathias Agopian
a33d161250 workaround to unbreak the build (deadlock during boot) 
bug: 7363206
Change-Id: Ie79c309e367ba07336a5299af9fd59c6bd2390e7
 2012-10-16 21:26:43 -07:00
Baligh Uddin
c39848793c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-16 21:18:47 -07:00