Michal Karpinski
96d49b1ac6
Merge "API polish in DPM for organization color and name methods" into nyc-dev
...
am: 1271cef
* commit '1271cef419bdb7577f64b1dfa05d5678df706ef5':
API polish in DPM for organization color and name methods
Change-Id: I6073662932fc256fc4860a19c4d45b1f9fcf9ced
2016-04-13 13:36:44 +00:00
Michal Karpinski
1271cef419
Merge "API polish in DPM for organization color and name methods" into nyc-dev
2016-04-13 13:28:08 +00:00
Jorim Jaggi
e203cdefa1
Merge "TRON refinements for multi-window" into nyc-dev
...
am: a74888d
* commit 'a74888ddf6657b41aed28dff0b0b1d47a80f107f':
TRON refinements for multi-window
Change-Id: I8a1a6d26bc94eca1afde2a1de920b4a39cd5e7f9
2016-04-13 04:26:04 +00:00
TreeHugger Robot
a74888ddf6
Merge "TRON refinements for multi-window" into nyc-dev
2016-04-13 04:18:31 +00:00
Suprabh Shukla
7b13098b62
Merge "Added api to delete cache files for a given user" into nyc-dev
...
am: 0a6a6db
* commit '0a6a6dbe9107a3e31d74293f853b46ae0e5b9e7b':
Added api to delete cache files for a given user
Change-Id: If8bc5327e76680d3d30127b1129e7c4c36928421
2016-04-13 03:17:24 +00:00
TreeHugger Robot
0a6a6dbe91
Merge "Added api to delete cache files for a given user" into nyc-dev
2016-04-13 03:13:49 +00:00
Jorim Jaggi
29379ec859
TRON refinements for multi-window
...
Bug: 26013430
Change-Id: I89b139b4ca3e7b6a06d8b5b351d67ffac240f73f
2016-04-12 19:43:52 -07:00
Suprabh Shukla
78c9eb8947
Added api to delete cache files for a given user
...
Added an api to delete application cache files for a specific user. This
allows settings to clear cache files for work profile apps as well.
Bug: b/25338468
Change-Id: I52d4944a7a03b6d63ad44dd6bb868aec62815eab
2016-04-12 18:23:56 -07:00
Adrian Roos
36feadc46c
Merge "Fix broken actions with MessagingStyle" into nyc-dev
...
am: 4ecc0ce
* commit '4ecc0ce387195c44f5737d5b155c0dd1ea00add7':
Fix broken actions with MessagingStyle
Change-Id: I9cdff69b8931564190217bc0bfe4396954c4efa5
2016-04-13 01:02:18 +00:00
Adrian Roos
28d6762456
Merge "Notification MessagingStyle: Add handset views" into nyc-dev
...
am: 4db2f1f
* commit '4db2f1f6020a82012bcd3141a22bd59e0baed1d5':
Notification MessagingStyle: Add handset views
Change-Id: Ib1971c6c1d8aa07ef586073bf2316f2b3b18bfab
2016-04-12 22:22:15 +00:00
Shreyas Basarge
8a71af509a
Merge "Documentation for flex field" into nyc-dev
...
am: 997743d
* commit '997743d29e46ed034a0769e765a5ce83cd3f903a':
Documentation for flex field
Change-Id: I6ef9763ec0c6e333ddae002e6dcf4a66d862464e
2016-04-12 22:21:00 +00:00
Adrian Roos
48d746ab32
Fix broken actions with MessagingStyle
...
Bug: 27250207
Change-Id: I073bb0ef055423a6c152af0e98fe846b15511d11
2016-04-12 15:00:31 -07:00
TreeHugger Robot
4db2f1f602
Merge "Notification MessagingStyle: Add handset views" into nyc-dev
2016-04-12 20:12:41 +00:00
Shreyas Basarge
997743d29e
Merge "Documentation for flex field" into nyc-dev
2016-04-12 19:35:21 +00:00
Adrian Roos
c1a80b08f0
Notification MessagingStyle: Add handset views
...
Bug: 27250207
Change-Id: I499cf2beaeeb34f0f189815fc0911f3b8954bd50
2016-04-12 11:52:49 -07:00
Alex Hills
06660697a3
Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev
...
am: e3f3cb1
* commit 'e3f3cb10484260fac167e59d0178902a63ea7a6b':
Fixes name of intent launch flag for Action Extender
Change-Id: Idbfc4beca1067031b9a7608930aa61779644901e
2016-04-12 17:24:10 +00:00
Alexander Hills
e3f3cb1048
Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev
2016-04-12 17:10:19 +00:00
Alex Hills
4ec3ff4f8f
Fixes name of intent launch flag for Action Extender
...
Changes the name from set/getHintContentIntentLaunchesActivity
to set/getLaunchesActivty
Change-Id: I8ef879ae82cc360163fcd689eb5fad0d2b9d7db0
2016-04-12 11:44:36 -04:00
Michal Karpinski
74cd73079c
API polish in DPM for organization color and name methods
...
- Returning and accepting CharSequence instead of String
- Enforcing 100% opacity and adjusting javadocs for color
format
- Adding @ColorInt annotations
Bug: 27531295
Change-Id: Id27d4fd5e7bb4d746cc61288457eb4eb86224505
2016-04-12 15:17:52 +01:00
Shreyas Basarge
9e6d588c93
Documentation for flex field
...
Add documentation for getFlexMillis in JobInfo.
Bug: 27530396
Change-Id: I98319cd8ceb0ecd56ab3000bdd31d8bca1bacc3f
2016-04-12 11:04:53 +01:00
Jeff Sharkey
4ed2fb8b5c
Merge "Fix notifications that are sent for USER_ALL." into nyc-dev
...
am: 01a1ad5
* commit '01a1ad511e126aca0b445457f06e31f903b84ffb':
Fix notifications that are sent for USER_ALL.
Change-Id: I73f0984bf8d298017577fbe20406a0f19996fed6
2016-04-11 23:25:25 +00:00
Makoto Onuki
0beb56d4e4
Merge "ShortcutManager: First cut of CTS" into nyc-dev
...
am: bc20320
* commit 'bc20320f7f224d1cc5be3c436a1a5ece2067f2ec':
ShortcutManager: First cut of CTS
Change-Id: I23d24480870644cf69575d2f11bfc55056c0fb96
2016-04-11 23:25:23 +00:00
Jeff Sharkey
01a1ad511e
Merge "Fix notifications that are sent for USER_ALL." into nyc-dev
2016-04-11 23:19:07 +00:00
Jeff Sharkey
012bc7bb9f
Fix notifications that are sent for USER_ALL.
...
Also avoid creating a heavy LoadedApk object which will be cached
around in the long-lived system process.
Bug: 28116427
Change-Id: I1a5fc43e6d559a09088636b2fe4b5c76f08d3413
2016-04-11 17:18:29 -06:00
Makoto Onuki
bc20320f7f
Merge "ShortcutManager: First cut of CTS" into nyc-dev
2016-04-11 23:11:41 +00:00
Adam Powell
701bb7ae13
Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev
...
am: e60b8f8
* commit 'e60b8f897065a9600058a7b958f1e0bcd198b0b5':
Prevent duplicate loader onLoadFinished calls on config change
Change-Id: I93fd543a33d9a78f7dbbcadb3261b2e53fd8f2ba
2016-04-11 23:09:36 +00:00
Makoto Onuki
5ba0d3e3a3
ShortcutManager: First cut of CTS
...
Bug 27548047
Change-Id: Idd7a768ea4fee44c2cf6e3bd473cea9e67f5f7cd
2016-04-11 14:48:44 -07:00
Adam Powell
eba13dd07f
Prevent duplicate loader onLoadFinished calls on config change
...
Loaders report entering the started state in two places, once from
their host callbacks and once when moving into their host fragment's
starting state. In the former, we will also deliver load results if
we're finishing a retained cycle.
In practice, the individual fragment start happens first which clears
the report-next-start flag, then the finishRetain step sees that flag
is cleared and dispatches the finished load results again. Change
reportStart to only call onLoadFinished if we are not finishing up a
retain step.
Bug 28074512
Change-Id: I85b848f7d7b239c8fac5aec8f0c91e4eea6bcebf
2016-04-11 14:26:58 -07:00
Benjamin Franz
9a9a9aa9b3
Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev
...
am: 3f7fdaa
* commit '3f7fdaaa766104cc5b8946676c9187661cb60aa7':
Revert "Throw security exception for non-parent aware APIs"
Change-Id: I2c4754cb70096372f2b04f1f52ecc2c93a5f8ae2
2016-04-11 14:41:38 +00:00
Benjamin Franz
3f7fdaaa76
Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev
2016-04-11 14:32:49 +00:00
Benjamin Franz
a26c626564
Revert "Throw security exception for non-parent aware APIs"
...
This reverts commit bd7ae782ed .
Bug: 28107853
Change-Id: Ic286d9a181e96b8eb9826dab9ed297e0e4dfa6de
2016-04-11 12:43:17 +00:00
Clara Bayarri
3f192435a9
Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev
...
am: 738ab04
* commit '738ab04fd94746d47ebeffa97252b7e3fb2a8d93':
Expose the Keyboard Shortcuts Helper in Activity
Change-Id: I94122c113dd2eb8b02f21563f50d898f89db5515
2016-04-11 09:47:39 +00:00
Clara Bayarri
738ab04fd9
Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev
2016-04-11 09:43:16 +00:00
Amith Yamasani
597965f538
Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev
...
am: 0cc0381
* commit '0cc0381714f0356dd6cece201265b368fa2706b6':
Improved javadoc for onLocalVoiceInteractionStopped
Change-Id: I81a9d06e3ce67859f32476f7a5c2c3b87e6f8d4f
2016-04-09 01:43:20 +00:00
Amith Yamasani
0cc0381714
Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev
2016-04-09 00:47:23 +00:00
Julia Reynolds
af343d6796
Merge "Allow the ranker to autobundle notifications." into nyc-dev
...
am: 3898db9
* commit '3898db9e152ff8e2b34ae97f4a2ed37b9cb667db':
Allow the ranker to autobundle notifications.
Change-Id: I652a43365b8eee51e91ed1c5d22aacb1b488e373
2016-04-09 00:41:35 +00:00
Dianne Hackborn
97907066c6
Merge "Fix issue #28075893 : Don\'t hold strong refs on to JobService" into nyc-dev
...
am: 6827db3
* commit '6827db3e5fccb5185009ad5ac6a9e30d17573bf2':
Fix issue #28075893 : Don't hold strong refs on to JobService
Change-Id: I0112842918f713cbf30d061f82dcdfa4e8c084ca
2016-04-09 00:40:37 +00:00
Andrii Kulian
d4b770e16e
Merge "Fix multiple configuration changes in multiwindow" into nyc-dev
...
am: 21400cb
* commit '21400cb552f5dc7f4c8296be53fabaa46b03fa85':
Fix multiple configuration changes in multiwindow
Change-Id: I01db63f6b8899ad04fad72b759611a550b3b42ac
2016-04-09 00:39:52 +00:00
Julia Reynolds
3898db9e15
Merge "Allow the ranker to autobundle notifications." into nyc-dev
2016-04-08 20:13:45 +00:00
Dianne Hackborn
6827db3e5f
Merge "Fix issue #28075893 : Don't hold strong refs on to JobService" into nyc-dev
2016-04-08 19:28:42 +00:00
Andrii Kulian
21400cb552
Merge "Fix multiple configuration changes in multiwindow" into nyc-dev
2016-04-08 19:05:20 +00:00
Andrii Kulian
701214b282
Fix multiple configuration changes in multiwindow
...
When in split-screen mode and activity handles configuration changes
it gets 2 onConfigurationChanged calls which originate from
ActivityManagerService#updateConfigurationLocked:
1. app.thread.scheduleConfigurationChanged calls to all process records
send configuration of the whole screen for corresponding orientation,
which leads to CONFIGURATION_CHANGED message in ActivityThread.
2. mStackSupervisor.resizeStackLocked call resizes both visible stacks and
eventually ActivityThread receives ACTIVITY_CONFIGURATION_CHANGED
message with correct configuration corresponding to space occupied in
split-screen.
In this CL if component callback is an instance of Activity and it had
override config set - onConfigurationChanged will not be triggered unless
override config has changed.
Bug: 27948331
Change-Id: Ia73b045570b44eb5b351811bf6c4f63d78c3f909
2016-04-08 11:58:43 -07:00
Julia Reynolds
e46bb37acf
Allow the ranker to autobundle notifications.
...
Bug: 26709317
Change-Id: I5017a471604e513a7b582cdc2f3472441e108fae
2016-04-08 13:55:03 -04:00
Amith Yamasani
d8d967e425
Improved javadoc for onLocalVoiceInteractionStopped
...
Improved docs per API review: b/27365473
Change-Id: I8e2fd5291ecf3c41b4c1fa4df62b0dc69597c122
2016-04-08 09:57:01 -07:00
Benjamin Franz
1acb890351
Merge "Throw security exception for non-parent aware APIs" into nyc-dev
...
am: 5c1fbad
* commit '5c1fbadb1a1169186b7a0a357ae9c35183258c6c':
Throw security exception for non-parent aware APIs
Change-Id: Ibfddb4d0894644adec0ea5aa9e9c7e55431ce5be
2016-04-08 12:08:47 +00:00
Benjamin Franz
5c1fbadb1a
Merge "Throw security exception for non-parent aware APIs" into nyc-dev
2016-04-08 12:02:26 +00:00
Dianne Hackborn
0796e9fb3d
Fix issue #28075893 : Don't hold strong refs on to JobService
...
Change-Id: I822adaee953be9b14213def001b174d5c348fa14
2016-04-07 17:29:36 -07:00
Jorim Jaggi
220a9090ac
Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev
...
am: 7c3912e
* commit '7c3912e4abc71886ad41e7be67d4eff41974d21f':
Dismiss docked stack when opening non-resizable activity
Change-Id: I3c4953fdafc45b55217c9362799f88aeb23ca799
2016-04-07 23:52:43 +00:00
Jorim Jaggi
7c3912e4ab
Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev
2016-04-07 23:40:44 +00:00
Tim Murray
f2a63fda7d
Merge "Improve service start/creation tracing." into nyc-dev
...
am: d8ca02f
* commit 'd8ca02f25225a033ad0f69e1ad4a2af5df289db2':
Improve service start/creation tracing.
Change-Id: I8bb66e4d51d05d98474d84d901182c52f98c4c4c
2016-04-07 23:30:18 +00:00