Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
208,030 Commits 3 Branches 0 Tags
06e260b8dbe3fbc0456acd171e442b0c5930a7ea
Commit Graph

4910 Commits

Author SHA1 Message Date
Qiwen Zhao
06e260b8db Merge commit '01fda527' 
Change-Id: I08b5e7e8576f463c00be12879b465fa9c8cda8f5
 2015-07-20 15:52:23 -07:00
Dianne Hackborn
01fda52778 am ed3b4253: am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit 'ed3b42539a4d883533177d008c7ffb2a58e50af6':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:42:32 +00:00
Dianne Hackborn
3aefa43830 am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit '78ead58df03e476d656c7e875fff9ade13b727c1':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:02:32 +00:00
Dianne Hackborn
78ead58df0 Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 2015-07-20 19:50:50 +00:00
Dianne Hackborn
17f693520d Fix issue #22531747: Assist info should declare if user has disabled... 
...context and/or screenshot

Added new API to find out what contextual data has been globally disabled.

Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).

Also added a new Activity.showAssist() API because...  well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.

Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
 2015-07-20 12:49:10 -07:00
Dianne Hackborn
16c268ee90 am c8457784: am 9b7c2ee7: am 35534fb4: am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit 'c8457784df15e6c4361bce65628c56b9326977cf':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 23:24:35 +00:00
Dianne Hackborn
c8457784df am 9b7c2ee7: am 35534fb4: am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit '9b7c2ee7d805e632d215a0fd7f4696b36bd510a7':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 23:07:19 +00:00
Dianne Hackborn
fb03aa36a4 am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit '5c269121d8ea0bf3f530f2314695e189ffdb3165':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 22:17:58 +00:00
Dianne Hackborn
5c269121d8 Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 2015-07-17 22:03:46 +00:00
Dianne Hackborn
f38c4ee903 Work on issue #22556778: Starting under voice control not allowed 
The ResolverActivity is voice capable.  In fact, it is capable
of EVERYTHING.

Change-Id: I37c4476d546f61fee3540b747aff77e88b702d48
 2015-07-17 11:21:26 -07:00
Derek Sollenberger
82d740606e Merge "Remove unused HardwareLayer and associated code for generic views." 2015-07-17 13:58:07 +00:00
Adam Powell
7e4c29e2da am 7e89a40c: am e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit '7e89a40c2e6a9adad41724c0db0019e2d48fde03':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 01:31:37 +00:00
Adam Powell
7e89a40c2e am e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit 'e0968e14e46c941434f28ec633473d49b9583bf9':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 01:17:25 +00:00
Adam Powell
2fca481233 am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit '9ba039bbe9478c56ae3875a9933d3ba754367dc2':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 00:32:58 +00:00
Adam Powell
666d82a6d5 Update ChooserTarget constructor to take ComponentName, Bundle 
Simplify ChooserTarget handling by requiring a target component and an
extras bundle instead of a full PendingIntent/IntentSender. This
simplifies the handling of URI grants from sending apps.

Prune ChooserTargets that point at ComponentNames that don't share a
package with the original matching Activity target or that aren't
exported so that we don't show the user something they can't launch.

Bug 22516282

Change-Id: I3439c0910b4fa4f95c7a881b529942c96ffc953e
 2015-07-16 16:29:59 -07:00
Svet Ganov
28e7313992 am 71d12704: am 475858c3: am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit '71d12704f64eeace695a6b8e0cd8f36007b96270':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 23:20:46 +00:00
Svet Ganov
71d12704f6 am 475858c3: am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit '475858c34d21b38d9be4356a7fc654eb879e34b5':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 23:05:41 +00:00
Dianne Hackborn
6648b73cb9 am ee924ded: am 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit 'ee924dedcc36d64a72652bb3e5fb64d5d5c4c6a4':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 22:53:32 +00:00
Dianne Hackborn
ee924dedcc am 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit '587f0c58f506b167667c789c16292c4e405eac1f':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 22:36:06 +00:00
Svet Ganov
c00e49b6e4 am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit 'd4b566bf56333de708908ce4accb5fb067be64f0':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 22:23:38 +00:00
Svet Ganov
d4b566bf56 Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 2015-07-16 22:22:01 +00:00
Dianne Hackborn
9236af43d8 am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 21:51:49 +00:00
Dianne Hackborn
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +00:00
Derek Sollenberger
8d94835b49 Remove unused HardwareLayer and associated code for generic views. 
bug: 20461288
Change-Id: I4efa9e31a42682a8a90438d52c9c665a582f950c
 2015-07-16 14:09:45 -04:00
Dianne Hackborn
a7cfbe0e54 Work on issue #22516282: ChooserTarget URI grants not forwarded 
Add new option to startActivityAsCaller() which allows you to
specify that we should not do security checks on the target
activity being launched.

Change-Id: Ie6b28807b96fef35ccdff93b0a01066cfd8fa307
 2015-07-16 10:52:52 -07:00
Svet Ganov
7121e18595 Add APIs for verifier to grant at install and revoke permissions 
bug:22231699

Change-Id: Ie0c758bf73699f50bf99ff5aa0bf98dcc9004e37
 2015-07-15 22:22:59 -07:00
Yohei Yukawa
3711622bd8 am 4b2ca560: am a9df3402: am 68bb7221: am 6f0490fb: am c0aa9744: Merge "PopupWindow position must be specified in window coordinates." into mnc-dev 
* commit '4b2ca56038806a723631cff0f3e015e381479822':
  PopupWindow position must be specified in window coordinates.
 2015-07-16 04:39:51 +00:00
Yohei Yukawa
fd166329be am 5301bd72: am c37b7922: am 66b8377e: am 2e030285: am ebbe7706: Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev 
* commit '5301bd7274a48528f8a1cf4ed3fa402a65e64a56':
  Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
 2015-07-16 04:39:44 +00:00
Yohei Yukawa
4b2ca56038 am a9df3402: am 68bb7221: am 6f0490fb: am c0aa9744: Merge "PopupWindow position must be specified in window coordinates." into mnc-dev 
* commit 'a9df340233de9cf30680c981620d11e5f7e1394e':
  PopupWindow position must be specified in window coordinates.
 2015-07-16 04:26:28 +00:00
Yohei Yukawa
5301bd7274 am c37b7922: am 66b8377e: am 2e030285: am ebbe7706: Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev 
* commit 'c37b7922f1839f845503ecc58349dafc06586bee':
  Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
 2015-07-16 04:26:19 +00:00
Yohei Yukawa
6f0490fb67 am c0aa9744: Merge "PopupWindow position must be specified in window coordinates." into mnc-dev 
* commit 'c0aa9744dc0ba9470aea6a973d955fd21de21c92':
  PopupWindow position must be specified in window coordinates.
 2015-07-16 03:51:09 +00:00
Yohei Yukawa
2e03028582 am ebbe7706: Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev 
* commit 'ebbe77061c010596f79e61c3f1f7be12a3164b81':
  Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
 2015-07-16 03:44:04 +00:00
Yohei Yukawa
4b26997eeb PopupWindow position must be specified in window coordinates. 
This CL addresses TODOs in Ib641dda49f7ab1c7d60207c36a47767bb408.

With this CL the position of PopupWindow is always specified in
window-local coordinates even if FloatingToolbar#mParent is not a
decor view.

Bug: 22335001
Change-Id: I0cdd63a00051fa30981e517c07682075467ac598
 2015-07-15 19:01:32 -07:00
Yohei Yukawa
9b9d2c572f Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3. 
This is a coment-only follow up CL for I71a8d356e868dc7715b030ca,
which wrongly changed coordinates from window-local to view-local
(relative to FloatingToolbar#mParent) when showing PopupWindow.

The position of PopupWindow still needs to be specified in
window-local coordinates as we had done before
I71a8d356e868dc7715b030ca1078da4ec39368c3.

Currently the problem might not be visible to users because
  1. FloatingToolbar is not a public API hence all the instances
     are under our controll.
  2. FloatingToolbar#mParent is alwasy initialized with
     PhoneWindow#getDecorView() for now.

Bug: 22335001
Change-Id: Ib641dda49f7ab1c7d60207c36a47767bb408971c
 2015-07-15 19:00:18 -07:00
Dianne Hackborn
0bc31f6d73 am b876fb5a: am d649b575: am f9aa4b4d: am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit 'b876fb5aef80cb9cf4143c32a473afaa0b6f885e':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-16 00:40:29 +00:00
Dianne Hackborn
e9c03d18fc am 413691bd: am 18fb985e: am ae460ebf: am b3e37b3b: am c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev 
* commit '413691bd4d3ce489bc7ea565a11c57717e17236f':
  Fix issue #22479881: Nexus 6 randomly rebooting every few hours with...
 2015-07-16 00:40:04 +00:00
Dianne Hackborn
5539adc0dc am 335d1f72: am 6af63384: am e12c549b: am 0d04da1f: am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit '335d1f7273fd0394cc90402af0365342c245af5c':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-16 00:39:56 +00:00
Dianne Hackborn
b876fb5aef am d649b575: am f9aa4b4d: am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit 'd649b5751c9b7f592efb3653cfee39aeda45677b':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-16 00:24:41 +00:00
Dianne Hackborn
413691bd4d am 18fb985e: am ae460ebf: am b3e37b3b: am c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev 
* commit '18fb985e05ff6229f3c31e5fb63d0388d980f2dc':
  Fix issue #22479881: Nexus 6 randomly rebooting every few hours with...
 2015-07-16 00:24:22 +00:00
Dianne Hackborn
335d1f7273 am 6af63384: am e12c549b: am 0d04da1f: am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit '6af6338419a3c5717400df2a133d0436d2aa4ea5':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-16 00:24:15 +00:00
Abodunrinwa Toki
8542fc6f9e am 81693398: am 7572e694: am e3be3cc7: am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit '816933989ff3c88ba13fca11bcd58c5615849207':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 23:47:37 +00:00
Dianne Hackborn
309f9d6e7f am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit 'f6586cbde7d4612963eb2e8a2413235630676b83':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-15 23:39:32 +00:00
Dianne Hackborn
b3e37b3b07 am c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev 
* commit 'c1a49b50bf7638484d32ed6dbf863546a47f0e50':
  Fix issue #22479881: Nexus 6 randomly rebooting every few hours with...
 2015-07-15 23:39:16 +00:00
Dianne Hackborn
0d04da1fb7 am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit '1cf8b0b6bfbbf867512fcd7bbb4763692821ed36':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-15 23:39:12 +00:00
Abodunrinwa Toki
816933989f am 7572e694: am e3be3cc7: am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit '7572e6940c1ca2ecf90207baac0046bf7115cfb4':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 23:38:45 +00:00
Dianne Hackborn
f6586cbde7 Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 2015-07-15 23:31:25 +00:00
Dianne Hackborn
c1a49b50bf Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev 2015-07-15 23:30:09 +00:00
Dianne Hackborn
1cf8b0b6bf Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 2015-07-15 23:29:56 +00:00
Abodunrinwa Toki
b277786736 am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit '6a4014104e85bf4154b353cd0be337f7967cdaeb':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 22:50:16 +00:00
Jim Miller
aa1a35ba27 am 2e56339a: am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit '2e56339a4a1133e9aface1c851f1ab67cff72109':
  Improve tracking of screen on reasons.
 2015-07-15 22:40:32 +00:00