Amith Yamasani
1ab19ea6e6
Merge "Retail mode flag and some clients for it" into nyc-mr1-dev
...
am: dbf0dbd8c2
2016-05-18 21:01:49 +00:00
Amith Yamasani
dbf0dbd8c2
Merge "Retail mode flag and some clients for it" into nyc-mr1-dev
2016-05-18 20:57:12 +00:00
Svetoslav Ganov
891fcc2779
Merge "Hide ephemeral API" into nyc-dev am: 68c2919f70
...
am: 1129a0f473
2016-05-18 20:21:07 +00:00
Svet Ganov
1129a0f473
Merge "Hide ephemeral API" into nyc-dev
...
am: 68c2919f70
2016-05-18 20:16:38 +00:00
Svet Ganov
75a364eabf
Merge "Hide ephemeral API" into nyc-dev
...
am: 68c2919f70
2016-05-18 20:16:33 +00:00
Svetoslav Ganov
68c2919f70
Merge "Hide ephemeral API" into nyc-dev
2016-05-18 20:10:28 +00:00
Robert Sesek
4b7f83870b
Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095c6
...
am: ffc715b8f5
2016-05-18 15:39:05 +00:00
Robert Sesek
ffc715b8f5
Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
...
am: f45bc095c6
2016-05-18 15:32:54 +00:00
Robert Sesek
a83b4cfc74
Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
...
am: f45bc095c6
2016-05-18 15:32:18 +00:00
Robert Sesek
f45bc095c6
Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
2016-05-18 15:25:41 +00:00
Svet Ganov
2265fddba6
Hide ephemeral API
...
bug:28825660
Change-Id: I4e9cdd6e29df44a173136aed13c4039443d944cc
2016-05-18 07:38:29 -07:00
Yohei Yukawa
bf4c8f730b
Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13
...
am: ddaf3f4681
2016-05-18 02:22:07 +00:00
Yohei Yukawa
ddaf3f4681
Merge "Move LocaleList to avoid layering violation." into nyc-dev
...
am: 31884efd13
2016-05-18 02:18:38 +00:00
Yohei Yukawa
13fa6b7c48
Merge "Move LocaleList to avoid layering violation." into nyc-dev
...
am: 31884efd13
2016-05-18 02:18:29 +00:00
Amith Yamasani
eb437d4dff
Retail mode flag and some clients for it
...
Bug: 27280140
Change-Id: Ide33e941b9c71eb925b5977d0b0d62198537ca14
2016-05-18 00:07:36 +00:00
Yohei Yukawa
23cbe85610
Move LocaleList to avoid layering violation.
...
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.
Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Robert Sesek
55b2d11cd3
Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.
...
Bug: 28775488
Change-Id: Ic0473d3664671f0ac5df8412f61ca8c1d029887f
2016-05-17 18:53:13 -04:00
Dianne Hackborn
ae5664af28
Merge "Fix issue #27532364 : Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5
...
am: a24af982ff#27532364 : Security Vulnerability in IIntentSender.send
Change-Id: Iea2b8a6b86f10122ea763e93e1516fce43e58dfa
2016-05-17 18:39:42 +00:00
Dianne Hackborn
4d7e92b56b
Merge "Fix issue #27532364 : Security Vulnerability in IIntentSender.send" into nyc-dev
...
am: 607844efa5#27532364 : Security Vulnerability in IIntentSender.send
Change-Id: Iaf3102ba03cf2242b02030aa24df8282ed3fbdc8
2016-05-17 18:38:28 +00:00
Dianne Hackborn
a24af982ff
Merge "Fix issue #27532364 : Security Vulnerability in IIntentSender.send" into nyc-dev
...
am: 607844efa5#27532364 : Security Vulnerability in IIntentSender.send
Change-Id: I749b455402caef335239b540ec8883a8d7b2a974
2016-05-17 18:32:46 +00:00
Dianne Hackborn
607844efa5
Merge "Fix issue #27532364 : Security Vulnerability in IIntentSender.send" into nyc-dev
2016-05-17 18:19:36 +00:00
Makoto Onuki
37d5cb3181
Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev
...
am: 8295332d83
2016-05-17 18:14:39 +00:00
Makoto Onuki
8295332d83
Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev
2016-05-17 18:01:29 +00:00
Makoto Onuki
20c95f854e
ShortcutManager: API changes for DR
...
See https://goto.google.com/shortcutmanager-spec-dr for
the details.
This CL contains changes to ShortcutInfo and all the new API
entry points, but not the implementation of the new APIs.
- ShortcutInfo.activityComponent is now mandatory.
- Publishers can now disable shortcuts. ShortcutInfo can now have
"disabled message".
- ShortcutInfo now supports string resources for all the String
fields.
-> When launcher fetches shortcuts, ShortcutService will
automatically load resources and expose as strings.
- LauncherApps now supports getShortcutIconDrawable() and
getShortcutBadgedIconDrawable() to be consistent with
LauncherActivityInfo.
- ShortcutInfo.weight is replaced with "rank".
- Added ShortcutManager.reportShortcutUsed(), which will be used for
usage tracking / suggestion.
Bug 28536054
Bug 28536066
Bug 28564134
Bug 28594168
Change-Id: Ib8245b39bb1e753991a9de89c0b73accacd90355
2016-05-16 16:25:50 -07:00
Alan Viverette
c46f3a4fe9
Merge "Update docs for ColorStateList to include alpha" into nyc-dev am: 5bcf7650b4
...
am: 3818d32374
2016-05-16 19:44:48 +00:00
Alan Viverette
3818d32374
Merge "Update docs for ColorStateList to include alpha" into nyc-dev
...
am: 5bcf7650b4
2016-05-16 19:40:47 +00:00
Alan Viverette
f10697e17b
Merge "Update docs for ColorStateList to include alpha" into nyc-dev
...
am: 5bcf7650b4
2016-05-16 19:40:26 +00:00
Alan Viverette
5bcf7650b4
Merge "Update docs for ColorStateList to include alpha" into nyc-dev
2016-05-16 19:30:38 +00:00
Alan Viverette
582dcac856
Update docs for ColorStateList to include alpha
...
Bug: 28760030
Change-Id: I309364002220b9896f5ddf29dabde79636a722e9
2016-05-16 12:37:55 -04:00
Dianne Hackborn
0c4e6a8da3
Fix issue #27532364 : Security Vulnerability in IIntentSender.send
...
We need to make IIntentSender oneway... but when the system is
calling that for itself, it needs to be able to return a result code.
Solution: instead of directly calling the interface, we have a new
IPC through the activity manager. If the thing being used is the
activity manager impl, it can do the synchronous send and return
the result directly in place. If not, you only get asynchronous
sending and thus never a failure result back (too bad for you!).
Change-Id: I4096e5b00063e8dba66230585a2dfe67e35e8092
2016-05-13 17:37:08 -07:00
Steve Pomeroy
4c8c470015
Merge "ContentValues: improve documentation" into nyc-dev
...
am: 33d0ff9959
2016-05-13 01:17:57 +00:00
Steve Pomeroy
b31b1cc5ff
ContentValues: improve documentation
...
Correct and clarify the documentation for ContentValues.
Signed-off-by: Steve Pomeroy <steve@staticfree.info >
(cherry picked from commit 1276b5f29e
2016-05-12 16:51:52 -07:00
Steve Pomeroy
d88ca0e659
Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902
...
am: b6c826227d
2016-05-12 22:29:25 +00:00
Steve Pomeroy
b6c826227d
Merge "ContentValues: improve documentation" am: b44d4207c1
...
am: 78e5a04902
2016-05-12 22:27:12 +00:00
Steve Pomeroy
1276b5f29e
ContentValues: improve documentation
...
Correct and clarify the documentation for ContentValues.
Change-Id: Iddf54da093e97c32da2568eab8802b1b2715303b
Signed-off-by: Steve Pomeroy <steve@staticfree.info >
2016-05-12 21:18:15 +00:00
Makoto Onuki
82c64a485a
Merge "Remove ShortcutManager" into nyc-dev
...
am: 26edcba2c9
2016-05-12 16:36:06 +00:00
Makoto Onuki
26edcba2c9
Merge "Remove ShortcutManager" into nyc-dev
2016-05-12 16:32:56 +00:00
Adam Lesinski
ad3773a154
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev am: 3723194dc8
...
am: 04d676b3ae
2016-05-12 01:23:54 +00:00
Adam Lesinski
04d676b3ae
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
...
am: 3723194dc8
2016-05-12 01:11:21 +00:00
Adam Lesinski
ebfb372876
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
...
am: 3723194dc8
2016-05-12 01:11:18 +00:00
Adam Lesinski
3723194dc8
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
2016-05-12 00:59:29 +00:00
Makoto Onuki
538c440c33
Remove ShortcutManager
...
Bug 28704708
Change-Id: If7b739adeec38d81d554fc1cf34c81194f5d67b9
2016-05-11 14:25:55 -07:00
Todd Kennedy
d2ebc5e3ab
Merge "Fix secondary ABI instrumetion" into nyc-dev am: f09f069936
...
am: fc7701c569
2016-05-11 14:44:34 +00:00
Todd Kennedy
fc7701c569
Merge "Fix secondary ABI instrumetion" into nyc-dev
...
am: f09f069936
2016-05-11 14:41:44 +00:00
Todd Kennedy
9580593e5d
Merge "Fix secondary ABI instrumetion" into nyc-dev
...
am: f09f069936
2016-05-11 14:41:41 +00:00
Todd Kennedy
f09f069936
Merge "Fix secondary ABI instrumetion" into nyc-dev
2016-05-11 14:35:19 +00:00
Greg Kaiser
bac3e57f3d
Merge "GradientColor: Fix typo in documentation." into nyc-dev am: a452dd3fd9
...
am: 9311165c2c
2016-05-11 12:42:17 +00:00
Greg Kaiser
9311165c2c
Merge "GradientColor: Fix typo in documentation." into nyc-dev
...
am: a452dd3fd9
2016-05-11 12:39:38 +00:00
Greg Kaiser
5662120923
Merge "GradientColor: Fix typo in documentation." into nyc-dev
...
am: a452dd3fd9
2016-05-11 12:39:34 +00:00
Greg Kaiser
2d609eda74
GradientColor: Fix typo in documentation.
...
Bug: 28678266
Change-Id: I8f551108643698a1b6c573911509a4e48ad88783
2016-05-10 17:05:31 -07:00
