OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 6dd5a1d3: am 8f9d92c4: (-s ours) am 7406e4b8: am 7947ec71: am b64732d9: Merge...
Deepanshu Gupta [Thu, 24 Apr 2014 03:29:22 +0000 (03:29 +0000)]
am 6dd5a1d3: am 8f9d92c4: (-s ours) am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

* commit '6dd5a1d348900f4ebf10c96f0af7166219729024':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]

10 years agoam 36ec9c95: am 057dca97: (-s ours) am 1668ae8d: am a019e772: am 6aaea1bd: Merge...
Deepanshu Gupta [Thu, 24 Apr 2014 03:29:19 +0000 (03:29 +0000)]
am 36ec9c95: am 057dca97: (-s ours) am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

* commit '36ec9c9581fac43801e9a9af6b8a2af942f90d22':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

10 years agoam dba62dc9: am 5dee1a09: (-s ours) am e17ed922: am 126f4057: am 5ba2f230: Add view...
Deepanshu Gupta [Thu, 24 Apr 2014 03:29:16 +0000 (03:29 +0000)]
am dba62dc9: am 5dee1a09: (-s ours) am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]

* commit 'dba62dc9047c99615aa952a9404109490f28a8d1':
  Add view cookies for action bar menus. [DO NOT MERGE]

10 years agoam 8f9d92c4: (-s ours) am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnin...
Deepanshu Gupta [Thu, 24 Apr 2014 03:24:18 +0000 (03:24 +0000)]
am 8f9d92c4: (-s ours) am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

* commit '8f9d92c4ca5233607ca01dac0b3b66fde5539307':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]

10 years agoam 057dca97: (-s ours) am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldIn...
Deepanshu Gupta [Thu, 24 Apr 2014 03:24:14 +0000 (03:24 +0000)]
am 057dca97: (-s ours) am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

* commit '057dca97d9a486b94c82673a95a7a3933bca9a4d':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

10 years agoam 5dee1a09: (-s ours) am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for...
Deepanshu Gupta [Thu, 24 Apr 2014 03:24:10 +0000 (03:24 +0000)]
am 5dee1a09: (-s ours) am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]

* commit '5dee1a093abc4d6fd197ba2c3be012c9536ba1c5':
  Add view cookies for action bar menus. [DO NOT MERGE]

10 years agoam 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl...
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:22 +0000 (01:36 +0000)]
am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

* commit '7406e4b8102ffd71affd55a9f453c0ecce13a097':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]

10 years agoam 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create...
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:18 +0000 (01:36 +0000)]
am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

* commit '1668ae8d2a29b491c3ae421c5b0eca101fb10824':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

10 years agoam e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO...
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:14 +0000 (01:36 +0000)]
am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]

* commit 'e17ed922001cf70c48969eb7b10ee2e2557b41f9':
  Add view cookies for action bar menus. [DO NOT MERGE]

10 years agoam 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT...
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:24 +0000 (01:31 +0000)]
am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

* commit '7947ec715d8b4a0c82135553abb4947b61bf802b':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]

10 years agoam a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT...
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:20 +0000 (01:31 +0000)]
am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

* commit 'a019e77252f86962b9803042c01b897f7f1aa89f':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

10 years agoam 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:15 +0000 (01:31 +0000)]
am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]

* commit '126f4057a06756fbb1c194b5d9d40f9f922d14ee':
  Add view cookies for action bar menus. [DO NOT MERGE]

10 years agoam 8deae79d: Merge "Bug fix in layoutlib"
Deepanshu Gupta [Thu, 24 Apr 2014 01:30:23 +0000 (01:30 +0000)]
am 8deae79d: Merge "Bug fix in layoutlib"

* commit '8deae79d9f6ddd0e610fde54f1cd8b7087507a22':
  Bug fix in layoutlib

10 years agoam b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into...
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:53 +0000 (01:27 +0000)]
am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

* commit 'b64732d977c023423cd01d32361a49401d9203cd':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]

10 years agoam 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into...
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:50 +0000 (01:27 +0000)]
am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

* commit '6aaea1bd4aa056335776098cd9dc523e898716f1':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

10 years agoam 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:45 +0000 (01:27 +0000)]
am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]

* commit '5ba2f230faa355eb9bc1e90f6c48eeeb437f390c':
  Add view cookies for action bar menus. [DO NOT MERGE]

10 years agoam 3f382330: Merge "Bug fix for wakeup sensors."
Aravind Akella [Thu, 24 Apr 2014 01:25:10 +0000 (01:25 +0000)]
am 3f382330: Merge "Bug fix for wakeup sensors."

* commit '3f3823308a412b5cd4a9726d51bf017d379e752d':
  Bug fix for wakeup sensors.

10 years agoMerge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 24 Apr 2014 01:21:54 +0000 (01:21 +0000)]
Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

10 years agoMerge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 24 Apr 2014 01:21:45 +0000 (01:21 +0000)]
Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

10 years agoMerge "Bug fix in layoutlib"
Deepanshu Gupta [Thu, 24 Apr 2014 01:10:36 +0000 (01:10 +0000)]
Merge "Bug fix in layoutlib"

10 years agoBug fix in layoutlib
Deepanshu Gupta [Thu, 24 Apr 2014 01:07:07 +0000 (18:07 -0700)]
Bug fix in layoutlib

Renaming a method wasn't completed properly.
The bug was introduced in the following change:
Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(1001961f904bac5294aaf73a47c2497aa764bf7f)

Change-Id: I698437b428d696c656e2268ded654a612a3e0c80

10 years agoFix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Wed, 23 Apr 2014 00:22:32 +0000 (17:22 -0700)]
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)

10 years agoAdd view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Apr 2014 19:32:38 +0000 (12:32 -0700)]
Add view cookies for action bar menus. [DO NOT MERGE]

The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

The change also contains a bugfix where a method wasn't renamed
properly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 1001961f904bac5294aaf73a47c2497aa764bf7f)

10 years agoMerge "Bug fix for wakeup sensors."
Aravind Akella [Thu, 24 Apr 2014 00:40:59 +0000 (00:40 +0000)]
Merge "Bug fix for wakeup sensors."

10 years agoam 628f8966: Merge "Fixing crash in SystemServicesProxy getting activity label (Bug...
Winson Chung [Thu, 24 Apr 2014 00:27:28 +0000 (00:27 +0000)]
am 628f8966: Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)"

* commit '628f89667410f8c1d7e8892292aa36634f3e3384':
  Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)

10 years agoam 717f39c7: Merge "Clip TouchFeedbackDrawable effect to receiver Outline"
Chris Craik [Thu, 24 Apr 2014 00:27:25 +0000 (00:27 +0000)]
am 717f39c7: Merge "Clip TouchFeedbackDrawable effect to receiver Outline"

* commit '717f39c7d98c7e4b08f7bb88102c720cb8990004':
  Clip TouchFeedbackDrawable effect to receiver Outline

10 years agoam f4201925: Merge "Add missing try/finallys"
John Reck [Thu, 24 Apr 2014 00:27:22 +0000 (00:27 +0000)]
am f4201925: Merge "Add missing try/finallys"

* commit 'f4201925d9e3d01e7a2a1db07c8186e4ba9a0fb5':
  Add missing try/finallys

10 years agoam 5451c559: Merge "Don\'t show managed profiles in the user switcher"
Amith Yamasani [Thu, 24 Apr 2014 00:27:19 +0000 (00:27 +0000)]
am 5451c559: Merge "Don\'t show managed profiles in the user switcher"

* commit '5451c559ecd3ac45e3d4dfc5838cb1996404116d':
  Don't show managed profiles in the user switcher

10 years agoMerge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)"
Winson Chung [Thu, 24 Apr 2014 00:14:02 +0000 (00:14 +0000)]
Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)"

10 years agoMerge "Clip TouchFeedbackDrawable effect to receiver Outline"
Chris Craik [Thu, 24 Apr 2014 00:08:08 +0000 (00:08 +0000)]
Merge "Clip TouchFeedbackDrawable effect to receiver Outline"

10 years agoBug fix for wakeup sensors.
Aravind Akella [Wed, 12 Feb 2014 02:44:42 +0000 (18:44 -0800)]
Bug fix for wakeup sensors.

SensorService should hold a wakelock till the app reads events from a wakeup sensor. Currently drivers hold a wakelock with a
timeout while delivering events from a wake up sensor like Significant Motion. This hack can be removed now.
Bug: 9774884

Change-Id: I6cab0147c63f57a494a61f4dfe2a64a27dfe1b4e

10 years agoam 3c37bcee: Merge "Fix translationZ matrix computation"
Chris Craik [Wed, 23 Apr 2014 23:53:26 +0000 (23:53 +0000)]
am 3c37bcee: Merge "Fix translationZ matrix computation"

* commit '3c37bcee9b241d9ee5c420e9e16dca236e8a0304':
  Fix translationZ matrix computation

10 years agoam 1b244f44: Merge "Piping through ability for an Activity to remove its own task...
Winson Chung [Wed, 23 Apr 2014 23:53:22 +0000 (23:53 +0000)]
am 1b244f44: Merge "Piping through ability for an Activity to remove its own task. (Bug 13735914)"

* commit '1b244f44a796484866f13e0639420477c3191695':
  Piping through ability for an Activity to remove its own task. (Bug 13735914)

10 years agoFixing crash in SystemServicesProxy getting activity label (Bug. 14260718)
Winson Chung [Wed, 23 Apr 2014 22:19:56 +0000 (15:19 -0700)]
Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)

- Fixing issue with wrong margins due to moved activity icon

Change-Id: Ib3631dc4cf4244d44737ee95b597bd25653815c8

10 years agoMerge "Add missing try/finallys"
John Reck [Wed, 23 Apr 2014 23:34:51 +0000 (23:34 +0000)]
Merge "Add missing try/finallys"

10 years agoMerge "Don't show managed profiles in the user switcher"
Amith Yamasani [Wed, 23 Apr 2014 23:33:04 +0000 (23:33 +0000)]
Merge "Don't show managed profiles in the user switcher"

10 years agoClip TouchFeedbackDrawable effect to receiver Outline
Chris Craik [Tue, 15 Apr 2014 23:18:08 +0000 (16:18 -0700)]
Clip TouchFeedbackDrawable effect to receiver Outline

Projected RenderNodes are now wrapped with a ClipRect or masked
SaveLayer, so that they are clipped to the outline of the projection
receiver surface.

Change-Id: I1d4afc1bb5d638d650bc0b1dac51a498f216773e

10 years agoFix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 1 Apr 2014 01:59:45 +0000 (18:59 -0700)]
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 4a0f93bd32b8dd9b3c351680ad82e461d5111f38)

10 years agoam 25a13518: Merge "Tune down the linkify false positive rate"
Selim Gurun [Wed, 23 Apr 2014 21:50:09 +0000 (21:50 +0000)]
am 25a13518: Merge "Tune down the linkify false positive rate"

* commit '25a1351831b9912c8316a90444fb3bd1521b5cfc':
  Tune down the linkify false positive rate

10 years agoAdd missing try/finallys
John Reck [Wed, 23 Apr 2014 21:48:28 +0000 (14:48 -0700)]
Add missing try/finallys

Change-Id: I32be65f5a46768449f26b69f72f502acd1e72769

10 years agoDon't show managed profiles in the user switcher
Amith Yamasani [Wed, 23 Apr 2014 21:43:23 +0000 (14:43 -0700)]
Don't show managed profiles in the user switcher

Only show users that you can switch to.

Change-Id: Iff6dfccc27230f824d73d02731a045c69419b814

10 years agoMerge "Fix translationZ matrix computation"
Chris Craik [Wed, 23 Apr 2014 21:39:06 +0000 (21:39 +0000)]
Merge "Fix translationZ matrix computation"

10 years agoMerge "Piping through ability for an Activity to remove its own task. (Bug 13735914)"
Winson Chung [Wed, 23 Apr 2014 21:35:32 +0000 (21:35 +0000)]
Merge "Piping through ability for an Activity to remove its own task. (Bug 13735914)"

10 years agoMerge "Tune down the linkify false positive rate"
Selim Gurun [Wed, 23 Apr 2014 21:23:27 +0000 (21:23 +0000)]
Merge "Tune down the linkify false positive rate"

10 years agoPiping through ability for an Activity to remove its own task. (Bug 13735914)
Winson Chung [Tue, 22 Apr 2014 17:08:18 +0000 (10:08 -0700)]
Piping through ability for an Activity to remove its own task. (Bug 13735914)

Change-Id: Iefcd4fbe68748195de8ee37ee2b6edef55276603

10 years agoam e9401df1: Merge "Fix style warnings in RenderSessionImpl"
Deepanshu Gupta [Wed, 23 Apr 2014 20:52:41 +0000 (20:52 +0000)]
am e9401df1: Merge "Fix style warnings in RenderSessionImpl"

* commit 'e9401df1e801b215ac07ad4391c2bb25f8f36c20':
  Fix style warnings in RenderSessionImpl

10 years agoMerge "Fix style warnings in RenderSessionImpl"
Deepanshu Gupta [Wed, 23 Apr 2014 20:45:04 +0000 (20:45 +0000)]
Merge "Fix style warnings in RenderSessionImpl"

10 years agoam 7f2ffe4f: Merge "Avoid panel "flip" animations when possible."
John Spurlock [Wed, 23 Apr 2014 20:38:17 +0000 (20:38 +0000)]
am 7f2ffe4f: Merge "Avoid panel "flip" animations when possible."

* commit '7f2ffe4fe1daf8a986bd9a6027973dc72145a432':
  Avoid panel "flip" animations when possible.

10 years agoMerge "Avoid panel "flip" animations when possible."
John Spurlock [Wed, 23 Apr 2014 20:31:46 +0000 (20:31 +0000)]
Merge "Avoid panel "flip" animations when possible."

10 years agoam aa1492d1: Dynamic AID registration APIs for HCE.
Martijn Coenen [Wed, 23 Apr 2014 20:26:43 +0000 (20:26 +0000)]
am aa1492d1: Dynamic AID registration APIs for HCE.

* commit 'aa1492d1d8c5f80e074faacb83905bd07487975d':
  Dynamic AID registration APIs for HCE.

10 years agoFix translationZ matrix computation
Chris Craik [Wed, 23 Apr 2014 00:55:41 +0000 (17:55 -0700)]
Fix translationZ matrix computation

bug:14259972

Ensure that translationZ is applied for true3dTransform property
transformations, even if the node doesn't have any other
transformation properties set.

Additionally, use fuzzy compare for translationZ, similar to
rotationX/Y, since they're expenive to leave set in rounding error
cases.

Change-Id: Idafa4423cc7751a8f433237b1f576aa7abb74f6e

10 years agoDynamic AID registration APIs for HCE.
Martijn Coenen [Fri, 11 Apr 2014 19:54:22 +0000 (12:54 -0700)]
Dynamic AID registration APIs for HCE.

Adds a set of APIs that allows applications
to dynamically register and unregister AID groups
for HCE and Secure Element based services.

Change-Id: I08e9423dff405955cb725c87423c953a7dbe5c72

10 years agoAvoid panel "flip" animations when possible.
John Spurlock [Wed, 23 Apr 2014 20:12:54 +0000 (16:12 -0400)]
Avoid panel "flip" animations when possible.

Bug:14271219
Change-Id: I91632c073497718e2fd53ad172ec805f54514696

10 years agoFix style warnings in RenderSessionImpl
Deepanshu Gupta [Wed, 23 Apr 2014 00:22:32 +0000 (17:22 -0700)]
Fix style warnings in RenderSessionImpl

Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c

10 years agoam 6f6e64a7: Merge "Add null bg check to switch"
Alan Viverette [Wed, 23 Apr 2014 20:00:42 +0000 (20:00 +0000)]
am 6f6e64a7: Merge "Add null bg check to switch"

* commit '6f6e64a7a3fbcc01950d610820f441853601b3f9':
  Add null bg check to switch

10 years agoam 5c1d4327: Merge "Add view cookies for action bar menus."
Deepanshu Gupta [Wed, 23 Apr 2014 19:56:19 +0000 (19:56 +0000)]
am 5c1d4327: Merge "Add view cookies for action bar menus."

* commit '5c1d43272904398ba4b82c80ed2e6809d7dd9572':
  Add view cookies for action bar menus.

10 years agoMerge "Add null bg check to switch"
Alan Viverette [Wed, 23 Apr 2014 19:54:03 +0000 (19:54 +0000)]
Merge "Add null bg check to switch"

10 years agoam 9c32cd49: Fix build.
Emily Bernier [Wed, 23 Apr 2014 19:52:05 +0000 (19:52 +0000)]
am 9c32cd49: Fix build.

* commit '9c32cd498a8067d4487a97fbf93d8587bfcec1fd':
  Fix build.

10 years agoAdd null bg check to switch
Alan Viverette [Wed, 23 Apr 2014 19:51:16 +0000 (12:51 -0700)]
Add null bg check to switch

BUG: 14271950
Change-Id: I6f4833c916ddc8d939f5bfa6ab7b1ed1993e862e

10 years agoMerge "Add view cookies for action bar menus."
Deepanshu Gupta [Wed, 23 Apr 2014 19:50:00 +0000 (19:50 +0000)]
Merge "Add view cookies for action bar menus."

10 years agoFix build.
Emily Bernier [Wed, 23 Apr 2014 19:40:11 +0000 (15:40 -0400)]
Fix build.

Don't link to MANAGE_USERS permission in Javadoc.

Change-Id: Iad1391a0281a3fad06529a86b277f787791e94fc

10 years agoAdd view cookies for action bar menus.
Deepanshu Gupta [Fri, 18 Apr 2014 19:32:38 +0000 (12:32 -0700)]
Add view cookies for action bar menus.

The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca

10 years agoam 5723feba: Merge "Introduce PersistableBundle"
Craig Mautner [Wed, 23 Apr 2014 18:53:37 +0000 (18:53 +0000)]
am 5723feba: Merge "Introduce PersistableBundle"

* commit '5723febadc1877c045389afffa111913698e32e2':
  Introduce PersistableBundle

10 years agoMerge "Introduce PersistableBundle"
Craig Mautner [Wed, 23 Apr 2014 18:48:56 +0000 (18:48 +0000)]
Merge "Introduce PersistableBundle"

10 years agoam 8a0fa6e8: Merge "Allow device or profile owner app to modify user restrictions."
Emily Bernier [Wed, 23 Apr 2014 18:32:21 +0000 (18:32 +0000)]
am 8a0fa6e8: Merge "Allow device or profile owner app to modify user restrictions."

* commit '8a0fa6e823ddbdfd17869d52f838b1cc0a46bd2b':
  Allow device or profile owner app to modify user restrictions.

10 years agoMerge "Allow device or profile owner app to modify user restrictions."
Emily Bernier [Wed, 23 Apr 2014 18:27:45 +0000 (18:27 +0000)]
Merge "Allow device or profile owner app to modify user restrictions."

10 years agoAllow device or profile owner app to modify user restrictions.
Emily Bernier [Wed, 23 Apr 2014 16:51:35 +0000 (12:51 -0400)]
Allow device or profile owner app to modify user restrictions.

Currently this is gated on being a system or root app with the
MANAGE_USERS permission; third-party MDM apps set as device or profile
owner should have this ability as well.

Bug: 13585295

Change-Id: I61d21b13b9ec66fc0cb497ec2007ee732461d448

10 years agoTune down the linkify false positive rate
Selim Gurun [Wed, 23 Apr 2014 18:17:20 +0000 (11:17 -0700)]
Tune down the linkify false positive rate

Bug: 14066316

Tune down the false positive rate by restricting gTLD pattern a little bit.

Change-Id: I7bd39633d3267930593bd7231f764c110293301f

10 years agoam 4e8cf150: Merge "Quick settings: interim tile shuffle."
John Spurlock [Wed, 23 Apr 2014 17:50:37 +0000 (17:50 +0000)]
am 4e8cf150: Merge "Quick settings: interim tile shuffle."

* commit '4e8cf1508f22f88203cd9bf4467aaddd3f4502c6':
  Quick settings: interim tile shuffle.

10 years agoMerge "Quick settings: interim tile shuffle."
John Spurlock [Wed, 23 Apr 2014 17:46:44 +0000 (17:46 +0000)]
Merge "Quick settings: interim tile shuffle."

10 years agoam 40619ae8: Prevent new ripples when max reached
Alan Viverette [Wed, 23 Apr 2014 17:41:27 +0000 (17:41 +0000)]
am 40619ae8: Prevent new ripples when max reached

* commit '40619ae8016248979c0147f6bcc9bfd41f07bb4a':
  Prevent new ripples when max reached

10 years agoam 70ad9bc0: Fix null and bounds checks
Alan Viverette [Wed, 23 Apr 2014 17:41:18 +0000 (17:41 +0000)]
am 70ad9bc0: Fix null and bounds checks

* commit '70ad9bc03341cc0a5b8d6c9c1f43afac6bcc9c62':
  Fix null and bounds checks

10 years agoPrevent new ripples when max reached
Alan Viverette [Wed, 23 Apr 2014 17:33:47 +0000 (10:33 -0700)]
Prevent new ripples when max reached

BUG: 14270202
Change-Id: I53b0522a175eca043ba1cf007377312d03fd8f6d

10 years agoQuick settings: interim tile shuffle.
John Spurlock [Wed, 23 Apr 2014 17:22:59 +0000 (13:22 -0400)]
Quick settings: interim tile shuffle.

Ensure BT and location appear in 3x3 mode, by:
 - Adding the three conditional accessibility tiles at the end
 - Moving BT and location above airplane mode (available via global actions)
   and zen mode (sorry).

Bug:14162372
Change-Id: I6d79a7442f091d58643c5124cfe0dcbf6e3cd46f

10 years agoFix null and bounds checks
Alan Viverette [Wed, 23 Apr 2014 17:20:11 +0000 (10:20 -0700)]
Fix null and bounds checks

BUG: 14271950
BUG: 14271753
BUG: 14270202
Change-Id: I8708107d3803b170a323f584a268ea6b096458ce

10 years agoam ceb5d17f: am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchr...
Neil Fuller [Wed, 23 Apr 2014 16:55:04 +0000 (16:55 +0000)]
am ceb5d17f: am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"

* commit 'ceb5d17f6a2f5c144948ada1d59ec4f12da64799':
  Changes to support asynchronous close interruption

10 years agoam d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close...
Neil Fuller [Wed, 23 Apr 2014 16:51:47 +0000 (16:51 +0000)]
am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"

* commit 'd720ef541d06be87de3b3e03c1e7fb349299a21f':
  Changes to support asynchronous close interruption

10 years agoam caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"
Neil Fuller [Wed, 23 Apr 2014 16:48:34 +0000 (16:48 +0000)]
am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"

* commit 'caf6497b9a0347da7d5acbe678adc2c8187176c0':
  Changes to support asynchronous close interruption

10 years agoam 683cf1bf: Merge "Changes to support asynchronous close interruption"
Neil Fuller [Wed, 23 Apr 2014 16:45:15 +0000 (16:45 +0000)]
am 683cf1bf: Merge "Changes to support asynchronous close interruption"

* commit '683cf1bffe33f49f26d46201f96cd2eff60e8192':
  Changes to support asynchronous close interruption

10 years agoMerge "Changes to support asynchronous close interruption"
Neil Fuller [Wed, 23 Apr 2014 16:41:16 +0000 (16:41 +0000)]
Merge "Changes to support asynchronous close interruption"

10 years agoChanges to support asynchronous close interruption
Neil Fuller [Fri, 11 Apr 2014 16:29:54 +0000 (17:29 +0100)]
Changes to support asynchronous close interruption

This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a

Bug: 13927110

Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc

10 years agoam e84d544f: Merge "Move redaction logic showing from Keyguard to PhoneStatusBar."
Jorim Jaggi [Wed, 23 Apr 2014 16:28:27 +0000 (16:28 +0000)]
am e84d544f: Merge "Move redaction logic showing from Keyguard to PhoneStatusBar."

* commit 'e84d544fe4b238efc408280ec7e01f9c3f04a1b6':
  Move redaction logic showing from Keyguard to PhoneStatusBar.

10 years agoMerge "Move redaction logic showing from Keyguard to PhoneStatusBar."
Jorim Jaggi [Wed, 23 Apr 2014 16:24:04 +0000 (16:24 +0000)]
Merge "Move redaction logic showing from Keyguard to PhoneStatusBar."

10 years agoam b6e0e122: Fixed a bug where holes could occur in the new shade.
Selim Cinek [Wed, 23 Apr 2014 16:10:55 +0000 (16:10 +0000)]
am b6e0e122: Fixed a bug where holes could occur in the new shade.

* commit 'b6e0e1228bfd38f5ba971194afc5c31d99980fa1':
  Fixed a bug where holes could occur in the new shade.

10 years agoFixed a bug where holes could occur in the new shade.
Selim Cinek [Wed, 23 Apr 2014 15:24:37 +0000 (17:24 +0200)]
Fixed a bug where holes could occur in the new shade.

When a notification was never layouted before and it was the first
child, holes could occur in the shade when dragging down, because its
maximum allowed height was wrongly calculated.

Bug: 14080722
Change-Id: Ia10f9dd95f917d492411aec1da4ae0fc4d8f33d5

10 years agoMove redaction logic showing from Keyguard to PhoneStatusBar.
Jorim Jaggi [Wed, 23 Apr 2014 10:01:36 +0000 (12:01 +0200)]
Move redaction logic showing from Keyguard to PhoneStatusBar.

This removes a race condition and makes redaction more stable.

Change-Id: I4084cdf490c0e52fe26f45cb00524e0876a068bc

10 years agoam 21de56a9: Add directory selection to DocumentsProvider.
Jeff Sharkey [Wed, 23 Apr 2014 07:15:32 +0000 (07:15 +0000)]
am 21de56a9: Add directory selection to DocumentsProvider.

* commit '21de56a94668e0fda1b8bb4ee4f99a09b40d28fd':
  Add directory selection to DocumentsProvider.

10 years agoam 846318a3: Allow prefix-based Uri permission grants.
Jeff Sharkey [Wed, 23 Apr 2014 07:15:26 +0000 (07:15 +0000)]
am 846318a3: Allow prefix-based Uri permission grants.

* commit '846318a3250fa95f47a9decfbffb05a31dbd0006':
  Allow prefix-based Uri permission grants.

10 years agoAdd directory selection to DocumentsProvider.
Jeff Sharkey [Sun, 6 Apr 2014 02:05:24 +0000 (19:05 -0700)]
Add directory selection to DocumentsProvider.

Introduce new ACTION_PICK_DIRECTORY that allows users to grant access
to an entire document subtree.  Instead of requiring grants for each
individual document, this leverages new prefix URI permission grants
by defining new "via"-style URIs:

content://com.example/via/12/document/24/

This references document 24 by using a prefix grant given for
document 12.  Internally, we use isChildDocument() to enforce that
24 is actually a descendant (child, grandchild, etc) of 12.  Since
this is an optional API, providers indicate support with
Root.FLAG_SUPPORTS_DIR_SELECTION.

Extend DocumentsUI to support picking directories.  Expose
createDocument() API to work with returned directories.

Offer to canonicalize via-style URIs into direct URIs, generating
exact permission grants along the way.  Override openAssetFile()
to pass through CancellationSignal.  Move testing code into ApiDemos.

Bug: 10607375
Change-Id: Ifffc1cff878870f8152eb6ca0199c5d014b9cb07

10 years agoAllow prefix-based Uri permission grants.
Jeff Sharkey [Fri, 4 Apr 2014 19:12:41 +0000 (12:12 -0700)]
Allow prefix-based Uri permission grants.

Define new FLAG_GRANT_PREFIX_URI_PERMISSION which indicates that a
Uri permission grant should also apply to any other Uris that have
matching scheme, authority, and path segments.  For example, a prefix
grant for /foo/ would allow /foo/bar/ but not /foo2/.

Allow persistable and prefix grants to be issued directly through
grantUriPermission().  Relaxing persistable is fine, since it still
requires the receiver to actively take the permission.

Since exact- and prefix-match grants for the same Uri can coexist,
we track them separately using a new UriGrant key.  (Consider the
case where an app separately extends READ|PREFIX and WRITE for
the same Uri: we can't let that become READ|WRITE|PREFIX.)

Fix revoke to always take away persisted permissions.  Move prefix
matching logic to Uri and add tests.  Add new flags to "am" tool, and
various internal uses around Intent and Context.  Switch some lagging
users to ArraySet.

Bug: 10607375
Change-Id: Ia8ce2b88421ff9f2fe5a979a27a026fc445d46f1

10 years agoam fb5d9f33: am e4593554: am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code...
Andrew Solovay [Wed, 23 Apr 2014 03:02:02 +0000 (03:02 +0000)]
am fb5d9f33: am e4593554: am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

* commit 'fb5d9f338153f569775bbc76177cab05441999c1':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

10 years agoam e4593554: am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use...
Andrew Solovay [Wed, 23 Apr 2014 02:55:21 +0000 (02:55 +0000)]
am e4593554: am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

* commit 'e4593554ddcdaeb93a6d624fbd6641c4624de536':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

10 years agoam 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard metho...
Andrew Solovay [Wed, 23 Apr 2014 02:51:48 +0000 (02:51 +0000)]
am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

* commit '32117212fc48872b557044ff25ba6b8d9ace5738':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

10 years agoam 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also...
Andrew Solovay [Wed, 23 Apr 2014 02:47:50 +0000 (02:47 +0000)]
am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

* commit '6c5bfa2f348f1d55cbff5f8f2bd61e88ac2d01ee':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

10 years agoam 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting...
Andrew Solovay [Wed, 23 Apr 2014 02:44:06 +0000 (02:44 +0000)]
am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

* commit '026c82b1916a9e2b48b9ff62ffeb935d63935a68':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

10 years agoam d064424e: (-s ours) am 128f5efa: (-s ours) am 89ed56fa: (-s ours) Merge "Import...
Baligh Uddin [Wed, 23 Apr 2014 02:29:54 +0000 (02:29 +0000)]
am d064424e: (-s ours) am 128f5efa: (-s ours) am 89ed56fa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'd064424e2f461f61ae51459bc2c819105444aeab':
  Import translations. DO NOT MERGE

10 years agoDoc: Fixed a code sample to use standard methods. Also some formatting
Andrew Solovay [Tue, 22 Apr 2014 22:46:42 +0000 (15:46 -0700)]
Doc: Fixed a code sample to use standard methods. Also some formatting
tweaks.

Added blank lines for readability, and broke some long lines
so code samples don't need a scroll bar.

(Update: Fixed indentation that I broke on a code sample.)

Bug: 14045051
Change-Id: I1cf08b899ec55f9093545e71861c84120e4b56a1

10 years agoam 2b38072e: Merge "Add ripple to switches, radio buttons, check boxes, seek bars"
Alan Viverette [Wed, 23 Apr 2014 02:24:37 +0000 (02:24 +0000)]
am 2b38072e: Merge "Add ripple to switches, radio buttons, check boxes, seek bars"

* commit '2b38072e1fb4f158c8de9d92825f72145c9343bb':
  Add ripple to switches, radio buttons, check boxes, seek bars

10 years agoam a822d393: (-s ours) am 97f9607f: (-s ours) am d14bb3cf: (-s ours) Merge "Import...
Baligh Uddin [Wed, 23 Apr 2014 02:24:30 +0000 (02:24 +0000)]
am a822d393: (-s ours) am 97f9607f: (-s ours) am d14bb3cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'a822d393bf4b43665861c0ad0a8f8b37cf9775ed':
  Import translations. DO NOT MERGE

10 years agoam 3e1668fd: (-s ours) am b38d00d5: (-s ours) am abd2a4a4: (-s ours) Merge "Import...
Baligh Uddin [Wed, 23 Apr 2014 02:24:26 +0000 (02:24 +0000)]
am 3e1668fd: (-s ours) am b38d00d5: (-s ours) am abd2a4a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '3e1668fd04827da04eaa7ff45df1edf658a895e1':
  Import translations. DO NOT MERGE