Yohei Yukawa
af15c8bcae
Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681
...
am: bf4c8f730b
2016-05-18 02:25:10 +00: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
31884efd13
Merge "Move LocaleList to avoid layering violation." into nyc-dev
2016-05-18 02:14:26 +00:00
Andrii Kulian
5417ca597a
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev am: 47aa3f61ac
...
am: 06a325c3e3
2016-05-18 01:00:50 +00:00
Andrii Kulian
06a325c3e3
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
...
am: 47aa3f61ac
2016-05-18 00:55:12 +00:00
Andrii Kulian
47aa3f61ac
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
2016-05-18 00:51:17 +00:00
Adrian Roos
d7c7d1466a
Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf am: 3a0f4f4b64
...
am: 16e54ef2ff
2016-05-18 00:21:12 +00:00
Adrian Roos
16e54ef2ff
Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf
...
am: 3a0f4f4b64
2016-05-18 00:17:47 +00:00
Adrian Roos
3a0f4f4b64
Merge "Adjust Notification APIs per API council" into nyc-dev
...
am: 718ba309cf
2016-05-18 00:13:14 +00:00
TreeHugger Robot
718ba309cf
Merge "Adjust Notification APIs per API council" into nyc-dev
2016-05-18 00:06:30 +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
Adrian Roos
96b7e20ba6
Adjust Notification APIs per API council
...
Also fixes a slight bug where a CharSequence extra
was retrieved as a string.
Change-Id: I8a40ab1934b8a20355c3cd4afd66a4a7b91fb517
Fixes: 28775580
Fixes: 28775582
2016-05-17 15:35:33 -07:00
Dianne Hackborn
9b58317a39
Merge "Work on issue #28689719 : Runtime restart" into nyc-dev am: 77ad5f1657 am: ab82de14b1
...
am: a648b098f8#28689719 : Runtime restart
Change-Id: I77448a9fd570fb20b9f7c82c1f420f53afd61bae
2016-05-17 22:32:30 +00:00
Dianne Hackborn
a648b098f8
Merge "Work on issue #28689719 : Runtime restart" into nyc-dev am: 77ad5f1657
...
am: ab82de14b1#28689719 : Runtime restart
Change-Id: I9dc025c78a1d58cf46b73141063dda0c9632d502
2016-05-17 22:21:24 +00:00
Dianne Hackborn
ebfbc39537
Merge "Work on issue #28689719 : Runtime restart" into nyc-dev
...
am: 77ad5f1657#28689719 : Runtime restart
Change-Id: I29e0ef82bed0df030939b198d5a238405dc7486a
2016-05-17 22:07:01 +00:00
Dianne Hackborn
ab82de14b1
Merge "Work on issue #28689719 : Runtime restart" into nyc-dev
...
am: 77ad5f1657#28689719 : Runtime restart
Change-Id: Ic44a4f56be67e3a50932d6bfbb58cdca6536e501
2016-05-17 22:06:57 +00:00
Dianne Hackborn
77ad5f1657
Merge "Work on issue #28689719 : Runtime restart" into nyc-dev
2016-05-17 21:58:21 +00:00
Adrian Roos
e5b0923a02
Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: efc9c88d00
...
am: 31459c3202
2016-05-17 21:38:31 +00:00
Adrian Roos
31459c3202
Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700
...
am: efc9c88d00
2016-05-17 21:22:39 +00:00
Adrian Roos
efc9c88d00
Merge "Fix broken MessagingStyle" into nyc-dev
...
am: 8802fd0700
2016-05-17 21:17:33 +00:00
Adrian Roos
d91b14d862
Merge "Fix broken MessagingStyle" into nyc-dev
...
am: 8802fd0700
2016-05-17 21:17:10 +00:00
Adrian Roos
8802fd0700
Merge "Fix broken MessagingStyle" into nyc-dev
2016-05-17 21:02:25 +00:00
Andrii Kulian
5c96320e40
DO NOT MERGE Hide decor caption APIs
...
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.
Bug: 28774476
Change-Id: Ic2de33c5a611a515fc1c72535587ebf2e0a03a7f
2016-05-17 20:56:24 +00:00
Dianne Hackborn
2675616719
Work on issue #28689719 : Runtime restart
...
There are few paths I can see to get a null intent down into
the framework at this point. Add in some checks and reports
at those places to mitigate and report such problems.
Change-Id: If235bf342558321d3fabe9363fcebb2bcea18df1
2016-05-17 13:40:44 -07:00
Dianne Hackborn
fab87630f3
Merge "Fix issue #27532364 : Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5 am: a24af982ff
...
am: ae5664af28#27532364 : Security Vulnerability in IIntentSender.send
Change-Id: I96430b2073f2aafba489e5d2a0d11822709f4206
2016-05-17 18:44:56 +00: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
Michael Kwan
3ffbb6e7f9
Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev am: 59bce44aaa
...
am: 4fab094b07
2016-05-17 18:20:23 +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
Michael Kwan
4fab094b07
Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev
...
am: 59bce44aaa
2016-05-17 18:14:47 +00:00
Michael Kwan
59bce44aaa
Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev
2016-05-17 18:03:38 +00:00
Phil Weaver
2a72e8b390
Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 am: 11ece94702
...
am: 3070a2a97c
2016-05-17 17:41:19 +00:00
Phil Weaver
11ece94702
Merge "Hide UiAutomation#destroy as test api." into nyc-dev
...
am: 89d3ba72b7
2016-05-17 17:32:24 +00:00
Phil Weaver
89d3ba72b7
Merge "Hide UiAutomation#destroy as test api." into nyc-dev
2016-05-17 17:27:01 +00:00
Clara Bayarri
d1ad651149
Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027 am: 60d0910dc8
...
am: 4cfd27f9aa
2016-05-17 09:27:59 +00:00
Clara Bayarri
60d0910dc8
Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
...
am: bee2648027
2016-05-17 09:21:15 +00:00
Clara Bayarri
bee2648027
Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
2016-05-17 09:12:36 +00:00
Wale Ogunwale
fde6b69095
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 33cffe3717
...
am: f5a87d86bf
2016-05-17 01:10:44 +00:00
Wale Ogunwale
33cffe3717
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
...
am: b406dd20ee
2016-05-17 00:57:25 +00:00
TreeHugger Robot
b406dd20ee
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
2016-05-17 00:51:41 +00:00
Wale Ogunwale
3b23239d6e
Fixed bugs with starting windows when displayng forcedResized activity
...
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.
Bug: 28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
2016-05-16 16:27:01 -07:00
Michael Kwan
cc6e6f0e0a
Modified AlertController to allow themes to specify custom implementation.
...
Bug: 17733928
Change-Id: I0264ee8ceee09dbc33da61365c424c74d2e3c3d6
2016-05-16 15:36:22 -07:00
Phil Weaver
e6269c3f1d
Hide UiAutomation#destroy as test api.
...
Bug: 28771617
Change-Id: Ib113883d3d12fc6a9e8c038e2c4eb1731b026b38
2016-05-16 12:55:08 -07:00
Clara Bayarri
ab591ba4b6
Remove "if it succeeds" wording from requestShowKeyboardShortcuts
...
Bug: 28775576
Change-Id: Ib7bc2d78cc074c14384f5a86437c684462f1fb54
2016-05-16 17:48:16 +01:00
Clara Bayarri
bec98ff68b
Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d34396443e am: 8184f2e545
...
am: 8bccf39875
2016-05-16 15:18:36 +00:00
Clara Bayarri
8184f2e545
Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev
...
am: d34396443e
2016-05-16 15:08:15 +00:00
Clara Bayarri
ac6f034f2a
Rename requestKeyboardShortcutsHelper
...
Per API council feedback
Bug: 28775576
Change-Id: I1c4f98d7ec0d848f0c387aaedf8a0ed80628c64e
2016-05-16 14:15:14 +01:00
Narayan Kamath
9782056f16
LoadedApk: Avoid unnecessary work when mIncludeCode == false. am: 8995b00ce8 am: 150664c275
...
am: 9bfcf64542
2016-05-16 10:51:43 +00:00
