Commit Graph

3382 Commits

Author SHA1 Message Date
Adam Powell
c41fa70827 am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev
* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
  onWindowDismissed API cleanup
2014-05-06 20:20:40 +00:00
Adam Powell
a0516e7ad1 Merge "onWindowDismissed API cleanup" into klp-modular-dev 2014-05-06 20:17:31 +00:00
Adam Powell
117b695222 onWindowDismissed API cleanup
Move the window swipe to dismiss plumbing off of Window.Callback into
its own internal interface implemented by Activity and Dialog. Make it
internal API instead of public. Apps should control this via the
window feature setting.

Change-Id: I64cd237fa7eab08719b2c34e31dac7d34f02563a
2014-05-05 18:20:47 -07:00
Griff Hazen
36ef0792d2 am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT)
* commit 'ed0c87e7cdd2f641b6ed78df62b20a9f08ac16bb':
  DO NOT MERGE Hide Notification categories from API 20 (KKWT)
2014-05-05 22:49:51 +00:00
Griff Hazen
ed0c87e7cd DO NOT MERGE Hide Notification categories from API 20 (KKWT)
Bug: 14116162

Change-Id: I59e499dde9a06a4bf455eecb3665afaa1b574dae
2014-05-05 15:45:08 -07:00
Craig Mautner
9bb4df3a7d am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev
* commit 'e88097bd00d5710bbfb6c24a934743c8d6cac9cf':
  Pause and resume ActivityView when visibility changes
2014-05-05 21:03:39 +00:00
Craig Mautner
d13a558397 Pause and resume ActivityView when visibility changes
Once a Surface has been established the activity in an ActivityView
must be paused and resumed as the view goes in and out of visibility
= View.GONE.

Fixes bug 14034658.

Change-Id: Icab43678053c225db70f051dceacd4d024df2153
2014-05-05 12:07:40 -07:00
Michael Wright
474b07497b am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '809c369892ddbae908dc47e6a1032a768e9004cb':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
2014-04-30 19:11:05 +00:00
Michael Wright
809c369892 am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '54c3529b4d3f86488799caa0e62a1f3929a79a39':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
2014-04-30 19:06:40 +00:00
Allen Shen
1c0f21ea84 WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Originally the api 'getCropAndSetWallpaperIntent' does not check
whether the parsed parameter is a NULL pointer, as leads to the
whole app crash if it call this api with a null parameter accidentally.
A null pointer check logic is added into its original parameter check
logic, so that this API will throw an IllegalArgumentException if it
is parsed with a null pointer

Change-Id: Ib7de40e571419d09e1a744edc969eb7162766b75
2014-04-30 17:09:19 +08:00
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
Griff Hazen
e638b84436 am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit '3c5a6cf93520be23e6d5a9bc4cb8f4e8c18214b1':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:37:24 +00:00
Griff Hazen
3c5a6cf935 am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit '2c6131bba957dc5b4e1638bb8b0c10ebddf2049a':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:33:22 +00:00
Adam Lesinski
734a78fb86 am 8ea2d451: Merge "Various CTS fixes" into klp-modular-dev
* commit '8ea2d4512248ec612356f558ac35534c3e4c6db6':
  Various CTS fixes
2014-04-28 20:33:09 +00:00
Adam Lesinski
8ea2d45122 Merge "Various CTS fixes" into klp-modular-dev 2014-04-28 20:30:35 +00:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
2014-04-28 18:36:53 +00:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system.
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
2014-04-28 11:11:32 -07:00
Griff Hazen
293977bdb0 Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
The logic was opposite.

Change-Id: I62e0b1e6701a4c9990119a1b94918e64783e9b1a
2014-04-28 10:32:21 -07:00
Craig Mautner
cb48b96223 am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev
* commit '1a7e9e66a6de039da8f567a2087d9bce34820746':
  Throw exception from startActivity if not allowed.
2014-04-25 18:45:06 +00:00
Craig Mautner
247ab65a49 Throw exception from startActivity if not allowed.
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
2014-04-25 11:20:01 -07:00
Adam Lesinski
2c8d67c9b0 Various CTS fixes
WallpaperManager should always do a null check on the service object.
SystemServer should always bring up the DevicePolicyManagerService,
and let the service do appropriate default no-ops if the feature
is not supported.

Change-Id: Iaaf12b60ed375fe2e341ec11faa10c9344d7d9da
2014-04-25 11:07:39 -07:00
Craig Mautner
43c6a98f0f am 6985badc: Fix black ActivityView
* commit '6985badc632f2ff8425aa86423577a96eafc49e9':
  Fix black ActivityView
2014-04-22 13:27:53 +00:00
Craig Mautner
51bd56c953 am 6cdf51f2: Don\'t use finalize on ActivityView to cleanup.
* commit '6cdf51f21df1ca2397618635767e6e53a65799ad':
  Don't use finalize on ActivityView to cleanup.
2014-04-22 13:27:49 +00:00
Craig Mautner
c00c89b1ad am f4c909bc: Fix ActivityView lifecycle
* commit 'f4c909bcb87d6f103c9f9e8255fa61bd86f4de67':
  Fix ActivityView lifecycle
2014-04-22 13:27:44 +00:00
Craig Mautner
6985badc63 Fix black ActivityView
Don't add the surface to the VirtualDisplay until the activity
has drawn. That will keep the TextureView from turning black.

Fixes bug 12821632.

Change-Id: Ia06e9f91be3e14ad724f735ae4e201ac798863a2
2014-04-21 15:28:43 -07:00
Craig Mautner
6cdf51f21d Don't use finalize on ActivityView to cleanup.
Use a static object to contain the IActivityContainer reference
rather than storing it directly in the ActivityView itself. Then
when the ActivityView gives up the reference we can use a clean
finalize() call to release the IActivityContainer.

Fixes bug 14184756.

Change-Id: I7e05fcce3040b2b958f7c9cd030d5e3b745f3169
2014-04-21 15:28:43 -07:00
Craig Mautner
f4c909bcb8 Fix ActivityView lifecycle
Major changes to maintain the VirtualDisplay across repeated
attach/detach cycles of an ActivityView. This keeps the activities
and VirtualDisplays in the ActivityView from getting into bad states.

Fixes bug 14107002.

Change-Id: Idc2aaf85ac496eab0eeb436736cb10a2020040e8
2014-04-21 15:28:42 -07:00
Craig Mautner
4b81e89d9b am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev
* commit '2fd3cb9544df1e09caa725a8d542cf2fe1df0c75':
  Fix ActivityContainer callback parcelling.
2014-04-16 20:10:26 +00:00
Craig Mautner
e3a00d745f Fix ActivityContainer callback parcelling.
The Binder interface for passing a callback was not implemented
properly. Also the callback for ActivityContainer now has a new
API.

Change-Id: I6b719be0cb57542f022a3cc14e8f4efde60b1a50
2014-04-16 13:03:26 -07:00
Jose Lima
9e99cab7d9 am 970417c7: Added getLeanbackLaunchIntentForPackage()
* commit '970417c7d3e33ccbd6918e28d9bc5da24651f5b3':
  Added getLeanbackLaunchIntentForPackage()
2014-04-11 18:58:43 +00:00
Jose Lima
970417c7d3 Added getLeanbackLaunchIntentForPackage()
Change-Id: I23be3bfa59be812a915adc37e08fdf59be8ad90f
2014-04-11 10:54:39 -07:00
Jeff Brown
6fdb5e6df1 resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded
2014-04-09 16:47:40 -07:00
Jeff Brown
13014b5fe5 Move certain internal activity manager methods to new class.
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.

Deleted the startRunning method since it is no longer useful.

Bug: 13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
2014-04-08 20:51:07 -07:00
John Spurlock
642421aa7f am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
2014-04-04 19:28:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
2014-04-04 15:21:53 -04:00
Katie McCormick
fb19fc61f2 am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.
* commit '905a5b1477b3a1899ef389dbe081f9c70a4fe13d':
  Doc Update: revert PendingIntent fix.
2014-04-01 00:21:34 +00:00
Katie McCormick
905a5b1477 am 87d9d1a0: Doc Update: revert PendingIntent fix.
* commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753':
  Doc Update: revert PendingIntent fix.
2014-04-01 00:15:52 +00:00
Katie McCormick
87d9d1a040 Doc Update: revert PendingIntent fix.
Original fix was in error. Reverting. See:

b/10641568

Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
2014-03-31 16:18:15 -07:00
John Spurlock
ec27a7caf3 am 5579ec33: DO NOT MERGE Enhance the NotificationListenerService api.
* commit '5579ec33eb317a19ad80929169b2b329b147d98b':
  DO NOT MERGE Enhance the NotificationListenerService api.
2014-03-28 19:01:10 +00:00
John Spurlock
5579ec33eb DO NOT MERGE Enhance the NotificationListenerService api.
Add to NotificationListenerService:
 - getActiveNotificationKeys() : String[]
 - getActiveNotifications(String[] keys) : StatusBarNotification[]
 - cancelNotifications(String[] keys) : void
 - onListenerConnected(String[] keys) : void

Add to StatusBarNotification:
 - getKey() : String

Bug:13562828
Change-Id: I9da222cb4af22864bc0ecdecc3f121bced0723d6
2014-03-28 10:19:00 -04:00
John Spurlock
e2cae0a657 am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '2b45d84e24946d0cbbcc577ca3e195c0db687c9a':
  Unhide Notification kind, rename to category.
2014-03-24 17:44:53 +00:00
John Spurlock
cf44a124ab Unhide Notification kind, rename to category.
Change-Id: I8e6d5a30dff519d7ed4f38e018646dd2bc55db33
2014-03-24 11:02:36 -04:00
Jinsuk Kim
3c34e5dbbb am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit 'c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
  Add HdmiCecManager
2014-03-24 12:26:51 +00:00
Jinsuk Kim
c01e1aeb0d Merge "Add HdmiCecManager" into klp-modular-dev 2014-03-23 23:24:44 +00:00
Jinsuk Kim
fbcd503645 Add HdmiCecManager
Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).

Change-Id: I39da071a328074a4b7b049947943688bd7779c26
2014-03-24 08:19:39 +09:00
Unsuk Jung
7bde0fc751 am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '2270ac96d5d8ab6c2d1601f8dd5d8409762fb35f':
  Change wallpaper sizing
2014-03-21 19:17:01 +00:00
Unsuk Jung
2270ac96d5 am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '8114c3d02d6bf72c0627aea6ecf738074ac3f232':
  Change wallpaper sizing
2014-03-21 19:11:01 +00:00
Unsuk Jung
b35962f77c am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '8114c3d02d6bf72c0627aea6ecf738074ac3f232':
  Change wallpaper sizing
2014-03-21 19:10:57 +00:00
Unsuk Jung
8114c3d02d am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '1a70f391608e82fcc5550c76ccc7bf8bac5bbc10':
  Change wallpaper sizing
2014-03-21 19:05:40 +00:00
Michael Jurka
3368a63c64 Change wallpaper sizing
Bug: 11997581

- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary

Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
(cherry picked from commit 824a4b5ea4)
2014-03-21 10:29:27 +00:00