31640 Commits

Author SHA1 Message Date
Adam Powell
dd0a64a9ba am 757b3c27: Fix ordering of product-specific strings
* commit '757b3c274ef0df765bcbc351a64367ed39e69369':
  Fix ordering of product-specific strings
2012-06-03 14:52:59 -07:00
Adam Powell
757b3c274e Fix ordering of product-specific strings
Change-Id: Ic825e13be639731380897b937d80938762fce5ce
2012-06-03 14:46:43 -07:00
Adam Powell
bdc177271a am 9b12b4ed: Fix product-specific string declaration
* commit '9b12b4edcea9a66357b0483a81b79630d83dc6d9':
  Fix product-specific string declaration
2012-06-03 14:40:30 -07:00
Adam Powell
9b12b4edce Fix product-specific string declaration
Change-Id: Ib753995ed7bf47bb6724309370c9b05d65cfd81b
2012-06-03 14:32:04 -07:00
Adam Powell
58e29c0661 am 7c86958d: Merge "Add MediaRouter API." into jb-dev
* commit '7c86958d73e7216a92bdfd84fce4440e1def7eaa':
  Add MediaRouter API.
2012-06-03 14:14:29 -07:00
Adam Powell
7c86958d73 Merge "Add MediaRouter API." into jb-dev 2012-06-03 14:11:43 -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
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
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
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
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
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
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
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
Adrian Ludwig
714665c7a3 Update long strings to provide users with more information about permissions.
Change-Id: I781fbe36f830e011c06951ff2baa910bab7f13aa

Conflicts:

	core/res/res/values/strings.xml
2012-06-01 17:20:20 -07:00
Chet Haase
faa3233ecd Merge "Skip LayoutTransition animations on objects of size (0,0)" into jb-dev 2012-06-01 15:52:28 -07:00
Adam Powell
1de199079d Merge "Update indeterminate progress bar assets" into jb-dev 2012-06-01 15:29:54 -07:00
Adam Powell
d0f8ea5ce0 Update indeterminate progress bar assets
Bug 6587381

Change-Id: I2154ab36d697d5cee098fa7134288c1b45ca1de4
2012-06-01 15:22:36 -07:00
Chet Haase
66ef1a201e Skip LayoutTransition animations on objects of size (0,0)
LayoutTransition runs changing animations on all objects that change between
now and the next layout. This works in most normal situations, but when a container
is becoming visible, or being added to its container, or other first-time situations,
then some of the views and parent hierarchy may be of size (0,0). The user really
shouldn't need to see an animation up from these nonsense values, so we just
skip running the animation on these objects and simply place the objects where they
need to go.

Issue #6597648 view should not animate up from size (0,0)

Change-Id: I2c355a68bf1ce3b41fbec01ad95c78d83562ba32
2012-06-01 15:09:07 -07:00
Adrian Ludwig
d070e3daa4 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 2012-06-01 14:54:07 -07:00
Adrian Ludwig
4c52235fbc 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."
This reverts commit a8a200278dcc232eabd4550f814439c94857c47c.

Conflicts:

	core/res/AndroidManifest.xml
	core/res/res/values/strings.xml

Change-Id: I3f76d93a6ffde031bf82c2afea315ebcdbc179e3
2012-06-01 14:22:03 -07:00
Dianne Hackborn
ea01e4a2d5 Merge "Survey says: NIET!" into jb-dev 2012-06-01 14:13:08 -07:00
Jim Miller
3294b6b09b Fix 6592932: add means to replace assist icon from given package
This provides the means to replace the assist icon shown in keyguard and the
navigation gesture for assist.  It's done by adding metadata called
"com.android.systemui.action_assist_icon" to the activity that handles
android.intent.action.ASSIST.  It should point to a StateListDrawable
in that package with the required states.  For example:

<meta-data android:name="com.android.systemui.action_assist_icon"
    android:resource="@drawable/ic_android_systemui_action_assist" />

And then something like this in drawable/ic_android_systemui_action_assist.xml :

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="true"
        android:state_active="false"
        android:state_focused="false"
        android:drawable="@drawable/ic_action_assist_normal" />
    <item android:state_enabled="true"
        android:state_active="true"
        android:state_focused="false"
        android:drawable="@drawable/ic_action_assist_activated" />
    <item android:state_enabled="true"
        android:state_active="false"
        android:state_focused="true"
        android:drawable="@drawable/ic_action_assist_focused" />
</selector>

Change-Id: Ibc29360e179fed68253ff06a07b1bb2b982d0dab
2012-06-01 14:08:28 -07:00
Dianne Hackborn
4034bc431d Survey says: NIET!
Bug: 6593206
Change-Id: I5390609a5615d6aff1793a9bc361012a0cea330b
2012-06-01 13:38:48 -07:00
Eric Fischer
513731c04e am a3489c50: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'a3489c50b6341a79aeb5d469debf6e77b7c298d9':
  Import translations. DO NOT MERGE
2012-06-01 11:22:48 -07:00
Eric Fischer
a3489c50b6 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-01 11:20:12 -07:00
Eric Fischer
e41b07431c Import translations. DO NOT MERGE
Change-Id: I52e722cf5764a415d56036183bcd79907c011dc0
2012-06-01 11:18:05 -07:00
Svetoslav Ganov
dd5543a6ff am ac483ac4: Merge "AccessibilityInteractionController crash with IndexOutOfBoundException." into jb-dev
* commit 'ac483ac41f19b9956069eebdc0275ccf90d4e01d':
  AccessibilityInteractionController crash with IndexOutOfBoundException.
2012-06-01 11:16:21 -07:00
Svetoslav Ganov
ac483ac41f Merge "AccessibilityInteractionController crash with IndexOutOfBoundException." into jb-dev 2012-06-01 11:14:12 -07:00
Svetoslav Ganov
30ac645210 AccessibilityInteractionController crash with IndexOutOfBoundException.
1. The findAccessibilityNodeInfosByTextUiThread was reusing an ArrayList
   instance also used by the logic to initialize an AccessibilityNodeInfo.
   Hence, if the find method got some view and creates the infos for them
   the method creating the info was reusing the same array list and was
   nuking its contents.

bug:6556585

Change-Id: I1d013bf7b1f715f8b4c4ba60c677233bec40647c
2012-06-01 09:10:30 -07:00
Svetoslav Ganov
48e1ace3e0 am 1c094d33: Merge "Increase string length limit to fit translation." into jb-dev
* commit '1c094d338d73dd6223f2ed97f5b4a58a7fb37c13':
  Increase string length limit to fit translation.
2012-06-01 08:54:40 -07:00
Svetoslav Ganov
570ad8c2b6 am 00ca7a88: Merge "Accessibility focus traversal of lists inconsistent." into jb-dev
* commit '00ca7a88271916f6022b2aa16acfb415fc1b5247':
  Accessibility focus traversal of lists inconsistent.
2012-06-01 08:54:38 -07:00
Svetoslav Ganov
1c094d338d Merge "Increase string length limit to fit translation." into jb-dev 2012-06-01 08:53:00 -07:00
Svetoslav Ganov
00ca7a8827 Merge "Accessibility focus traversal of lists inconsistent." into jb-dev 2012-06-01 08:52:19 -07:00
Chet Haase
d0140062db am 561ff8a7: Merge "Skip eglSwapBuffers() call when we do not draw to GL" into jb-dev
* commit '561ff8a74e3d9ea15f58d9b6534da9ea5a63d84b':
  Skip eglSwapBuffers() call when we do not draw to GL
2012-06-01 07:32:39 -07:00
Chet Haase
561ff8a74e Merge "Skip eglSwapBuffers() call when we do not draw to GL" into jb-dev 2012-06-01 07:29:53 -07:00
Ben Murdoch
078b591379 Get a WebViewDatabaseClassic instance lazily. Do not merge.
Rather than caching the WebViewDatabaseClassic instance in a member,
grab the instance when we need it.

In the case of WebSyncManager - neither it or it's subclass uses
the WebViewDatabaseClassic (and it's subclass is final) so remove
it's initialisation. We must leave the member declared however
to satisfy the published API.

Bug: 6482144
Change-Id: Ibf5186a2851d17f5ad62b35ad543aeadff5618d9
2012-06-01 14:07:20 +01:00
Svetoslav Ganov
b97c5d25c3 Increase string length limit to fit translation.
bug:6575039

Change-Id: I64fd00add017d02a1a5ccadc3f324f1f2793bbba
2012-05-31 20:25:30 -07:00
Svetoslav Ganov
2dda468606 Accessibility focus traversal of lists inconsistent.
1. Now the list traversal forward is the exact opposite
   of the traversal backward.

2. The focus search starts from the view against which
   the call is made as opposed to the one that has focus.
   This is now consistent with the rest of the focus search.

bug:6537747

Change-Id: Ida6a696636a3099531155fcbff256f71264f5008
2012-05-31 20:16:40 -07:00