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

6300 Commits

Author SHA1 Message Date
Dianne Hackborn
e8a70aa403 am 556aa7dc: am 00e9e97f: am 47fefc5c: am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 
* commit '556aa7dc8c1fde7c053ef1c7cac830449eaee0d7':
  Fix issue #22653116: Google App crashing on NYT app
 2015-07-24 05:12:44 +00:00
Dianne Hackborn
556aa7dc8c am 00e9e97f: am 47fefc5c: am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 
* commit '00e9e97f7077f1812077a780c1f4fd5d3fa9f288':
  Fix issue #22653116: Google App crashing on NYT app
 2015-07-24 04:03:31 +00:00
George Mount
b8eb74989e am d2546854: am 44543451: am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit 'd254685497e95ba0f921ed3a4e69636008c7e129':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 22:06:38 +00:00
George Mount
d254685497 am 44543451: am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '44543451206a107934c9c74ed5a53d43d73070e8':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 21:48:55 +00:00
Dianne Hackborn
5507bb41b0 Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 2015-07-23 00:35:34 +00:00
Dianne Hackborn
3e8125b40e Fix issue #22653116: Google App crashing on NYT app 
We weren't correctly handling the root view of the window --
we were just pushing it on to the stack, but that means it got
written at the end.  Instead, we now immediately write it
after the window and let things follow from there.

Change-Id: I070c96bd2443f312a7c6f495d1bf72fa19c614d6
 2015-07-22 17:02:10 -07:00
George Mount
7c482463cb Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 2015-07-21 22:51:27 +00:00
George Mount
13d7032d59 Null checks to prevent NPEs in Fragments transactions. 
Bug 22631964

Change-Id: I20bc80bfb0ba5f1081d1c349b94db7c5475bcc51
 2015-07-21 14:30:24 -07:00
Qiwen Zhao
06e260b8db Merge commit '01fda527' 
Change-Id: I08b5e7e8576f463c00be12879b465fa9c8cda8f5
 2015-07-20 15:52:23 -07:00
Ricardo Garcia
ed013b6c9b am 3f655b83: am c42940c9: am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit '3f655b83d3a02779aeaa5e9e7921338889f60ce5':
  Fix for MidiManager bug
 2015-07-20 20:55:19 +00:00
Billy Lau
973bd8850a am 1ab5d397: am 68a2b655: am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 
* commit '1ab5d39764f2b8ab238bcb1b570b788e86c8067b':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
 2015-07-20 20:55:11 +00: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
Ricardo Garcia
3f655b83d3 am c42940c9: am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit 'c42940c96a4419528310f6dfc23444de385b4cb2':
  Fix for MidiManager bug
 2015-07-20 20:42:12 +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
Billy Lau
1ab5d39764 am 68a2b655: am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 
* commit '68a2b6552af226cbc014273bdef6ce353ebf348a':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
 2015-07-20 19:26:13 +00:00
Ricardo Garcia
2dcfc7a997 Merge "Fix for MidiManager bug" into mnc-dev 2015-07-20 18:03:45 +00:00
Billy Lau
072e04a7f1 Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 2015-07-20 17:57:30 +00:00
Billy Lau
24b9c8314b Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW 
through AppOps

Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.

Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb
 2015-07-20 18:36:39 +01:00
Selim Cinek
d8c486b51d am 56c4cef8: am 3967be02: am b59d3820: am 928b2bf7: am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 
* commit '56c4cef8dc767cacb7b8e2728f69992e9b6cb870':
  Fixed a bug where notifications were not posted on secondary users
 2015-07-17 02:36:31 +00:00
Selim Cinek
56c4cef8dc am 3967be02: am b59d3820: am 928b2bf7: am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 
* commit '3967be028d4009167b323491de12f8fff890054c':
  Fixed a bug where notifications were not posted on secondary users
 2015-07-17 02:24:41 +00:00
Dan Sandler
0b6fa13530 am 1663c5e9: am 19d6dae4: am cfaf2d54: am 8f895de9: am 86647987: Icon-related Notifications API changes: 
* commit '1663c5e91c6565f48af5d869c9aa822e4e3013a9':
  Icon-related Notifications API changes:
 2015-07-17 02:12:21 +00:00
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
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
Ricardo Garcia
47abda576e Fix for MidiManager bug 
Returning null if MidiManager service can't be created instead
of crashing with NPE.

bug: 22087661
Change-Id: Ia27835ea1197af2db04c3e7f1d2e7c9f32fddbd0
 2015-07-16 18:20:46 -07:00
Svet Ganov
6147505d81 am b9587956: am 1d75ba1b: am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 
* commit 'b9587956754a84015d5e80021379265f9a4a7bb0':
  Improve documentation of onRequestPermissionsResult
 2015-07-17 01:14:00 +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
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
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
6f561a24c9 Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 2015-07-16 23:51:53 +00:00
Svet Ganov
0f45c7c7c4 Improve documentation of onRequestPermissionsResult 
bug:22524902

Change-Id: Ic435171fa016d8841bea432c5c39d7b0a6a7b9e9
 2015-07-16 16:29:04 -07: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
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
a1ca11773a am a73c88db: am d019bce4: am e7b7049b: am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'a73c88dbb843bc8ce5f35782a89fe632c8330572':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 20:26:25 +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
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
George Mount
1a62b4fc02 am 5ee9088a: am d3682f6d: am aa476de5: am 2456f77c: am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev 
* commit '5ee9088a33109752ecfdfef2e9413386adee08a7':
  Make additional shared elements a version-checked feature.
 2015-07-16 17:17:54 +00:00
Svet Ganov
9e136b88ba Return a result from Fragment#shouldShowRequestPermissionRationale 
bug:22523342

Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
 2015-07-16 09:58:43 -07: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
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
Billy Lau
dd46de68ad am 1178526c: am 0d360d17: am fa2584f6: am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit '1178526c352a6784b520cd10a3a5686f9427d1b9':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 01:31:56 +00: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
Dianne Hackborn
c597f21afa am 213a883a: am 822fd8f1: am 178d35d4: am fc569640: am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev 
* commit '213a883a3ca5671ce43f7077e7618a1d2adc7e0c':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...
 2015-07-16 00:40:12 +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
Billy Lau
008409a2ea Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 2015-07-16 00:04:35 +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
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