32273 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Dianne Hackborn
84375876fc Work on issue #6579997: Mariner entrance animation
Add a new variation of ActivityOptions that allows you to
supply custom animation resources and get a callback when the
animation starts.

Use this in SearchPanelView to determine when to start hiding
the search panel instead of having a fixed delay.

Fix some issues in the activity manager where we would cancel
the options in cases where we should actually keep them to give
to the window manager for a transition.  (Basically when the
activity being started is not actually ending up launched, but
just results in a shift in the activity stack.)

Note that this is not quite what the design calls for -- the
entire search UI is waiting and then disappearing when the
animation starts, instead of the ring first disappearing while
waiting for the time to fade out the circle.

Change-Id: Iee9a404ba530908d73cdbd4a9d0d2907ac03428f
2012-06-01 19:13:55 -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
Fabrice Di Meglio
28efba38c0 Make Switch widget aware of layout direction
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I40e77e54ccee2e596ebc4649871debfd35ed95fa
2012-06-01 18:20:18 -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
George Mount
b49f2bb5dd Change from left/right to base/extent for selection handles.
Bug 6557816
 This is a step in preparation to fix text area selection.
 It moves selection from left/right to base/extent. left/right
 can cause problems when dragging cursors -- it is sometimes
 difficult to tell which cursor should be dragged, the left or
 right, but we can always keep the base/extent constant.

 Webkit Change: I5609d07ea2ee67fc08d15cfcad31f49302f33297

Change-Id: I2f9b963e93bb1ab86a9b26518fca52449b56d5d9
2012-06-01 14:29:37 -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
Fabrice Di Meglio
7806882541 Merge "Clean up layout direction APIs for Drawable" 2012-06-01 11:41:58 -07:00
Fabrice Di Meglio
c1da65187a Clean up layout direction APIs for Drawable
- see bug #6427629

Change-Id: I3119db3022bba0ee325b6d0d4471bfebd850ec10
2012-06-01 11:39:10 -07:00
Eric Fischer
7c9979b664 Merge "Import translations. DO NOT MERGE" 2012-06-01 11:33:27 -07:00
Eric Fischer
8323c01b98 Import translations. DO NOT MERGE
Change-Id: I21004e24086a16addd24a66058fb5932fd157e4c
2012-06-01 11:23:03 -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
Svetoslav Ganov
6604496b53 am dd5543a6: am ac483ac4: Merge "AccessibilityInteractionController crash with IndexOutOfBoundException." into jb-dev
* commit 'dd5543a6ffb2f543d9a45b541808561370c34f86':
  AccessibilityInteractionController crash with IndexOutOfBoundException.
2012-06-01 11:20:43 -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