93471 Commits

Author SHA1 Message Date
Chet Haase
374876666c am b36dca1b: am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
* commit 'b36dca1b045698edf7e6804fd4f8cdb1485e096b':
  Set wallpaper bitmap reference to null before reloading
2012-10-25 12:25:52 -07:00
Chet Haase
b36dca1b04 am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
* commit '9023cf91018c75a179d04256fd4e306065528117':
  Set wallpaper bitmap reference to null before reloading
2012-10-25 12:23:14 -07:00
Chet Haase
9023cf9101 Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev 2012-10-25 12:19:34 -07:00
Chet Haase
589a6af173 Set wallpaper bitmap reference to null before reloading
Give the GC a chance to collect the current bitmap if it needs to,
as it allocates memory for the next one. This helps avoid OOM situations
that can sometimes occur in extreme circumstances (huge bitmaps)

Also set the default_wallpaper to the right default size.

Issue #7352961 Wallpaper edge is cut-off while scrolling through home page

Change-Id: If76b55061d04b29af7f66a6162e307b8b53bf4ae
2012-10-25 11:57:09 -07:00
Fabrice Di Meglio
809312791c am 0182dc39: am 3b53061e: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
* commit '0182dc39bd969b797614c90e44978b83ac57fd1c':
  FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:50:07 -07:00
Fabrice Di Meglio
0182dc39bd am 3b53061e: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
* commit '3b53061e6d2753440da04c042d26b8c4e94a5b95':
  FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:47:08 -07:00
Fabrice Di Meglio
3b53061e6d am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
* commit '3e297339f8b77d54f520d5471c90c9d04e78400e':
  FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:44:47 -07:00
Fabrice Di Meglio
3e297339f8 Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev 2012-10-25 11:41:20 -07:00
Fabrice Di Meglio
72898e9828 FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
- made them private and final
- fixed comment

Change-Id: Ia1d22329edb7ac26e7bcd0489770a99ad41c4f0e
2012-10-25 11:22:39 -07:00
Svetoslav Ganov
21ab20916e am 1abaa2cb: am b8ee636a: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
* commit '1abaa2cb693743df9a24da265c9c6bd58991ff2c':
  Accessibility layer in inconsistent state after running UI test automation tests.
2012-10-25 11:18:10 -07:00
Svetoslav Ganov
1abaa2cb69 am b8ee636a: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
* commit 'b8ee636a864577c08a53bf4b1ba8120d952eb5d8':
  Accessibility layer in inconsistent state after running UI test automation tests.
2012-10-25 11:15:12 -07:00
Svetoslav Ganov
b8ee636a86 am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
* commit '324cfc54ed3527b98069f87665504a423bab63e4':
  Accessibility layer in inconsistent state after running UI test automation tests.
2012-10-25 11:13:14 -07:00
Svetoslav Ganov
324cfc54ed Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev 2012-10-25 11:09:30 -07:00
Svetoslav Ganov
7fd9882ba3 Accessibility layer in inconsistent state after running UI test automation tests.
1. The accessibility layer has a back door for a UI test automation code running
   from the shell to attach. The unregister code does an incorrect identity check
   and as a result the register UI test automation service is not disconnected
   until its process is killed. The fix is super safe and simple.

bug:7409261

Change-Id: I4b1da18be6c5619dadd4a58fca6724529bc59dea
2012-10-25 09:41:11 -07:00
Bryan Mawhinney
84ab7fee4a am 1cd75be6: am 83d960bf: am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
* commit '1cd75be6a7d333ac67366f26d95eed84bb1ae25a':
  Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
2012-10-25 02:14:24 -07:00
Bryan Mawhinney
1cd75be6a7 am 83d960bf: am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
* commit '83d960bffaceb133a3e60dedd69a7690598e40e6':
  Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
2012-10-25 02:11:48 -07:00
Bryan Mawhinney
83d960bffa am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
* commit '33c0a616dbd284b47cc8e6af2eec358fba7c701f':
  Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
2012-10-25 02:09:43 -07:00
Bryan Mawhinney
33c0a616db Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev 2012-10-25 02:06:37 -07:00
Dianne Hackborn
7a588e757a am a699c1b1: am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev
* commit 'a699c1b16f9732308a5c17260607db1b7690d394':
  Fix issue #7408647: Add getUserCount() API
2012-10-24 18:07:17 -07:00
Daniel Sandler
cf72fd5cc5 am 829e0015: am 0c707b2b: am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* commit '829e001546a96a63b7a742b3dfa1bfa6c592029e':
  Be a little more lenient with panel-open gestures.
  Missing copyright headers.
2012-10-24 18:04:34 -07:00
Dianne Hackborn
a699c1b16f am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev
* commit '72d0a5aa04f18af5037ff331c2f0983f7cbd4331':
  Fix issue #7408647: Add getUserCount() API
2012-10-24 18:04:27 -07:00
Dianne Hackborn
72d0a5aa04 am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev
* commit 'ead7d90e8b049c9689560015dbb761242fd86c99':
  Fix issue #7408647: Add getUserCount() API
2012-10-24 18:02:05 -07:00
Daniel Sandler
829e001546 am 0c707b2b: am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* commit '0c707b2b7e871f2c3c248678bcfa162434dd8bec':
  Be a little more lenient with panel-open gestures.
  Missing copyright headers.
2012-10-24 18:01:32 -07:00
Daniel Sandler
0c707b2b7e am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* commit '38c904a6bc3cc215940ec0d8f96cda9376ff0133':
  Be a little more lenient with panel-open gestures.
  Missing copyright headers.
2012-10-24 17:59:12 -07:00
Dianne Hackborn
ead7d90e8b Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 2012-10-24 17:58:13 -07:00
Daniel Sandler
38c904a6bc Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* changes:
  Be a little more lenient with panel-open gestures.
  Missing copyright headers.
2012-10-24 17:55:10 -07:00
Nick Kralevich
52cfb0ccc7 am 369852eb: am 7e007ff8: Merge "Sensors could be disabled by any application"
* commit '369852ebdea6a5843e299000c57baac89282b154':
  Sensors could be disabled by any application
2012-10-24 16:52:21 -07:00
Nick Kralevich
369852ebde am 7e007ff8: Merge "Sensors could be disabled by any application"
* commit '7e007ff83738a83f43cb59ddc023a2b860367074':
  Sensors could be disabled by any application
2012-10-24 16:50:32 -07:00
Nick Kralevich
7e007ff837 Merge "Sensors could be disabled by any application" 2012-10-24 16:29:06 -07:00
Bo Liu
7cd2baf4ce Remove CacheManager implementation
CacheManager will not be implemented with webviewchromium. So removing
existing implemntation in WebViewClassic.

Change-Id: I82d3a156ba898393cc12080f8150841cd76f187a
2012-10-24 16:00:01 -07:00
Irfan Sheriff
c3df33796e am c4cbb35f: am 88d254cf: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
* commit 'c4cbb35fc22e0aee6a1386d024567274151f0c01':
  Handle group tear down only at group removed event
2012-10-24 15:30:15 -07:00
Irfan Sheriff
c4cbb35fc2 am 88d254cf: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
* commit '88d254cffbf8d1b75d506384a41148a3112b6af1':
  Handle group tear down only at group removed event
2012-10-24 15:28:22 -07:00
Dianne Hackborn
b26306ad52 Fix issue #7408647: Add getUserCount() API
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
2012-10-24 15:28:03 -07:00
Irfan Sheriff
88d254cffb am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
* commit '4e7f2ffe1791807636ac542f73016773c30daa92':
  Handle group tear down only at group removed event
2012-10-24 15:26:28 -07:00
Irfan Sheriff
4e7f2ffe17 Merge "Handle group tear down only at group removed event" into jb-mr1-dev 2012-10-24 15:23:47 -07:00
Brett Chabot
70f0ef46db Merge "Remove erroneous override of package-private method." 2012-10-24 15:11:46 -07:00
Irfan Sheriff
2bc0c5fef2 Handle group tear down only at group removed event
Handling group removal at disconnect causes issues where supplicant keeps
the group and then the next invocation fails

Bug: 7403755
Change-Id: Iea7e5ec98486607f8e2c4a55be3743e0545a9da7
2012-10-24 15:05:56 -07:00
Jeff Brown
5e3f246189 am bf3c2898: am b21b4fdc: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
* commit 'bf3c28982c3b487f516b1b118944818426fc5fed':
  Dim the screen quickly in response to user activity timeout.
2012-10-24 15:02:58 -07:00
Jeff Brown
bf3c28982c am b21b4fdc: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
* commit 'b21b4fdcea2d3ff4186f4c8dbcd89493cc4fd2bf':
  Dim the screen quickly in response to user activity timeout.
2012-10-24 15:00:31 -07:00
Jeff Brown
b21b4fdcea am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
* commit '900e0ba5163bd03becf49922dfdfad07460716f0':
  Dim the screen quickly in response to user activity timeout.
2012-10-24 14:58:26 -07:00
Jeff Brown
900e0ba516 Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev 2012-10-24 14:55:41 -07:00
Brett Chabot
41e173d4cb Remove erroneous override of package-private method.
Change-Id: I8d473c1eb32f2513d01b3f7f14f0001286a6a9ca
2012-10-24 14:51:21 -07:00
Jeff Brown
5244c93176 Dim the screen quickly in response to user activity timeout.
Reverts a previous change that made the screen dim slowly instead.
The quick transition does a better job of attracting the user's
attention to the fact that the screen is about to turn off
unless the user touches the screen.

Bug: 7386034
Change-Id: I81e4d8939f6791b96352004984a9e5b2aab79788
2012-10-24 14:46:26 -07:00
Romain Guy
144b59adb1 am f323fd07: am 4344f209: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev
* commit 'f323fd07ba75b8bc13470a22f698937345bc9f0d':
  Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:58:49 -07:00
Romain Guy
f323fd07ba am 4344f209: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev
* commit '4344f20959b6591f484d20012a398d7fefe8a8fb':
  Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:56:27 -07:00
Baligh Uddin
5800ee3ba6 Merge "Import translations. DO NOT MERGE" 2012-10-24 13:56:26 -07:00
Baligh Uddin
b1142ef3f0 am e3e62668: (-s ours) am 229a22ef: am 188bf0e6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'e3e626683f0e932b6c759003c9db4a35f901abf1':
  Import translations. DO NOT MERGE
2012-10-24 13:55:42 -07:00
Romain Guy
4344f20959 am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev
* commit '9933331506c91e535ba277bef9c44e1852ccf16c':
  Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:53:46 -07:00
Baligh Uddin
e3e626683f am 229a22ef: am 188bf0e6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '229a22efc595f7676dfe4699c3bfcf5ce8414ac2':
  Import translations. DO NOT MERGE
2012-10-24 13:52:22 -07:00
Romain Guy
9933331506 Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev 2012-10-24 13:50:45 -07:00