Jeff Brown
a3164eaad4
am eaf36658: am 709b9434: am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
...
* commit 'eaf366586179554b624aff6e586f1a7b17b8dd4d':
Add new Display API for secure video capabilities.
2012-10-02 16:45:58 -07:00
Craig Mautner
d146fbc1ef
am a7c44f1a: am 65e7f05c: am 9c614bfe: Merge "Send masked soft input mode into method." into jb-mr1-dev
...
* commit 'a7c44f1a71e1c8541eacbcd07db24f12510fb18f':
Send masked soft input mode into method.
2012-10-02 16:44:08 -07:00
Svetoslav Ganov
6c0b04b037
am a790a83c: am c458f323: am 9bfb8bcf: Merge "Up motion event not injected by the touch explorer at the end of a drag." into jb-mr1-dev
...
* commit 'a790a83c134c91a828a32059b429142bff1b1de5':
Up motion event not injected by the touch explorer at the end of a drag.
2012-10-02 16:44:03 -07:00
Jeff Brown
eaf3665861
am 709b9434: am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
...
* commit '709b943475e3395b580451911557f894480e3133':
Add new Display API for secure video capabilities.
2012-10-02 16:44:02 -07:00
Fabrice Di Meglio
c6af4fe1f7
am 12ff4138: am 2e4f54de: am 046184f9: Merge "Fix bug #7266459 android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO" into jb-mr1-dev
...
* commit '12ff4138d53297a0b8ed31bd72035ee5a69df667':
Fix bug #7266459 android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO
2012-10-02 16:44:00 -07:00
Craig Mautner
a7c44f1a71
am 65e7f05c: am 9c614bfe: Merge "Send masked soft input mode into method." into jb-mr1-dev
...
* commit '65e7f05c9ba527ccdf6114a562e07baf2abc6619':
Send masked soft input mode into method.
2012-10-02 16:42:01 -07:00
Svetoslav Ganov
a790a83c13
am c458f323: am 9bfb8bcf: Merge "Up motion event not injected by the touch explorer at the end of a drag." into jb-mr1-dev
...
* commit 'c458f3235cfceb87093d3e5408b38ff982e3e060':
Up motion event not injected by the touch explorer at the end of a drag.
2012-10-02 16:41:58 -07:00
Fabrice Di Meglio
12ff4138d5
am 2e4f54de: am 046184f9: Merge "Fix bug #7266459 android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO" into jb-mr1-dev
...
* commit '2e4f54de5e9c9cdaf90f3c6c93905dc3bf4dec10':
Fix bug #7266459 android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO
2012-10-02 16:41:53 -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
Dianne Hackborn
ea5544e258
am 6563801d: am de19ad9d: am 5bc54bf3: Merge "Fix issue #7272775 : Auto Start Apps Not Starting" into jb-mr1-dev
...
* commit '6563801d7eeb502b7bf379d471731b32e6c32819':
Fix issue #7272775 : Auto Start Apps Not Starting
2012-10-02 16:32:11 -07:00
rich cannings
4c7b7779ee
am f4bc7f6e: am 5692524b: am 3ed62ada: Merge "Fix package verification with multi-user" into jb-mr1-dev
...
* commit 'f4bc7f6e0ab951828bc8bab43ff98e3484992b01':
Fix package verification with multi-user
2012-10-02 16:32:08 -07:00
Jim Miller
3dd5f12022
am 8c434337: am 90f7f565: am 970a494c: Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev
...
* commit '8c4343378cd6b46411ab4d65b6c7f2f0f5e9854c':
Attempt to fix missing transport control in keyguard
2012-10-02 16:32:04 -07:00
Dianne Hackborn
6563801d7e
am de19ad9d: am 5bc54bf3: Merge "Fix issue #7272775 : Auto Start Apps Not Starting" into jb-mr1-dev
...
* commit 'de19ad9df49a04aa4de8759fea853587537db2c4':
Fix issue #7272775 : Auto Start Apps Not Starting
2012-10-02 16:30:40 -07:00
rich cannings
f4bc7f6e0a
am 5692524b: am 3ed62ada: Merge "Fix package verification with multi-user" into jb-mr1-dev
...
* commit '5692524bf5530bfb1efb5bad90a1713190aa1208':
Fix package verification with multi-user
2012-10-02 16:30:37 -07:00
Jim Miller
8c4343378c
am 90f7f565: am 970a494c: Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev
...
* commit '90f7f5657a67dc7a5caee42f44bcdd6d9b3da5b2':
Attempt to fix missing transport control in keyguard
2012-10-02 16:30:34 -07:00
Scott Main
db51d542a1
am 370bdbc3: (-s ours) am f4d90687: 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 '370bdbc3d9dd580beac4789f36d32695bd09ed11':
DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
2012-10-02 16:30:19 -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
370bdbc3d9
am f4d90687: 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 'f4d906875e41ce5d862e015416dcafbab5c52437':
DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
2012-10-02 16:27:48 -07:00
Craig Mautner
ba14f94a5c
am 2ab087fa: am dde0123e: am 60ce6d45: Merge "Call Surface.destroy when Display is removed." into jb-mr1-dev
...
* commit '2ab087fab30d83461cbf7a8189d81d6fa10d409d':
Call Surface.destroy when Display is removed.
2012-10-02 16:27:03 -07:00
Romain Guy
aba58b519f
am f265ac2e: am 27fa88dd: am 0e3984b7: Merge "Bring back Netflix progress bar Bug #7274157 " into jb-mr1-dev
...
* commit 'f265ac2e26811561a786a4710ec8d992c05563b5':
Bring back Netflix progress bar Bug #7274157
2012-10-02 16:26:59 -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
Craig Mautner
2ab087fab3
am dde0123e: am 60ce6d45: Merge "Call Surface.destroy when Display is removed." into jb-mr1-dev
...
* commit 'dde0123e6f30251cc3592c8fa4f711ff8052be09':
Call Surface.destroy when Display is removed.
2012-10-02 16:25:01 -07:00
Romain Guy
f265ac2e26
am 27fa88dd: am 0e3984b7: Merge "Bring back Netflix progress bar Bug #7274157 " into jb-mr1-dev
...
* commit '27fa88ddf2d8633a2715be17c70a50aba68370c3':
Bring back Netflix progress bar Bug #7274157
2012-10-02 16:24:57 -07:00
Fabrice Di Meglio
7c8b0e3532
am 9b3858be: am 88bb40b2: am 4253abbc: Merge "Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1" into jb-mr1-dev
...
* commit '9b3858be43cb08131af2c9e12d8db4bc0837ce4d':
Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1
2012-10-02 16:23:59 -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
Fabrice Di Meglio
9b3858be43
am 88bb40b2: am 4253abbc: Merge "Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1" into jb-mr1-dev
...
* commit '88bb40b2cb7c330c43a9b5b4f424ee567918152a':
Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1
2012-10-02 16:22:02 -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
Robert Greenwalt
6e51bb51e6
am 8bf6cbb9: am 94195fa6: am 98ec5660: Merge "Re-add default sms_short_codes." into jb-mr1-dev
...
* commit '8bf6cbb958f880168af9dd34644f8c9864190613':
Re-add default sms_short_codes.
2012-10-02 15:58:06 -07:00