Adam Powell
6b6c90523e
TaskStackBuilder - use the correct package for looking up parents
...
Fix bug 7179104
Change-Id: Ia5d2d285cf22e97c452e0c385ef38c8bce330491
2012-09-17 13:32:33 -07:00
Michael Jurka
82b38b6655
am 7109aad6: Merge "Fix issue where recents would not show up sometimes" into jb-mr1-dev
...
* commit '7109aad6a17dbf8a4292477671b60f155effab38':
Fix issue where recents would not show up sometimes
2012-09-17 13:31:28 -07:00
Chet Haase
53615bccc4
am f74d2f2f: Merge "Fix occasional crash bug with layers" into jb-mr1-dev
...
* commit 'f74d2f2fe8a157bee25516d2a6ae3e329507cb2c':
Fix occasional crash bug with layers
2012-09-17 13:31:25 -07:00
Michael Jurka
7109aad6a1
Merge "Fix issue where recents would not show up sometimes" into jb-mr1-dev
2012-09-17 13:29:03 -07:00
Chet Haase
f74d2f2fe8
Merge "Fix occasional crash bug with layers" into jb-mr1-dev
2012-09-17 13:29:03 -07:00
Romain Guy
3ca90f6788
am 9f5f80e7: Merge "Fix modulation and gamma correction issues" into jb-mr1-dev
...
* commit '9f5f80e7a64d9388e3e73763b5c73dcddaa729fc':
Fix modulation and gamma correction issues
2012-09-17 13:02:29 -07:00
Romain Guy
9f5f80e7a6
Merge "Fix modulation and gamma correction issues" into jb-mr1-dev
2012-09-17 12:51:08 -07:00
Amith Yamasani
ed29ca9c41
am e645324e: Merge "Add UserManager.getUserIcon()" into jb-mr1-dev
...
* commit 'e645324e6bb42075b2e3b37d776e180a51091f96':
Add UserManager.getUserIcon()
2012-09-17 12:48:28 -07:00
Amith Yamasani
e645324e6b
Merge "Add UserManager.getUserIcon()" into jb-mr1-dev
2012-09-17 12:46:01 -07:00
Amith Yamasani
3b49f07a45
Add UserManager.getUserIcon()
...
So that we don't abuse the setUserIcon() for reading. So the new method won't try
to create the file, only return it if it exists.
Change-Id: I7a81d3f1b29d14d37e71f531744ce39f21d827ac
2012-09-17 12:42:00 -07:00
Jeff Brown
c9bd4ca005
Swap remote submix initialization order.
...
Need to turn the submix on before connecting and off
after disconnecting.
Change-Id: I53389c3b61e6d663855accd0461eed42a67d9d2b
2012-09-17 12:24:43 -07:00
Xavier Ducrohet
6d35c360d3
am a41d5db2: am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt."
...
* commit 'a41d5db2350108c1d2eceb83b677faed6b7893a8':
Add --output-text-symbols option to aapt.
2012-09-17 12:10:30 -07:00
Xavier Ducrohet
8fbe97779a
am 9ff22e41: am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt."
...
* commit '9ff22e41d05aa66bede1e72767d67dcc2f2d500e':
Add --error-on-failed-insert option to aapt.
2012-09-17 12:10:27 -07:00
Xavier Ducrohet
a41d5db235
am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt."
...
* commit '79c95c3b50ff332f9c92430fd10a15eb648a0b02':
Add --output-text-symbols option to aapt.
2012-09-17 12:08:36 -07:00
Xavier Ducrohet
9ff22e41d0
am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt."
...
* commit '8a67598eb780560b7efe4e1d9944c7cbcf83bbb1':
Add --error-on-failed-insert option to aapt.
2012-09-17 12:08:29 -07:00
Xavier Ducrohet
79c95c3b50
am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt."
...
* commit '5de9603529ee01a416b5fa31074197565fde4482':
Add --output-text-symbols option to aapt.
2012-09-17 12:05:36 -07:00
Xavier Ducrohet
8a67598eb7
am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt."
...
* commit 'cc9747ed45302956a3ec9dd21f7b950b837dbfdd':
Add --error-on-failed-insert option to aapt.
2012-09-17 12:05:30 -07:00
Xavier Ducrohet
5de9603529
am 31820a35: Merge "Add --output-text-symbols option to aapt."
...
* commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d':
Add --output-text-symbols option to aapt.
2012-09-17 12:03:19 -07:00
Xavier Ducrohet
cc9747ed45
am d7252571: Merge "Add --error-on-failed-insert option to aapt."
...
* commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b':
Add --error-on-failed-insert option to aapt.
2012-09-17 12:03:12 -07:00
Michael Jurka
cbe69206c0
Fix issue where recents would not show up sometimes
...
Change-Id: Iea78f447b71ae23630c76c8982e69c780eef9df6
2012-09-17 11:51:18 -07:00
Craig Mautner
d202990510
am 178af594: Add debug to help with b/7135184.
...
* commit '178af5948d71c841278081c712506f7a7fca34b9':
Add debug to help with b/7135184.
2012-09-17 11:36:44 -07:00
Craig Mautner
178af5948d
Add debug to help with b/7135184.
...
Change-Id: I0d3b60b3e123d35bd557d47e3344ebea1964380b
Conflicts:
services/java/com/android/server/wm/WindowAnimator.java
2012-09-17 11:33:25 -07:00
Scott Main
b574a264e6
am b86b7f07: small update to the ADT installation steps based on new ADT UI
...
* commit 'b86b7f07d79cae32cda710aa9cc328e7af2c8ccc':
small update to the ADT installation steps based on new ADT UI
2012-09-17 11:23:20 -07:00
Katie McCormick
ad4bbdf22c
am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
...
* commit '844d2a942ebde7eb1d5abd68505c7a2eb7e2db0a':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-17 11:21:51 -07:00
Scott Main
ada4f081c6
am 61d85c43: add link to device dock lesson
...
* commit '61d85c43474da17296b90b3d7fd0f4bd34cdebe8':
add link to device dock lesson
2012-09-17 11:21:48 -07:00
Chet Haase
603f6de35f
Fix occasional crash bug with layers
...
Launcher occasionally crashes with a stack trace indicating that the memory
of a Layer object is corrupt. It is possible for us to delete a Layer
structure and then, briefly, use it to draw a DisplayList again before
that DisplayList gets recreated (without the layer that got deleted).
When this happens, if the memory got corrupted, it's possible to crash.
The fix is to add Layer to the other objects which we currently refcount
(bitmaps, shaders, etc.). Then instead of deleting a Layer, we decrement the
refcount. We increment when creating it, then increment it again when it's
referenced from a DisplayList. Then we decrement the refcount instead of
deleting it, and decrement when we clear a DisplayList that refers to it.
Then when the refcount reaches 0, we delete it.
Issue #6994632 Native crash in launcher when trying to launch all apps screen
Change-Id: I0627be8d49bb2f9ba8d158a84b764bb4e7df934c
2012-09-17 11:21:34 -07:00
Dirk Dougherty
2dec992884
am 24a024ec: Doc change: fix typo in JB highlights.
...
* commit '24a024ecaf949601b998a4b0ed3b4d7af6bcd8ba':
Doc change: fix typo in JB highlights.
2012-09-17 11:20:19 -07:00
Scott Main
a1981bc1ab
am d5abc558: docs: update for multi apk doc for ABI support
...
* commit 'd5abc5586e08bedf06f337aefa5a59c014fb7a2e':
docs: update for multi apk doc for ABI support
2012-09-17 11:20:16 -07:00
Katie McCormick
917d45e3d1
am 73ec048e: Doc update: Appwidgets JB additions.
...
* commit '73ec048e4de50419d2d49907be0acae0893f92ca':
Doc update: Appwidgets JB additions.
2012-09-17 11:20:12 -07:00
Scott Main
8a80ac4690
am 54efa69f: older not lower
...
* commit '54efa69f5074568f23eb5ff7f15022eece11918c':
older not lower
2012-09-17 11:20:09 -07:00
Joe Fernandez
b9b05dfcc1
am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition
...
* commit '8982939d17881c7dcd20459955f3bfcec6e05905':
docs: Accessibility DevGuide, Jelly Bean edition
2012-09-17 11:20:06 -07:00
Scott Main
0cc7398ab9
am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
...
* commit 'd46023d2081c995b2ec61b48b79f2077dfdb36a2':
dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
2012-09-17 11:20:05 -07:00
Elliott Hughes
34de3bc309
Fix date formatting for fa locales.
...
This adds support for standalone months (L versus M) and localized
digits.
Bug: 6811327
Change-Id: I4687a4c67605c31b155c0b8d44b3da6ed378fc82
2012-09-17 11:17:10 -07:00
Irfan Sheriff
9da51f8053
am cc5dd18d: Merge "Change order of ps and suspendmode calls" into jb-mr1-dev
...
* commit 'cc5dd18d15a174799ad79d26633c268e8860c8ab':
Change order of ps and suspendmode calls
2012-09-17 11:14:44 -07:00
Irfan Sheriff
cc5dd18d15
Merge "Change order of ps and suspendmode calls" into jb-mr1-dev
2012-09-17 11:12:22 -07:00
Katie McCormick
2141c06849
am 243170f7: Doc update: Fix typo.
...
* commit '243170f759252c99052a903bd0cb33e4d8227aa0':
Doc update: Fix typo.
2012-09-17 11:09:16 -07:00
Irfan Sheriff
9da603c2da
Change order of ps and suspendmode calls
...
Change-Id: I7872dbea7dc30c57960af95e86eb8e4c7f8e92dc
2012-09-17 11:07:00 -07:00
Xavier Ducrohet
31820a35b2
Merge "Add --output-text-symbols option to aapt."
2012-09-17 10:59:22 -07:00
Scott Main
b86b7f07d7
small update to the ADT installation steps based on new ADT UI
2012-09-17 10:58:28 -07:00
Xavier Ducrohet
d72525718e
Merge "Add --error-on-failed-insert option to aapt."
2012-09-17 10:57:58 -07:00
Katie McCormick
844d2a942e
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-17 10:57:22 -07:00
Scott Main
61d85c4347
add link to device dock lesson
2012-09-17 10:56:49 -07:00
Dirk Dougherty
24a024ecaf
Doc change: fix typo in JB highlights.
2012-09-17 10:55:27 -07:00
Scott Main
d5abc5586e
docs: update for multi apk doc for ABI support
2012-09-17 10:54:55 -07:00
Katie McCormick
73ec048e4d
Doc update: Appwidgets JB additions.
2012-09-17 10:54:17 -07:00
Scott Main
54efa69f50
older not lower
2012-09-17 10:53:32 -07:00
Joe Fernandez
8982939d17
docs: Accessibility DevGuide, Jelly Bean edition
2012-09-17 10:50:42 -07:00
Scott Main
d46023d208
dashboard update for 9/4
...
switch to simplified pie charts: codenames for platforms and separate size and density charts
2012-09-17 10:50:03 -07:00
Katie McCormick
243170f759
Doc update: Fix typo.
2012-09-17 10:48:39 -07:00
Baligh Uddin
09a822d8f4
am c71a57d6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c71a57d6fa45edf67e79e948b4656fa25a11f1b8':
Import translations. DO NOT MERGE
2012-09-17 10:08:24 -07:00