Ben Murdoch
db8f3939dd
am 37f4acde: (-s ours) am dba86e2d: Merge "Get a WebViewDatabaseClassic instance lazily. Do not merge." into jb-dev
...
* commit '37f4acde8917ba40fb620915073e1f4823e7b012':
Get a WebViewDatabaseClassic instance lazily. Do not merge.
2012-06-02 08:40:32 -07:00
Jim Miller
988edcd423
am a8c42f1a: am 94a8ae09: Merge "Fix 6592932: add means to replace assist icon from given package" into jb-dev
...
* commit 'a8c42f1aaa184ed9b30c747ca03b5d7159a3fb20':
Fix 6592932: add means to replace assist icon from given package
2012-06-02 08:40:28 -07:00
Adrian Ludwig
74981738ad
am 6169ee6d: am 2aeaf234: Merge changes Id27ba241,I781fbe36 into jb-dev
...
* commit '6169ee6dcedbac870aa4df92e6c4369614331ce6':
For JB, the READ_EXTERNAL_STORAGE permission is not enforced by default. It may be enforced by default in future releases. Developers have the option of enabling enforcement to test their application and some may begin to include this permission on applications. To avoid user confusion, the permission is placed in the development tools group.
Update long strings to provide users with more information about permissions.
2012-06-02 08:40:24 -07:00
Ruei-sung Lin
4a01bce39a
am 0b5f8ac1: am 56f6c7ff: Merge "Fix b/6575950 make shader program to support different precisions." into jb-dev
...
* commit '0b5f8ac125d4e16071df8a47083edc8fa7a1f63b':
Fix b/6575950 make shader program to support different precisions.
2012-06-02 08:40:20 -07:00
Svetoslav Ganov
665ef836b5
am 40404f43: am cba5e879: Merge "Calling the correct method when adding accessibility focusables." into jb-dev
...
* commit '40404f435c17dfbbedfdf358c48f0f91df91b84f':
Calling the correct method when adding accessibility focusables.
2012-06-02 08:40:16 -07:00
Adrian Ludwig
747cc36f22
am 0ec61ff5: am 6d4d35e3: Merge "Revert "Update long strings to provide users with more information about permissions."" into jb-dev
...
* commit '0ec61ff561010ef9b4512deffbf66598766172de':
Revert "Update long strings to provide users with more information about permissions."
2012-06-02 08:40:12 -07:00
Adrian Ludwig
11e128ce22
am 2c670142: am c16a199e: Merge "Update long strings to provide users with more information about permissions." into jb-dev
...
* commit '2c6701422e2e35d166195d2135462740bc75a255':
Update long strings to provide users with more information about permissions.
2012-06-02 08:40:09 -07:00
Ben Murdoch
37f4acde89
am dba86e2d: Merge "Get a WebViewDatabaseClassic instance lazily. Do not merge." into jb-dev
...
* commit 'dba86e2dc1e89760670817f16da1d1db04ca85f7':
Get a WebViewDatabaseClassic instance lazily. Do not merge.
2012-06-02 08:35:36 -07:00
Jim Miller
a8c42f1aaa
am 94a8ae09: Merge "Fix 6592932: add means to replace assist icon from given package" into jb-dev
...
* commit '94a8ae09bea03ec2ca5563601e28a196d41bb6b6':
Fix 6592932: add means to replace assist icon from given package
2012-06-02 08:35:33 -07:00
Adrian Ludwig
6169ee6dce
am 2aeaf234: Merge changes Id27ba241,I781fbe36 into jb-dev
...
* commit '2aeaf2345ea0b72322ee301cb4412fa737b594bc':
For JB, the READ_EXTERNAL_STORAGE permission is not enforced by default. It may be enforced by default in future releases. Developers have the option of enabling enforcement to test their application and some may begin to include this permission on applications. To avoid user confusion, the permission is placed in the development tools group.
Update long strings to provide users with more information about permissions.
2012-06-02 08:35:30 -07:00
Ruei-sung Lin
0b5f8ac125
am 56f6c7ff: Merge "Fix b/6575950 make shader program to support different precisions." into jb-dev
...
* commit '56f6c7ff0989ec45ca8639899208054b6c21d979':
Fix b/6575950 make shader program to support different precisions.
2012-06-02 08:35:27 -07:00
Svetoslav Ganov
40404f435c
am cba5e879: Merge "Calling the correct method when adding accessibility focusables." into jb-dev
...
* commit 'cba5e879e825fe37bc1eb092c14f3a5c4d7a29d1':
Calling the correct method when adding accessibility focusables.
2012-06-02 08:35:24 -07:00
Adrian Ludwig
0ec61ff561
am 6d4d35e3: Merge "Revert "Update long strings to provide users with more information about permissions."" into jb-dev
...
* commit '6d4d35e382b9efb3debce6f0303dacd33e5131bb':
Revert "Update long strings to provide users with more information about permissions."
2012-06-02 08:34:46 -07:00
Adrian Ludwig
2c6701422e
am c16a199e: Merge "Update long strings to provide users with more information about permissions." into jb-dev
...
* commit 'c16a199eacd21cfd1dd71a209379018769803191':
Update long strings to provide users with more information about permissions.
2012-06-02 08:34:42 -07:00
Adrian Ludwig
8100eaa59d
am d966c19c: am 4bc97b54: Fix build.
...
* commit 'd966c19c090d696363daac73c3cb092340f7c8c9':
Fix build.
2012-06-02 08:21:12 -07:00
Chet Haase
479255ee8a
am 5d666b94: am faa3233e: Merge "Skip LayoutTransition animations on objects of size (0,0)" into jb-dev
...
* commit '5d666b9494b38bc02ea0289e1ba9613ca6e67ef6':
Skip LayoutTransition animations on objects of size (0,0)
2012-06-02 08:21:06 -07:00
Adam Powell
275b010326
am cb5ca957: am 1de19907: Merge "Update indeterminate progress bar assets" into jb-dev
...
* commit 'cb5ca957a2bc18ff6024bd006348ab5fb076ac2a':
Update indeterminate progress bar assets
2012-06-02 08:21:02 -07:00
Adrian Ludwig
955a7501ae
am abd9ff02: am d070e3da: Merge "Revert "Make the protectionLevel of framework permissions consistent and related to sensitive user data. Dangerous permissions are applied only where sensitive user data may be exposed."" into jb-dev
...
* commit 'abd9ff02f7d8f7029688d6cc1cd18086a8ee0da0':
Revert "Make the protectionLevel of framework permissions consistent and related to sensitive user data. Dangerous permissions are applied only where sensitive user data may be exposed."
2012-06-02 08:20:58 -07:00
Justin Ho
1024846ea5
am 7cca871d: am 5caa24fd: Merge "Temporarily disable FakeOemFeatures from userdebug or higher builds" into jb-dev
...
* commit '7cca871de1f9ed649d671f327e4bb3d30ba11cca':
Temporarily disable FakeOemFeatures from userdebug or higher builds
2012-06-02 08:20:54 -07:00
Daniel Sandler
0d3619860b
am 90c31f8b: am 01827ce9: Merge "Be more discriminating when canceling notifications on changing packages." into jb-dev
...
* commit '90c31f8b769b3e2f24441754c403cc07ca9e936d':
Be more discriminating when canceling notifications on changing packages.
2012-06-02 08:20:49 -07:00
Daniel Sandler
a54f056bfe
am 1f199f1d: am 0a19dba5: Merge "Present a one-time chooser when sharing screenshots." into jb-dev
...
* commit '1f199f1d04e6ab8929a9cdcf8d5fc5583e735879':
Present a one-time chooser when sharing screenshots.
2012-06-02 08:20:45 -07:00
Svetoslav Ganov
97018140fe
am b6001195: am 6acca244: Merge "Cannot double tap and hold outside of the input focused window." into jb-dev
...
* commit 'b6001195f38725cf151933a69633ac404949881d':
Cannot double tap and hold outside of the input focused window.
2012-06-02 08:20:41 -07:00
Dianne Hackborn
cbc5e0aae4
am 3522225d: am ea01e4a2: Merge "Survey says: NIET!" into jb-dev
...
* commit '3522225dba19e77defaf56f0e70c0382c2cbb0a2':
Survey says: NIET!
2012-06-02 08:20:36 -07:00
Irfan Sheriff
b1ebee8ac7
am 7742b91c: am 1b3dcd3b: Merge "Fix NPE while creating autonomous GO" into jb-dev
...
* commit '7742b91c7e05c85801a03c36fb2f799703e82b9b':
Fix NPE while creating autonomous GO
2012-06-02 08:20:32 -07:00
Raph Levien
50f4dca8ca
am dcf1251c: am 79f7381f: Merge "Fix bug 6596440: NPE when pulling down notification window" into jb-dev
...
* commit 'dcf1251c92eb1920c4f955c893f9fa36a7ae67fb':
Fix bug 6596440: NPE when pulling down notification window
2012-06-02 08:20:28 -07:00
Jeff Brown
271bc78a2c
am 8363fb73: am 40ba4dad: Merge "Add a thread to handle the radio shutdown." into jb-dev
...
* commit '8363fb73b568d506645602c6489ce955cddde10d':
Add a thread to handle the radio shutdown.
2012-06-02 08:20:24 -07:00
Jean-Baptiste Queru
c96132ff53
Revert "Clean up layout direction APIs for Drawable"
...
This reverts commit c1da65187a4b9de8f72bd617ef937030187c0a92.
2012-06-02 05:46:20 -07:00
Ben Murdoch
dba86e2dc1
Merge "Get a WebViewDatabaseClassic instance lazily. Do not merge." into jb-dev
2012-06-02 03:25:04 -07:00
Jim Miller
94a8ae09be
Merge "Fix 6592932: add means to replace assist icon from given package" into jb-dev
2012-06-01 20:34:43 -07:00
Adrian Ludwig
2aeaf2345e
Merge changes Id27ba241,I781fbe36 into jb-dev
...
* changes:
For JB, the READ_EXTERNAL_STORAGE permission is not enforced by default. It may be enforced by default in future releases. Developers have the option of enabling enforcement to test their application and some may begin to include this permission on applications. To avoid user confusion, the permission is placed in the development tools group.
Update long strings to provide users with more information about permissions.
2012-06-01 20:08:12 -07:00
Adrian Ludwig
361dfebc94
For JB, the READ_EXTERNAL_STORAGE permission is not enforced by default. It may be enforced by default in future releases. Developers have the option of enabling enforcement to test their application and some may begin to include this permission on applications. To avoid user confusion, the permission is placed in the development tools group.
...
Change-Id: Id27ba241db0253eac774401aaaa6e5c4340588d7
2012-06-01 19:57:57 -07:00
Ruei-sung Lin
56f6c7ff09
Merge "Fix b/6575950 make shader program to support different precisions." into jb-dev
2012-06-01 19:42:22 -07:00
Svetoslav Ganov
cba5e879e8
Merge "Calling the correct method when adding accessibility focusables." into jb-dev
2012-06-01 19:30:23 -07:00
Adrian Ludwig
8f78694fc4
Update long strings to provide users with more information about permissions.
...
Change-Id: I781fbe36f830e011c06951ff2baa910bab7f13aa
2012-06-01 19:19:54 -07:00
Adrian Ludwig
d966c19c09
am 4bc97b54: Fix build.
...
* commit '4bc97b54f4ae186afb65e1b067b9f8173e124b28':
Fix build.
2012-06-01 19:02:44 -07:00
Svetoslav Ganov
a90e4512ab
Calling the correct method when adding accessibility focusables.
...
1. Since we added explicit accessibility focusable attribute when
adding focusables views that do so should call this method. Some
views were not updated to do so.
bug:6581924
Change-Id: Id64c0b2d76e5269ebf3fbe17203e73b174bdb843
2012-06-01 19:02:42 -07:00
Chet Haase
5d666b9494
am faa3233e: Merge "Skip LayoutTransition animations on objects of size (0,0)" into jb-dev
...
* commit 'faa3233ecdf543381d2d5e3f61829a58e7f4ef49':
Skip LayoutTransition animations on objects of size (0,0)
2012-06-01 19:02:41 -07:00
Adam Powell
cb5ca957a2
am 1de19907: Merge "Update indeterminate progress bar assets" into jb-dev
...
* commit '1de199079d715a260333d5545f02f09478bc67e5':
Update indeterminate progress bar assets
2012-06-01 19:02:34 -07:00
Adrian Ludwig
abd9ff02f7
am d070e3da: Merge "Revert "Make the protectionLevel of framework permissions consistent and related to sensitive user data. Dangerous permissions are applied only where sensitive user data may be exposed."" into jb-dev
...
* commit 'd070e3daa484a2265cb9fdb57af10d31bbb2e9f4':
Revert "Make the protectionLevel of framework permissions consistent and related to sensitive user data. Dangerous permissions are applied only where sensitive user data may be exposed."
2012-06-01 19:02:14 -07:00
Justin Ho
7cca871de1
am 5caa24fd: Merge "Temporarily disable FakeOemFeatures from userdebug or higher builds" into jb-dev
...
* commit '5caa24fd3eb12edbc75f35dba831166b8ebe603f':
Temporarily disable FakeOemFeatures from userdebug or higher builds
2012-06-01 19:02:11 -07:00
Daniel Sandler
90c31f8b76
am 01827ce9: Merge "Be more discriminating when canceling notifications on changing packages." into jb-dev
...
* commit '01827ce9f2d5f4441c7f7b0211d2739824320daf':
Be more discriminating when canceling notifications on changing packages.
2012-06-01 19:01:53 -07:00
Daniel Sandler
1f199f1d04
am 0a19dba5: Merge "Present a one-time chooser when sharing screenshots." into jb-dev
...
* commit '0a19dba545d25760839399e4bc8ece6d9cc888da':
Present a one-time chooser when sharing screenshots.
2012-06-01 19:01:45 -07:00
Svetoslav Ganov
b6001195f3
am 6acca244: Merge "Cannot double tap and hold outside of the input focused window." into jb-dev
...
* commit '6acca2442572a28b7d9428e5e2fc2aa4271e29f9':
Cannot double tap and hold outside of the input focused window.
2012-06-01 19:01:40 -07:00
Dianne Hackborn
3522225dba
am ea01e4a2: Merge "Survey says: NIET!" into jb-dev
...
* commit 'ea01e4a2d5cc28093e9fd720055082b2d3f708d9':
Survey says: NIET!
2012-06-01 19:01:33 -07:00
Irfan Sheriff
7742b91c7e
am 1b3dcd3b: Merge "Fix NPE while creating autonomous GO" into jb-dev
...
* commit '1b3dcd3bda605d766da64b48b22bb96a875e728a':
Fix NPE while creating autonomous GO
2012-06-01 19:01:28 -07:00
Raph Levien
dcf1251c92
am 79f7381f: Merge "Fix bug 6596440: NPE when pulling down notification window" into jb-dev
...
* commit '79f7381f8b4e9a462d012740c2a902ae3de8a6b0':
Fix bug 6596440: NPE when pulling down notification window
2012-06-01 19:01:03 -07:00
Jeff Brown
8363fb73b5
am 40ba4dad: Merge "Add a thread to handle the radio shutdown." into jb-dev
...
* commit '40ba4dad4c56b8a7fbae4a93a6e5385993301ad4':
Add a thread to handle the radio shutdown.
2012-06-01 19:00:49 -07:00
Adam Powell
9a1de308ce
Add MediaRouter API.
...
This is just the initial state tracking. Still to go is
actually triggering Bluetooth A2DP correctly and tracking
process state in the system server.
Change-Id: I33031d52799d6e2d7208910da833831085cc3677
2012-06-01 18:19:20 -07:00
Adrian Ludwig
6d4d35e382
Merge "Revert "Update long strings to provide users with more information about permissions."" into jb-dev
2012-06-01 17:38:03 -07:00
Adrian Ludwig
1869440378
Revert "Update long strings to provide users with more information about permissions."
...
This reverts commit 714665c7a3bc4b4702e031448864d3d341f1f098
2012-06-01 17:33:38 -07:00