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

87924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
b4bcef2430 am 76ceb290: am 7b8fbe42: Merge "reduce notification pad on large displays." into jb-mr1-dev 
* commit '76ceb2900f94c41c9dbb69e4dfb9efa2cfd572a2':
  reduce notification pad on large displays.
 2012-09-25 08:17:58 -07:00
Chris Wren
76ceb2900f am 7b8fbe42: Merge "reduce notification pad on large displays." into jb-mr1-dev 
* commit '7b8fbe42aabc6838c964a3a3694cba4cdd49e937':
  reduce notification pad on large displays.
 2012-09-25 08:15:23 -07:00
Chris Wren
7b8fbe42aa Merge "reduce notification pad on large displays." into jb-mr1-dev 2012-09-25 08:12:33 -07:00
Kristian Monsen
7f37a5028f am 20d2bcf8: am 7ae8a60f: Merge "Hiding a method for JB-MR1" into jb-mr1-dev 
* commit '20d2bcf899ece7a39dcf120bd9cfdfb235f6198f':
  Hiding a method for JB-MR1
 2012-09-25 07:32:36 -07:00
Kristian Monsen
20d2bcf899 am 7ae8a60f: Merge "Hiding a method for JB-MR1" into jb-mr1-dev 
* commit '7ae8a60f354d7cbb56da898db5a00f3b9fa7154c':
  Hiding a method for JB-MR1
 2012-09-25 07:31:19 -07:00
Kristian Monsen
7ae8a60f35 Merge "Hiding a method for JB-MR1" into jb-mr1-dev 2012-09-25 07:29:13 -07:00
Daniel Sandler
f2efc74866 am 7f8ed064: am c972757d: Merge "No more double-swiping to toggle panels on tablets." into jb-mr1-dev 
* commit '7f8ed0647176ab8aa47b0729f8919b3ba59f4783':
  No more double-swiping to toggle panels on tablets.
 2012-09-25 07:26:24 -07:00
Daniel Sandler
7f8ed06471 am c972757d: Merge "No more double-swiping to toggle panels on tablets." into jb-mr1-dev 
* commit 'c972757de0d21c779f304ee06ce6f6ff735bd62a':
  No more double-swiping to toggle panels on tablets.
 2012-09-25 07:24:00 -07:00
Daniel Sandler
887dcdcc6d am 2e17743b: am 6b183e92: Merge "Return carrier label to notification panel." into jb-mr1-dev 
* commit '2e17743b527db355eb5d6d9365a9b981b1daf834':
  Return carrier label to notification panel.
 2012-09-25 07:23:20 -07:00
Daniel Sandler
2e17743b52 am 6b183e92: Merge "Return carrier label to notification panel." into jb-mr1-dev 
* commit '6b183e92a480e93a7d25180bd64b1c3e87b8e982':
  Return carrier label to notification panel.
 2012-09-25 07:20:50 -07:00
Daniel Sandler
c972757de0 Merge "No more double-swiping to toggle panels on tablets." into jb-mr1-dev 2012-09-25 07:20:32 -07:00
Daniel Sandler
5a8aefa6c8 No more double-swiping to toggle panels on tablets. 
This also fixes up the drag regions so that quick settings
is only assigned the right 1/3 of the display (or 100dp,
whichever is larger). It had been that more than half of the
status bar, when dragged, would pull down QS.

Bug: 7217002
Change-Id: I515b6e19deab305b99784c7287d8f04fa9b22dc7
 2012-09-25 10:20:00 -04:00
Daniel Sandler
6b183e92a4 Merge "Return carrier label to notification panel." into jb-mr1-dev 2012-09-25 07:15:20 -07:00
Baligh Uddin
1ae5a48d93 Merge "Import translations. DO NOT MERGE" 2012-09-25 07:12:29 -07:00
Ben Murdoch
06a1c6fe1c Merge "Expose resources needed by Chromium-WebView." 2012-09-25 02:31:09 -07:00
Daniel Sandler
666d47502b Return carrier label to notification panel. 
If it makes you feel any better, it was there all along...

Bug: 7027535
Change-Id: Ib1add55f1bfe1958e15fa6a2960a821ccfb9d949
 2012-09-25 01:21:06 -04:00
Romain Guy
c237882a17 am 9a9bc9bf: am 927978a4: Merge "Fix graphics glitch and layouts in recents on 10" display" into jb-mr1-dev 
* commit '9a9bc9bfd8da8caecee7f0f129a9debfd69a4515':
  Fix graphics glitch and layouts in recents on 10" display
 2012-09-24 21:58:39 -07:00
Romain Guy
9a9bc9bfd8 am 927978a4: Merge "Fix graphics glitch and layouts in recents on 10" display" into jb-mr1-dev 
* commit '927978a48f2577efc92bae4ea605eef718162517':
  Fix graphics glitch and layouts in recents on 10" display
 2012-09-24 21:56:53 -07:00
Romain Guy
927978a48f Merge "Fix graphics glitch and layouts in recents on 10" display" into jb-mr1-dev 2012-09-24 21:53:58 -07:00
Romain Guy
0c3df4308d am d38bc618: am eea774a1: Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 
* commit 'd38bc618bc0e55e52f0575f51f145dcfec1c983b':
  Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-24 21:49:42 -07:00
Romain Guy
d38bc618bc am eea774a1: Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 
* commit 'eea774a1f65c91db1caa12a32e554813f4aef434':
  Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-24 21:47:52 -07:00
Romain Guy
eea774a1f6 Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 2012-09-24 21:45:13 -07:00
Romain Guy
0709b06abc Fix graphics glitch and layouts in recents on 10" display 
Change-Id: I7fa58a84d4e899ea995aa680ee550b5ddb30b6a6
 2012-09-24 21:45:03 -07:00
Romain Guy
bf3e77d46d Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext 
Bug #7216919

Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
 2012-09-24 21:42:18 -07:00
Baligh Uddin
3a070f7e8d am 61f2c43e: (-s ours) am 7ccd703f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '61f2c43e42bf60360ef4157f5e95aed9b9498ee8':
  Import translations. DO NOT MERGE
 2012-09-24 21:31:13 -07:00
Baligh Uddin
61f2c43e42 am 7ccd703f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7ccd703f02e2c7bedeac776178427580700e6584':
  Import translations. DO NOT MERGE
 2012-09-24 21:28:31 -07:00
Baligh Uddin
7ccd703f02 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-24 21:26:10 -07:00
Baligh Uddin
3d8b0d744e Merge "Import translations. DO NOT MERGE" 2012-09-24 21:24:23 -07:00
Philip Milne
8c549d6ffe Merge "Bug #6110465. Optical bounds support for all ViewGroup subclasses." 2012-09-24 20:55:00 -07:00
Romain Guy
96ab4dc1a6 am 592f54c4: am eebe0267: Merge "Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 
* commit '592f54c444caca924fca78ce6af14a3ee7009501':
  Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-24 20:48:23 -07:00
Romain Guy
592f54c444 am eebe0267: Merge "Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 
* commit 'eebe0267f4116e6f573455311c5776e3631c7cbc':
  Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-24 20:46:42 -07:00
Romain Guy
eebe0267f4 Merge "Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 2012-09-24 20:44:09 -07:00
Romain Guy
fb9e6cc275 Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext 
Bug #7216919

Change-Id: If2059227d55e8ddb2d2673ee36029c3c92dd9a3d
 2012-09-24 20:18:13 -07:00
Eric Laurent
0b7776c124 am 5194aa56: am a8c48521: Merge "Volume keys control music volume after music stops" into jb-mr1-dev 
* commit '5194aa568f4c928d8ad540a86869ea088f7a2a15':
  Volume keys control music volume after music stops
 2012-09-24 20:12:54 -07:00
Eric Laurent
5194aa568f am a8c48521: Merge "Volume keys control music volume after music stops" into jb-mr1-dev 
* commit 'a8c48521fea4e6a3f358a46e008f005149f2bb35':
  Volume keys control music volume after music stops
 2012-09-24 20:10:11 -07:00
Jim Miller
8f9739ed7c am c8c6b03a: am f794da7b: Merge "Fix wrong password attempt count in DevicePolicyManager" into jb-mr1-dev 
* commit 'c8c6b03af39e726eaefb3ee21b15e19eba05c372':
  Fix wrong password attempt count in DevicePolicyManager
 2012-09-24 20:07:32 -07:00
Eric Laurent
a8c48521fe Merge "Volume keys control music volume after music stops" into jb-mr1-dev 2012-09-24 20:07:14 -07:00
Jim Miller
c8c6b03af3 am f794da7b: Merge "Fix wrong password attempt count in DevicePolicyManager" into jb-mr1-dev 
* commit 'f794da7bd35deba01e6cc66ecea3614f7382698b':
  Fix wrong password attempt count in DevicePolicyManager
 2012-09-24 20:05:47 -07:00
Jim Miller
f794da7bd3 Merge "Fix wrong password attempt count in DevicePolicyManager" into jb-mr1-dev 2012-09-24 20:02:58 -07:00
Jim Miller
7641506e3c Fix wrong password attempt count in DevicePolicyManager 
Keyguard wasn't resetting dpm's count when a successful password
was made.  The result is the device would get wiped earlier than
it should.

Also fixes a TODO left over from keyguard refactoring that
allowed face unlock to trigger the same logic (ouch!).

Fixes bug 7219258

Change-Id: I2bd13c50a9beb8225d3237e86d5e34b73d0eb3cf
 2012-09-24 19:31:29 -07:00
Svetoslav Ganov
ca75451072 am c1c3fd95: am a2b71153: Merge "More than one finger at a time can trigger a system crash." into jb-mr1-dev 
* commit 'c1c3fd95414d4378decee70acce8d000b872c8c9':
  More than one finger at a time can trigger a system crash.
 2012-09-24 19:16:57 -07:00
Svetoslav Ganov
c1c3fd9541 am a2b71153: Merge "More than one finger at a time can trigger a system crash." into jb-mr1-dev 
* commit 'a2b711530f2c71a37cec980af8c66bd523744462':
  More than one finger at a time can trigger a system crash.
 2012-09-24 19:14:59 -07:00
Svetoslav Ganov
a2b711530f Merge "More than one finger at a time can trigger a system crash." into jb-mr1-dev 2012-09-24 19:12:38 -07:00
Svetoslav Ganov
eacc3183e1 am c3961a2c: am 0d7558fc: Merge "Magnified frame not properly computed when keyguard goes away." into jb-mr1-dev 
* commit 'c3961a2c64ff83f91939f102ba3ef99bfc4caf75':
  Magnified frame not properly computed when keyguard goes away.
 2012-09-24 18:59:22 -07:00
Svetoslav Ganov
c3961a2c64 am 0d7558fc: Merge "Magnified frame not properly computed when keyguard goes away." into jb-mr1-dev 
* commit '0d7558fcb6450eb8e2193ecdd285db21b790e1f7':
  Magnified frame not properly computed when keyguard goes away.
 2012-09-24 18:57:20 -07:00
Svetoslav Ganov
0d7558fcb6 Merge "Magnified frame not properly computed when keyguard goes away." into jb-mr1-dev 2012-09-24 18:55:05 -07:00
Brian Muramatsu
1c87a074d7 am 2a78c336: am 7cf3bbc4: Merge "Use global wifi_sleep_policy constants" into jb-mr1-dev 
* commit '2a78c336eef813379f83d6e84e84f2c447d828be':
  Use global wifi_sleep_policy constants
 2012-09-24 18:44:09 -07:00
Doug Zongker
e41633f203 am 2ca11f52: am d7ae127b: Merge "fix argument parser for global settings URLs" into jb-mr1-dev 
* commit '2ca11f527d2e245c963a16f84df7a5bde1e9952f':
  fix argument parser for global settings URLs
 2012-09-24 18:44:06 -07:00
Svetoslav Ganov
03e7b88815 More than one finger at a time can trigger a system crash. 
1. The crash was happening if: two active pointers are performing a drag;
   there are some inactive pointers down; the main dragging pointer (we are
   merging the dragging pointers into one) goes up; now an inactive pointer
   goes up and the explorer tries to inject up for the dragging pointer
   which is no longer in the event resulting in a crash. Basically two
   problems: inactive pointers were not ignored; 2) having only one
   active pointer should not only send the up event but also transition
   the explorer in touch exploring state.

bug:6874128

Change-Id: I341fc360ebc074fe3919d5ba3b98ee5cb08dd71e
 2012-09-24 18:43:30 -07:00
Brian Muramatsu
2a78c336ee am 7cf3bbc4: Merge "Use global wifi_sleep_policy constants" into jb-mr1-dev 
* commit '7cf3bbc4c0af6f3f4e92c51bb2c5e65cd1a499d1':
  Use global wifi_sleep_policy constants
 2012-09-24 18:42:04 -07:00