Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,288 Commits 3 Branches 0 Tags
1663c5e91c6565f48af5d869c9aa822e4e3013a9
Commit Graph

50147 Commits

Author SHA1 Message Date
Dan Sandler
1663c5e91c am 19d6dae4: am cfaf2d54: am 8f895de9: am 86647987: Icon-related Notifications API changes: 
* commit '19d6dae447860c332501f7284e97c2734f7a040e':
  Icon-related Notifications API changes:
 2015-07-17 01:54:42 +00:00
Dan Sandler
cfaf2d54cb am 8f895de9: am 86647987: Icon-related Notifications API changes: 
* commit '8f895de9f43f661218fcc519d3722c0af5e5488b':
  Icon-related Notifications API changes:
 2015-07-17 01:25:49 +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
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
cb29a8a17a am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit '2fca4812336476e7c000214109b6c06b401986c2':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 00:50:06 +00:00
Svet Ganov
b958795675 am 1d75ba1b: am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 
* commit '1d75ba1bce3a69cc6b5fa018f64e0ef7e67f3e2f':
  Improve documentation of onRequestPermissionsResult
 2015-07-17 00:49:55 +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
Svet Ganov
69fd08a090 am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 
* commit 'b0f8fee845fa2e41ea1e003e413c3df59d641137':
  Improve documentation of onRequestPermissionsResult
 2015-07-17 00:19:30 +00: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
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
Svet Ganov
b295963bae am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit 'c00e49b6e4e4cc8356529567040d6ee3be8c1dc3':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 22:38:13 +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
61f0aec4f3 am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit '9236af43d8418459b939049d4e7a092d2b58bff8':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 22:11:51 +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
Svet Ganov
a73c88dbb8 am d019bce4: am e7b7049b: am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'd019bce4129b224e638dd4ec235387f85d19e052':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 20:12:01 +00:00
Svet Ganov
e7b7049b95 am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'f8847c02dce2c8ca66d29f8debf120c275b41f09':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 19:42:29 +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
de0fa318fb am 364c8065: am 5eea2455: am 245466b5: am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 
* commit '364c80657b8d70b1606845a987995b21e4f857b2':
  Fix calendar reminder notification is not shown in idle state
 2015-07-16 15:43:56 +00:00
Tony Mak
5eea245598 am 245466b5: am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 
* commit '245466b5734546264b0492455fd2f6dc135daf39':
  Fix calendar reminder notification is not shown in idle state
 2015-07-16 15:15:32 +00:00
George Mount
5ee9088a33 am d3682f6d: am aa476de5: am 2456f77c: am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev 
* commit 'd3682f6da6550c1a63ab62d5be0bb8622acd05d6':
  Make additional shared elements a version-checked feature.
 2015-07-16 15:09:51 +00: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
aa476de575 am 2456f77c: am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev 
* commit '2456f77c3f3ab001ac20cd7d8ee099c14f98271f':
  Make additional shared elements a version-checked feature.
 2015-07-16 14:42:29 +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
Billy Lau
1178526c35 am 0d360d17: am fa2584f6: am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit '0d360d17a4307f32f3179ade4d3730d0a02d227d':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 01:13:18 +00:00
Billy Lau
fa2584f6f5 am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit 'da93454bfa7c46ba5607c74252c458b48a473e9d':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 00:31:35 +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
213a883a3c am 822fd8f1: am 178d35d4: am fc569640: am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev 
* commit '822fd8f190696f4082537cec51c8a71790bd4885':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...
 2015-07-16 00:24:29 +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
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
Svetoslav
f25f3bd871 am 3c5fe9de: am 1f1f0cee: am eb16e1fb: am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit '3c5fe9de7fdbab2db277b8136552d85e809f0d54':
  Make sure we get valid package name or fail.
 2015-07-16 00:05:12 +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
f9aa4b4d35 am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit '309f9d6e7f777483f7ede3f8c7bd99ffd4794967':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-15 23:51:54 +00:00
Dianne Hackborn
178d35d48a am fc569640: am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev 
* commit 'fc5696404b88035aa9197faeb2ee0bdca284ca76':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...
 2015-07-15 23:51:45 +00:00
Dianne Hackborn
e12c549b7a am 0d04da1f: am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit '0d04da1fb71960c79820bb04cb65c7c41125fcee':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-15 23:51:34 +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