Chien-Yu Chen
98977fa042
am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
...
* commit 'aa9a27bb9bbfb4bccf999a0d453f4f4d853aac36':
Camera2: Update FAST mode for EE and NR
2015-07-17 17:06:02 +00:00
Eino-Ville Talvala
69508f494e
am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev
...
* commit '6e8a551f9f7691e3d7ada46eeae5d2cc612d7938':
Camera2: Add hidden experimental tearDown method
2015-07-17 17:05:54 +00:00
Chien-Yu Chen
aa9a27bb9b
Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
2015-07-17 17:01:30 +00:00
Eino-Ville Talvala
6e8a551f9f
Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev
2015-07-17 16:54:09 +00:00
Nancy Chen
ce9fea390c
am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev
...
* commit '660322d8259cb256745f15219af0b9004063ea8d':
Add transcription field to voicemail object and related changes.
2015-07-17 16:50:52 +00:00
Nancy Chen
660322d825
Merge "Add transcription field to voicemail object and related changes." into mnc-dev
2015-07-17 16:37:43 +00:00
Selim Cinek
928b2bf7ae
am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev
...
* commit 'b43b06d1056031444596edcc27a1a10084e5cad3':
Fixed a bug where notifications were not posted on secondary users
2015-07-17 01:40:06 +00:00
Nancy Chen
5bd3e73a21
Add transcription field to voicemail object and related changes.
...
Bug: 22542002
Change-Id: I05c18e8f82a4f318fb59228e4d6eb844d64bee30
2015-07-16 18:36:58 -07:00
Selim Cinek
b43b06d105
Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev
2015-07-17 01:31:31 +00:00
Dan Sandler
8f895de9f4
am 86647987: Icon-related Notifications API changes:
...
* commit '86647987c3c6bf4e6a8bacd763ff16f1806c70a3':
Icon-related Notifications API changes:
2015-07-17 01:09:48 +00:00
Dan Sandler
86647987c3
Icon-related Notifications API changes:
...
- Deprecate Notification.icon and largeIcon.
setSmallIcon(Icon) and setLargeIcon(Icon) should be used
instead.
- Add Icon support to Notification actions; deprecate
Action.icon and methods/ctors that use int.
Bug: 21310773
Bug: 21271587
Change-Id: Iddac8121e7690e9d7a0360edb488ab77e3e8fb3a
2015-07-17 00:59:20 +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
9ba039bbe9
Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev
2015-07-17 00:25:11 +00:00
Selim Cinek
f33b11182a
Fixed a bug where notifications were not posted on secondary users
...
Unfortunately they made sound though, driving people crazy.
Bug: 22351758
Change-Id: I9ec5bac97c2d587c4e356ab759876def3369b11a
2015-07-16 17:24:51 -07:00
Svet Ganov
b0f8fee845
am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
...
* commit '6f561a24c97d25a858cf98eef5c502ef8d80cfc1':
Improve documentation of onRequestPermissionsResult
2015-07-17 00:03:30 +00:00
Svet Ganov
6f561a24c9
Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
2015-07-16 23:51:53 +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
0f45c7c7c4
Improve documentation of onRequestPermissionsResult
...
bug:22524902
Change-Id: Ic435171fa016d8841bea432c5c39d7b0a6a7b9e9
2015-07-16 16:29:04 -07: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
Eino-Ville Talvala
14c09fa3c5
Camera2: Add hidden experimental tearDown method
...
Bug: 18949148
Change-Id: I6264d95a26ebf51cce6114c9a86b9561f7c60ab5
2015-07-16 14:55:26 -07: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
Svet Ganov
f8847c02dc
am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
...
* commit 'db8fa48ed0864125a07f2bbe078fd60abd875ac7':
Return a result from Fragment#shouldShowRequestPermissionRationale
2015-07-16 19:27:18 +00:00
Svet Ganov
db8fa48ed0
Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
2015-07-16 19:16:59 +00: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
9e136b88ba
Return a result from Fragment#shouldShowRequestPermissionRationale
...
bug:22523342
Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
2015-07-16 09:58:43 -07:00
Tony Mak
245466b573
am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
...
* commit '532737df65330200dc55ae42d31140d19c4024be':
Fix calendar reminder notification is not shown in idle state
2015-07-16 15:03:56 +00:00
Tony Mak
532737df65
Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
2015-07-16 14:50:19 +00:00
George Mount
2456f77c3f
am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
...
* commit 'bd87b6b5b0c478c45d0dd5725cbc59995e751c64':
Make additional shared elements a version-checked feature.
2015-07-16 14:29:42 +00:00
George Mount
bd87b6b5b0
Merge "Make additional shared elements a version-checked feature." into mnc-dev
2015-07-16 14:24:09 +00:00
George Mount
2c256a04ae
Make additional shared elements a version-checked feature.
...
Bug 22505481
ag/684544 added a feature to allow shared elements that weren't
shared into an Activity to be shared back. However, if you are
targeting an older version of the SDK, you may get an unexpected
shared element back. This change in behavior has been locked
behind a target version check.
Change-Id: I7162e24f3b14fedd6b308e89e9d04ac67660f7d6
2015-07-16 07:09:42 -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
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
Billy Lau
da93454bfa
am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
...
* commit '008409a2ea1feed095d53ce51429e4fed964c50c':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
2015-07-16 00:21:44 +00:00
Billy Lau
008409a2ea
Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
2015-07-16 00:04:35 +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
fc5696404b
am c4e2bcd4: Merge "Fix issue #22460110 : AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev
...
* commit 'c4e2bcd4dca0401ca38a45dce04d29b92231d677':
Fix issue #22460110 : AssistStructure.ViewNode.isAssistBlocked() always...
2015-07-15 23:39:20 +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
Billy Lau
060275ffc7
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
...
AppOpsManager:
Changed the default mode for SYSTEM_ALERT_WINDOW to MODE_DEFAULT instead of
MODE_ALLOWED. Otherwise, an app that did not declare for this permission will
actually be allowed to perform OP_SYSTEM_ALERT_WINDOW, which is undesirable.
This change also allows callers to make their own decision based on the
current policy (M vs pre-M apps).
policy/PhoneWindowManager:
Added additional checks that will handle MODE_DEFAULT - this happens when an app
is newly installed but not yet configured.
wm/WindowManagerService:
Enriched some checks to include the treatment of MODE_DEFAULT - this will allow
pre-M apps uninterupted capability to draw on top of other apps.
Change-Id: I8de77730e158c97587427820cfba721bd5607bea
2015-07-16 00:34:26 +01: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
c4e2bcd4dc
Merge "Fix issue #22460110 : AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev
2015-07-15 23:30:19 +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
Svetoslav
eb16e1fb22
am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev
...
* commit '08dda27be4678f2ab5bdc7e210d511ec105c158c':
Make sure we get valid package name or fail.
2015-07-15 23:13:03 +00:00
Svetoslav
7395cbf070
Make sure we get valid package name or fail.
...
bug:22492225
Change-Id: I7b7dce9a8e398c4615bcb700de80241e94c4320c
2015-07-15 15:58:44 -07:00