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

26842 Commits

Author SHA1 Message Date
Jim Miller
f7b77f1285 am ef512f03: am cccf85c2: am 8e614501: Merge "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 'ef512f03e3a10b39e82c9029d9d7623915ac8850':
  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-16 19:30:18 -07:00
Jim Miller
ef512f03e3 am cccf85c2: am 8e614501: Merge "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 'cccf85c287aea85121b15280bf3a89a2b7d3926b':
  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-16 19:28:28 -07:00
Jim Miller
cccf85c287 am 8e614501: Merge "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 '8e6145013a6533ca6a33e03c8a5e45ad2de431e4':
  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-16 19:26:00 -07:00
Jim Miller
8e6145013a Merge "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-16 19:22:37 -07:00
Jim Miller
dcf59629be This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height. 
Revert "Revert "Revert "Fix for bug 6050753."""

This reverts commit 6868d6f349610c15256471cc3d5fa708cbfd5f1d

Change-Id: I8843d92dba14c82f06d9ee59517cf11b2abbbf04
 2012-10-16 19:01:32 -07:00
Christopher Tate
7ca396f5f8 am 19f56158: am f0bba8a8: am 69b0c974: Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev 
* commit '19f561580aecb927253bfdc37e96ba5aff7ef3cf':
  Fix ApplicationInfo copy ctor
 2012-10-16 17:49:19 -07:00
Christopher Tate
19f561580a am f0bba8a8: am 69b0c974: Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev 
* commit 'f0bba8a8d0ace06f786bc0d78b0ed3ea3ae59814':
  Fix ApplicationInfo copy ctor
 2012-10-16 17:39:42 -07:00
Christopher Tate
f0bba8a8d0 am 69b0c974: Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev 
* commit '69b0c974b5abb38a4443410cf09f7d5f28cf2c7f':
  Fix ApplicationInfo copy ctor
 2012-10-16 17:37:46 -07:00
Christopher Tate
69b0c974b5 Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev 2012-10-16 17:33:55 -07:00
Christopher Tate
bcb0255770 Fix ApplicationInfo copy ctor 
Need to copy ALL the fields!

Bug 7360899

Change-Id: Ie6ed2d6f41c2efaf793ebf111adc8fa5e8b57d7c
 2012-10-16 17:14:34 -07:00
Raph Levien
886d159aa8 am 17732ff1: am 142155b5: am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev 
* commit '17732ff107706d1e816d45307594e8b73f8bb01b':
  Fix for bug 7358703 Gmail ANR when trying to compose a message
 2012-10-16 14:52:03 -07:00
Raph Levien
17732ff107 am 142155b5: am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev 
* commit '142155b5cec5dfbde4a875828505cd1434df0d2b':
  Fix for bug 7358703 Gmail ANR when trying to compose a message
 2012-10-16 14:49:29 -07:00
Raph Levien
142155b5ce am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev 
* commit '3377b404b82403c4c137c699088eb09c4b806dba':
  Fix for bug 7358703 Gmail ANR when trying to compose a message
 2012-10-16 14:46:41 -07:00
Raph Levien
3377b404b8 Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev 2012-10-16 14:44:18 -07:00
Svetoslav Ganov
88939e5c84 am c53fee3b: am 5ac909f9: am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev 
* commit 'c53fee3b435f8e84b4608ee4eac5c536210c5c20':
  Occasionally triple tap on the keyboard toggles screen magnification.
 2012-10-16 14:41:13 -07:00
Raph Levien
8b17969c64 Fix for bug 7358703 Gmail ANR when trying to compose a message 
When deferring scroll to a point, it's possible the text changed between
the time the scroll was requested to the time layout happens. In this
case, it attempts to scroll to a point past the end of the text buffer,
which created an infinite loop.

This patch clamps the scroll offset to the length of the text, so it
just scrolls to the end in that case, rather than crashing.

Change-Id: I53740d119d588560f5a4d9fb80e38f7057faab89
 2012-10-16 14:32:47 -07:00
Svetoslav Ganov
c53fee3b43 am 5ac909f9: am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev 
* commit '5ac909f9e2ab42842c0697c9af31bd95bfc3cb68':
  Occasionally triple tap on the keyboard toggles screen magnification.
 2012-10-16 14:25:59 -07:00
Svetoslav Ganov
5ac909f9e2 am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev 
* commit '964629aca8d076826198a21b654ed858618b5619':
  Occasionally triple tap on the keyboard toggles screen magnification.
 2012-10-16 14:22:59 -07:00
Svetoslav Ganov
964629aca8 Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev 2012-10-16 14:20:45 -07:00
Jeff Sharkey
a3ee54fa4b am 212a8f5e: am 05790a27: am 04876317: Merge "Lock SyncQueue when user starting, copy RSC list." into jb-mr1-dev 
* commit '212a8f5e9a1a304e7a3505b99c7b1b8764f24505':
  Lock SyncQueue when user starting, copy RSC list.
 2012-10-16 13:40:44 -07:00
Jeff Sharkey
212a8f5e9a am 05790a27: am 04876317: Merge "Lock SyncQueue when user starting, copy RSC list." into jb-mr1-dev 
* commit '05790a276c7c89f6164be5b9a6b7ca7b294a15fb':
  Lock SyncQueue when user starting, copy RSC list.
 2012-10-16 13:38:16 -07:00
Jeff Sharkey
05790a276c am 04876317: Merge "Lock SyncQueue when user starting, copy RSC list." into jb-mr1-dev 
* commit '04876317518b89888ee52e68caec26f6061eb621':
  Lock SyncQueue when user starting, copy RSC list.
 2012-10-16 13:34:53 -07:00
Jeff Sharkey
0487631751 Merge "Lock SyncQueue when user starting, copy RSC list." into jb-mr1-dev 2012-10-16 13:32:28 -07:00
Fabrice Di Meglio
4f1e535b8d am 9e520a6d: am d23b26b6: am b858ecd3: Merge "Fix bug #7345139: The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev 
* commit '9e520a6dd4981d9c746b4c5e8f8b6f644570c7d7':
  Fix bug #7345139: The First Volume Down Click looses its place on the volume slider
 2012-10-16 13:31:37 -07:00
Fabrice Di Meglio
9e520a6dd4 am d23b26b6: am b858ecd3: Merge "Fix bug #7345139: The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev 
* commit 'd23b26b6fded61e91903cf2ff5e92092a93d8c84':
  Fix bug #7345139: The First Volume Down Click looses its place on the volume slider
 2012-10-16 13:28:10 -07:00
Jeff Sharkey
a706e2fd00 Lock SyncQueue when user starting, copy RSC list. 
Document SyncQueue locking policy and protect in onUserStarting()
and clearAllBackoffs().  Return copy of ServiceInfo list from
RegisteredServicesCache instead of exposing locking externally.

Bug: 7357776, 7352537
Change-Id: I6a32ca98a355b639d4207a88bde572179beae359
 2012-10-16 13:27:12 -07:00
Fabrice Di Meglio
d23b26b6fd am b858ecd3: Merge "Fix bug #7345139: The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev 
* commit 'b858ecd3a94add574503d4dd21084ad289bc5c27':
  Fix bug #7345139: The First Volume Down Click looses its place on the volume slider
 2012-10-16 13:25:51 -07:00
Fabrice Di Meglio
b858ecd3a9 Merge "Fix bug #7345139: The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev 2012-10-16 13:23:37 -07:00
Matthew Xie
ec89b98739 am a5b03565: am 8a4dfb9c: am a3d5b688: Merge "Add serial port profile support and allow to connect to rfcomm channel without sdp discovery" into jb-mr1-dev 
* commit 'a5b03565383f8121bae4a6abe874b2e9249525c5':
  Add serial port profile support and allow to connect to rfcomm channel without sdp discovery
 2012-10-16 13:05:17 -07:00
Matthew Xie
a5b0356538 am 8a4dfb9c: am a3d5b688: Merge "Add serial port profile support and allow to connect to rfcomm channel without sdp discovery" into jb-mr1-dev 
* commit '8a4dfb9ce89311a5e7744730f0277123b947ad6b':
  Add serial port profile support and allow to connect to rfcomm channel without sdp discovery
 2012-10-16 13:03:04 -07:00
Matthew Xie
8a4dfb9ce8 am a3d5b688: Merge "Add serial port profile support and allow to connect to rfcomm channel without sdp discovery" into jb-mr1-dev 
* commit 'a3d5b688cf500f456127f1c2639ed9323ba50e9c':
  Add serial port profile support and allow to connect to rfcomm channel without sdp discovery
 2012-10-16 13:00:36 -07:00
Matthew Xie
a3d5b688cf Merge "Add serial port profile support and allow to connect to rfcomm channel without sdp discovery" into jb-mr1-dev 2012-10-16 12:57:53 -07:00
Fabrice Di Meglio
f37df1b6c2 Fix bug #7345139: The First Volume Down Click looses its place on the volume slider 
- make SeekBar follow layout direction changes
- also fix onSizeChanged() missing call to super class

Change-Id: Ide036e673c5f104b12e7321648ac027547e04065
 2012-10-16 11:38:26 -07:00
Svetoslav Ganov
55468c64bc Occasionally triple tap on the keyboard toggles screen magnification. 
1. Sometimes unlocking the device when the IME is up and triple tapping on the keyboard
   toggles screen magnification. The core reason is that when the kayguard window is
   shown we hide all other windows and when it is hidden we show these windows. We did
   not notify the screen magnifier for windows being shown and hidden. Also when the
   windows are shown we may reassign layers to put the IME or the wallpaper in the
   right Z order. The screen magnifier is now notified upon such layer reassignment
   since window layers are used when computing the magnified region.

bug:7351531

Change-Id: I0931f4ba6cfa565d8eb1e3c432268ba1818feea6
 2012-10-16 11:11:39 -07:00
Svetoslav Ganov
1c80844464 am 7d5de594: am d46503d5: am 40b7ea44: Merge "Accessibility focus drawing does not take into account view\'s transformation matrix." into jb-mr1-dev 
* commit '7d5de5941d24aadf57d883198f79cf39da324635':
  Accessibility focus drawing does not take into account view's transformation matrix.
 2012-10-16 11:10:29 -07:00
Svetoslav Ganov
7d5de5941d am d46503d5: am 40b7ea44: Merge "Accessibility focus drawing does not take into account view\'s transformation matrix." into jb-mr1-dev 
* commit 'd46503d5088b46f3e45a94b81efa406856559ca8':
  Accessibility focus drawing does not take into account view's transformation matrix.
 2012-10-16 11:08:43 -07:00
Svetoslav Ganov
d46503d508 am 40b7ea44: Merge "Accessibility focus drawing does not take into account view\'s transformation matrix." into jb-mr1-dev 
* commit '40b7ea443612213e9c973393658f07c176c3269e':
  Accessibility focus drawing does not take into account view's transformation matrix.
 2012-10-16 11:07:12 -07:00
Svetoslav Ganov
40b7ea4436 Merge "Accessibility focus drawing does not take into account view's transformation matrix." into jb-mr1-dev 2012-10-16 11:03:46 -07:00
zzy
b49a896359 Add serial port profile support and allow to connect to rfcomm channel without sdp discovery 
bug 7272974

Change-Id: Idc10edc056b48da2fd96bea84eba3fb73b97bab1
 2012-10-15 22:30:29 -07:00
Mathias Agopian
d8c4f50981 am 1167b7b9: am dcfe6cee: am 6868d6f3: Revert "Revert "Fix for bug 6050753."" 
* commit '1167b7b9e43878f077478f58e31e268c2e191110':
  Revert "Revert "Fix for bug 6050753.""
 2012-10-15 20:53:21 -07:00
Mathias Agopian
1167b7b9e4 am dcfe6cee: am 6868d6f3: Revert "Revert "Fix for bug 6050753."" 
* commit 'dcfe6ceef05c1566a8fc80b758b830c39df01bbd':
  Revert "Revert "Fix for bug 6050753.""
 2012-10-15 20:51:00 -07:00
Mathias Agopian
dcfe6ceef0 am 6868d6f3: Revert "Revert "Fix for bug 6050753."" 
* commit '6868d6f349610c15256471cc3d5fa708cbfd5f1d':
  Revert "Revert "Fix for bug 6050753.""
 2012-10-15 20:47:56 -07:00
Mathias Agopian
6868d6f349 Revert "Revert "Fix for bug 6050753."" 
Emergency revert -- fix reboot loop.

This reverts commit 8e63bcc63fd002231f8391af8982eeb235d096c8.

Change-Id: I4373b867d756de09cdf6aa0aba9e6ff8f47bcdbc
 2012-10-15 20:45:01 -07:00
Jamie Gennis
0d4f45d942 am b312f115: am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev 
* commit 'b312f1155caa1b323f482b92564cd07f3151c66b':
  Flag window animation transactions as animations.
 2012-10-15 20:23:09 -07:00
Romain Guy
dabcbfe46d am 3e6c9ba6: am cb09dba0: am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev 
* commit '3e6c9ba6777cec3b3928ddb2b399c957735f7b06':
  Revert "Fix for bug 6050753."
 2012-10-15 20:23:05 -07:00
Romain Guy
1da111fca4 am e9d0c992: am 8ab33df5: am edefaa25: Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev 
* commit 'e9d0c9920b98a7e3aca0a7583a55b8278166802a':
  Ensure we always request conformant OpenGL ES 2.0 contexts
 2012-10-15 20:23:00 -07:00
Raph Levien
f95dfbbcfe am 244f5125: am b9e224cc: am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev 
* commit '244f5125abd62e60f6bf91675f3be6d540b818d2':
  Fix for bug 7344916 text view flickers when you hit enter
 2012-10-15 20:22:33 -07:00
Jamie Gennis
b312f1155c am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev 
* commit '38041d6b3c3d838d99f70f9b1195d69487edf689':
  Flag window animation transactions as animations.
 2012-10-15 20:19:40 -07:00
Romain Guy
3e6c9ba677 am cb09dba0: am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev 
* commit 'cb09dba0b80ff51e0a481959c5f0056f7a292ea7':
  Revert "Fix for bug 6050753."
 2012-10-15 20:19:28 -07:00
Romain Guy
e9d0c9920b am 8ab33df5: am edefaa25: Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev 
* commit '8ab33df56b1c22b7557f7dbe2d0b1f07d8ee1e47':
  Ensure we always request conformant OpenGL ES 2.0 contexts
 2012-10-15 20:19:24 -07:00