Dianne Hackborn
8a22c07a8c
am 720d14db: Merge "Fix issue #7273573 : Need API to find out if activity is destroyed" into jb-mr1-dev
...
* commit '720d14db87a5683ef2d4ad976fd8c28a5d2af611':
Fix issue #7273573 : Need API to find out if activity is destroyed
2012-10-02 19:01:32 -07:00
Dianne Hackborn
720d14db87
Merge "Fix issue #7273573 : Need API to find out if activity is destroyed" into jb-mr1-dev
2012-10-02 18:58:31 -07:00
Eric Laurent
d3b463171f
am 06fcebc6: Merge "audio service: fix system volume settings" into jb-mr1-dev
...
* commit '06fcebc62cafd4d9d3324ccfbf97ab10742af4e1':
audio service: fix system volume settings
2012-10-02 18:21:46 -07:00
Eric Laurent
06fcebc62c
Merge "audio service: fix system volume settings" into jb-mr1-dev
2012-10-02 18:18:48 -07:00
Jeff Sharkey
fbbcffebc0
am 1ed299f8: Merge "Make USB services multi-user aware." into jb-mr1-dev
...
* commit '1ed299f822b22998b7236e3147d8cf4707bced08':
Make USB services multi-user aware.
2012-10-02 18:15:51 -07:00
Jeff Sharkey
1ed299f822
Merge "Make USB services multi-user aware." into jb-mr1-dev
2012-10-02 18:11:48 -07:00
Jeff Sharkey
fc3f24b4b6
Make USB services multi-user aware.
...
USB settings are now isolated per-user, since they revolve around
installed packages. User-specific settings are returned based on
calling user, or referenced by UserHandle passed to SystemUI. Each
settings Context is wrapped as a specific user, so all broadcasts are
sent correctly. Upgrades any existing USB settings to OWNER.
Physical events, like new devices, are routed to the currently active
user. Switch to using AtomicFile when persisting settings.
Bug: 7244888
Change-Id: I8a723ad3d55ac1bff99276c5f3a3f5e8f013432f
2012-10-02 18:09:10 -07:00
Dianne Hackborn
6d9dcbccec
Fix issue #7273573 : Need API to find out if activity is destroyed
...
Also update 17.txt with all of the recent API additions.
Change-Id: I21fc669267935261a741c19e22b0bf35c3a76b81
2012-10-02 17:51:13 -07:00
Jeff Brown
18be68f707
am 031e9d2e: Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev
...
* commit '031e9d2e21797fd668404be407dcc625f3b149c1':
Fix bug removing all windows that belong to a display.
Add some missing debug output.
2012-10-02 17:12:09 -07:00
Jeff Brown
031e9d2e21
Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev
...
* changes:
Fix bug removing all windows that belong to a display.
Add some missing debug output.
2012-10-02 17:08:07 -07:00
Svetoslav Ganov
d18a31c6c1
am 5cf72e11: Merge "Accessibility support for the widgets switcher of the lock screen." into jb-mr1-dev
...
* commit '5cf72e11b6ec38c09e810611ec57bff9ff40ce9d':
Accessibility support for the widgets switcher of the lock screen.
2012-10-02 17:02:56 -07:00
Irfan Sheriff
5ffd5652b6
am 75c48009: Merge "Add icon for mobile notification" into jb-mr1-dev
...
* commit '75c480091552b05db6c447330f36ca436a4d0fb6':
Add icon for mobile notification
2012-10-02 17:00:55 -07:00
Svetoslav Ganov
5cf72e11b6
Merge "Accessibility support for the widgets switcher of the lock screen." into jb-mr1-dev
2012-10-02 17:00:21 -07:00
Irfan Sheriff
75c4800915
Merge "Add icon for mobile notification" into jb-mr1-dev
2012-10-02 16:58:15 -07:00
Svetoslav Ganov
6526fdd749
Accessibility support for the widgets switcher of the lock screen.
...
bug:7232727
bug:7229598
Change-Id: Ib76b81b170bed0c4ef10f5141bf70f779ffa1ac4
2012-10-02 16:58:04 -07:00
Irfan Sheriff
ebb8f413e6
Add icon for mobile notification
...
Bug: 7087564
Change-Id: If856bdfa28c024fb775fd3f8231bd5a16fef59e6
2012-10-02 16:50:29 -07:00
Jeff Brown
709b943475
am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
...
* commit 'bcbe9cf475835102ae2490dc9f067a3ac78a9551':
Add new Display API for secure video capabilities.
2012-10-02 16:41:30 -07:00
Craig Mautner
65e7f05c9b
am 9c614bfe: Merge "Send masked soft input mode into method." into jb-mr1-dev
...
* commit '9c614bfe17e4e335d13ff5885a00fe8c3085fea1':
Send masked soft input mode into method.
2012-10-02 16:39:13 -07:00
Jeff Brown
bcbe9cf475
Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
2012-10-02 16:39:08 -07:00
Svetoslav Ganov
c458f3235c
am 9bfb8bcf: Merge "Up motion event not injected by the touch explorer at the end of a drag." into jb-mr1-dev
...
* commit '9bfb8bcfeb585c1692830ff91a36afa852455cf7':
Up motion event not injected by the touch explorer at the end of a drag.
2012-10-02 16:39:06 -07:00
Fabrice Di Meglio
2e4f54de5e
am 046184f9: Merge "Fix bug #7266459 android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO" into jb-mr1-dev
...
* commit '046184f97aa71bd36a11b9d2cd27dafe2d29d246':
Fix bug #7266459 android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO
2012-10-02 16:38:59 -07:00
Craig Mautner
9c614bfe17
Merge "Send masked soft input mode into method." into jb-mr1-dev
2012-10-02 16:36:29 -07:00
Svetoslav Ganov
9bfb8bcfeb
Merge "Up motion event not injected by the touch explorer at the end of a drag." into jb-mr1-dev
2012-10-02 16:36:29 -07:00
Fabrice Di Meglio
046184f97a
Merge "Fix bug #7266459 android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO" into jb-mr1-dev
2012-10-02 16:36:29 -07:00
Jeff Brown
cb882f90e4
Fix bug removing all windows that belong to a display.
...
Removing one window causes its subwindows to also be removed.
We have to be careful when traversing the window list
because multiple windows may be removed at a time so we
don't get IndexOutOfBoundsException due to the window
list changing in unexpected ways.
Bug: 7273702
Change-Id: I0ed9ba00c325ad178ab28919ce2e763cb6fd38ba
2012-10-02 16:35:35 -07:00
Dianne Hackborn
de19ad9df4
am 5bc54bf3: Merge "Fix issue #7272775 : Auto Start Apps Not Starting" into jb-mr1-dev
...
* commit '5bc54bf354f6e674a129b2e286b4bd3eefe91c2b':
Fix issue #7272775 : Auto Start Apps Not Starting
2012-10-02 16:28:35 -07:00
rich cannings
5692524bf5
am 3ed62ada: Merge "Fix package verification with multi-user" into jb-mr1-dev
...
* commit '3ed62adad14c213117c2b869e71abc2474102ad4':
Fix package verification with multi-user
2012-10-02 16:28:30 -07:00
Jim Miller
90f7f5657a
am 970a494c: Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev
...
* commit '970a494ce18ca4b05bdb7c668161dcc3efee0bbe':
Attempt to fix missing transport control in keyguard
2012-10-02 16:28:24 -07:00
Scott Main
f4d906875e
am 659d2602: am a142be8e: (-s ours) am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
...
* commit '659d2602b0fdc582556fff28f54cf895c80143f5':
DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
2012-10-02 16:25:26 -07:00
Dianne Hackborn
5bc54bf354
Merge "Fix issue #7272775 : Auto Start Apps Not Starting" into jb-mr1-dev
2012-10-02 16:25:15 -07:00
rich cannings
3ed62adad1
Merge "Fix package verification with multi-user" into jb-mr1-dev
2012-10-02 16:25:15 -07:00
Jim Miller
970a494ce1
Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev
2012-10-02 16:25:15 -07:00
Jeff Brown
77aebfdbae
Add new Display API for secure video capabilities.
...
Added a new API to determine whether the display supports
protected buffers so that an application can choose a different
content stream or change how it decodes the content so
that it will be viewable on the display.
At present, wifi display does not fully support protected
buffers although this may be enhanced in the future.
Bug: 6986623
Change-Id: If53a53d72b0ec92753cc4b29f99fcb131e00449b
2012-10-02 16:25:10 -07:00
Jeff Brown
c2726643e7
Add some missing debug output.
...
Bug: 7257579
Change-Id: Ia8c6d7fefe6d4c4e6c37f20722c7ffce4bcfcbae
2012-10-02 16:25:10 -07:00
Scott Main
659d2602b0
am a142be8e: (-s ours) am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
...
* commit 'a142be8ea9003442b486e0a0f8558361b1525c93':
DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
2012-10-02 16:23:59 -07:00
Craig Mautner
dde0123e6f
am 60ce6d45: Merge "Call Surface.destroy when Display is removed." into jb-mr1-dev
...
* commit '60ce6d4518b2443ff810b335dc686cda18921872':
Call Surface.destroy when Display is removed.
2012-10-02 16:22:35 -07:00
Romain Guy
27fa88ddf2
am 0e3984b7: Merge "Bring back Netflix progress bar Bug #7274157 " into jb-mr1-dev
...
* commit '0e3984b7876d4af6e0bfe483317ac0acf99ba47a':
Bring back Netflix progress bar Bug #7274157
2012-10-02 16:22:31 -07:00
Scott Main
a142be8ea9
am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
...
* commit '33b8f4175719b746ee290fd95478fae4643fad42':
DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
2012-10-02 16:20:50 -07:00
Craig Mautner
60ce6d4518
Merge "Call Surface.destroy when Display is removed." into jb-mr1-dev
2012-10-02 16:20:34 -07:00
Romain Guy
0e3984b787
Merge "Bring back Netflix progress bar Bug #7274157 " into jb-mr1-dev
2012-10-02 16:20:34 -07:00
Fabrice Di Meglio
88bb40b2cb
am 4253abbc: Merge "Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1" into jb-mr1-dev
...
* commit '4253abbcfa3165ad7d06c4de97cd780c4e96f94a':
Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1
2012-10-02 16:19:36 -07:00
Scott Main
33b8f41757
am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
...
* commit '11f03b4b694f506ed5dcb7c12a9984b653f93b42':
DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
2012-10-02 16:18:19 -07:00
Fabrice Di Meglio
4253abbcfa
Merge "Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1" into jb-mr1-dev
2012-10-02 16:16:39 -07:00
Scott Main
11f03b4b69
DO NOT MERGE
...
cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429
docs: android training - Data Storage
Change-Id: I62b6d5385355555aa3e184bfd4418a0d2e0c1719
2012-10-02 16:14:36 -07:00
Romain Guy
41c769d9a8
Bring back Netflix progress bar
...
Bug #7274157
Gradients and color filters are multiplied by the paint's color so it
needs to be set to opaque black to have an effect.
Change-Id: Ib5dd1e6185f758f55b57a0f4496dfae98f1a096b
2012-10-02 16:04:05 -07:00
Fabrice Di Meglio
5bb4e29aba
Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1
...
This regression has been introduced by this Change: Ia846de16bbc54f0729608259aa4b530da9404245
- in CHOICE_MODE_SINGLE you need to clear the checked states before doing anything
- rename variables for better readability too
Change-Id: I89b4390e5ebb192ca280fea2c06f991b537a2870
2012-10-02 15:53:00 -07:00
Robert Greenwalt
94195fa611
am 98ec5660: Merge "Re-add default sms_short_codes." into jb-mr1-dev
...
* commit '98ec56604dc3d150e47e1605b33a4ae40dbc7f5c':
Re-add default sms_short_codes.
2012-10-02 15:52:18 -07:00
Robert Greenwalt
98ec56604d
Merge "Re-add default sms_short_codes." into jb-mr1-dev
2012-10-02 15:49:58 -07:00
Scott Main
328dc142a2
am a22f081a: am b847f0b5: am 04c63a40: docs: android training - Data Storage
...
* commit 'a22f081ab41072b5aa8caa3d1179d2ad27a877f7':
docs: android training - Data Storage
2012-10-02 15:35:54 -07:00
Scott Main
a22f081ab4
am b847f0b5: am 04c63a40: docs: android training - Data Storage
...
* commit 'b847f0b578d861647be4908fc3a8d575ba4d726b':
docs: android training - Data Storage
2012-10-02 15:34:12 -07:00