Eric Laurent
b6397c7170
Update headphone volume safety warning message.
...
Change-Id: Ic2d5d9d247b76b6ede0f90b861c235c1c0f5dc08
2012-09-17 16:59:19 -07:00
Geremy Condra
c31f5a7efe
Merge "Add error information to event logs." into jb-mr1-dev
2012-09-17 16:07:46 -07:00
Geremy Condra
beb9d53971
Add error information to event logs.
...
Change-Id: Ie4bbb888f4fac4db42a60b9fdd6818af24b834bd
2012-09-17 16:06:17 -07:00
Philip Milne
417e267a75
Merge "Revert "Simple MVC based binding mechanism for android controls." Do not merge." into jb-mr1-dev
2012-09-17 15:47:11 -07:00
Kenny Root
4215017c12
Merge "Use shared app gid for dalvik cache" into jb-mr1-dev
2012-09-17 15:29:38 -07:00
Victoria Lease
d6991106b0
Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev
2012-09-17 15:08:07 -07:00
Winson Chung
f9c6a10d3f
Merge "Making QS scrollable and making numerous tweaks." into jb-mr1-dev
2012-09-17 14:59:45 -07:00
Winson Chung
5f623011db
Making QS scrollable and making numerous tweaks.
...
- Updating new assets (all line up)
- Updating brightness tile to reflect auto state
- Fixing network tile asset colors
- Adding press feedback
Change-Id: I857f141258eefec65243454cb69905cbd2a10bf6
2012-09-17 14:59:39 -07:00
Amith Yamasani
1d31d5ba12
Merge "Start userId from 10, reserving 1-9 for special use in the future." into jb-mr1-dev
2012-09-17 14:56:03 -07:00
Amith Yamasani
07a0ede729
Start userId from 10, reserving 1-9 for special use in the future.
...
Change-Id: I3d0c1717d8b3add75ba43ed98e53ba02e6682c34
2012-09-17 14:54:26 -07:00
Elliott Hughes
7134ef60b7
Merge "Fix date formatting for fa locales." into jb-mr1-dev
2012-09-17 14:45:42 -07:00
Philip Milne
8e1c2b6b71
Revert "Simple MVC based binding mechanism for android controls." Do not merge.
...
This reverts commit 989709a973448980f36dacd587b0a58f89ffa11e.
Change-Id: Ifc2c511b0d99d4a3a164b4a2281ca140015b366d
2012-09-17 14:31:03 -07:00
Adam Cohen
e2f0ec8923
Merge "Enabling hardware layers while overscrolling widget pager" into jb-mr1-dev
2012-09-17 14:12:06 -07:00
Adam Cohen
5b50a25e6d
Enabling hardware layers while overscrolling widget pager
...
Change-Id: I94bef1aa614f91b115105adbb409def8027f3651
2012-09-17 14:11:14 -07:00
Kenny Root
6a9b2cb7fe
Use shared app gid for dalvik cache
...
For forward-locked apps, we need to be able to read the optimized dex
file from a common place. Make it owned by the shared app GID as well.
Bug: 7178231
Change-Id: Ib36d79e8df69d58e8e1e0f167659df995dc84b84
2012-09-17 14:02:39 -07:00
Adam Powell
e01538f28b
Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev
2012-09-17 13:54:31 -07:00
Jeff Brown
e2fb51900c
Merge "Swap remote submix initialization order." into jb-mr1-dev
2012-09-17 13:32:41 -07:00
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
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
9f5f80e7a6
Merge "Fix modulation and gamma correction issues" into jb-mr1-dev
2012-09-17 12:51:08 -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
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
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
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
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
cc5dd18d15
Merge "Change order of ps and suspendmode calls" into jb-mr1-dev
2012-09-17 11:12:22 -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
Xavier Ducrohet
d72525718e
Merge "Add --error-on-failed-insert option to aapt."
2012-09-17 10:57:58 -07:00
Baligh Uddin
c71a57d6fa
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-17 10:06:21 -07:00
Baligh Uddin
5dbeb6a8ff
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-17 08:55:59 -07:00
Siva Velusamy
9d7657c5b5
Merge "PhoneStatusBar: Fix NPE while accessing quick settings." into jb-mr1-dev
2012-09-17 08:42:05 -07:00
Eino-Ville Talvala
b181909eef
Merge "Camera: Document face detection confidence recommendations." into jb-mr1-dev
2012-09-17 08:37:44 -07:00
Eric Laurent
39a37c3bb3
Merge "headphone volume limitation" into jb-mr1-dev
2012-09-17 08:16:01 -07:00
Irfan Sheriff
89c82814db
Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev
2012-09-16 18:53:25 -07:00
Dianne Hackborn
8406d05b0f
Merge "New uninstall option to uninstall for all users." into jb-mr1-dev
2012-09-16 18:29:58 -07:00
Dianne Hackborn
6d235d8265
New uninstall option to uninstall for all users.
...
Change-Id: Ie8eb59564078069633a89fc8a92d4f8531baa1aa
2012-09-16 18:25:40 -07:00
Dianne Hackborn
443e474881
Merge "Fix issue #7175553 : GRANT_URI_PERMISSION doesn't apper to work on secondary user" into jb-mr1-dev
2012-09-16 18:07:14 -07:00
Irfan Sheriff
3d33a63391
Add restoreCallingIdentity under finally
...
Change-Id: I068b1a2fc93300aa9bd17da6933bc8c5f0a6b5e4
2012-09-16 17:59:13 -07:00
Eric Laurent
c34dcc1e1e
headphone volume limitation
...
Limit music volume when headphones or headset are inserted.
Display warning message when user wants to increase the volume
above a platform specific volume and request user acknowledgement
before proceeding.
TODO: exact wording of the warning message must be defined by UX.
Change-Id: I00f429f602534c6d8783126b929371c4d432e6e2
2012-09-16 17:44:45 -07:00
Irfan Sheriff
db831da426
Fix permission accessing getCurrentUser
...
Bug: 7174737
Change-Id: I0a6a9a46f4115743d16ada401cd67e3cf30fb380
2012-09-16 17:40:59 -07:00