drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,819 Commits 1 Branch 0 Tags
Commit Graph

9117 Commits

Author SHA1 Message Date
John Reck
bf463af2a5 Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 2014-10-21 20:59:53 +00:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas 
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
 2014-10-21 13:23:56 -07:00
Wale Ogunwale
393b1c1e88 Fix issue #17789629: PopupWindow overlaps with navigation bar. 
The Lollipop release introduced a feature that allowed
apps to extend under the navigation bar. This also means
any popup window that is anchored to the bottom of its
parent window will overlap with the navigation bar if the
parent window is extending underneath the navigation bar.

This change introduces a new window flag
(FLAG_LAYOUT_ATTACHED_IN_DECOR) that allows the app to
specify if the popup window should be attached to the decor
frame of the parent window thereby avoiding an overlap
with the screen decorations.

By default the flag is set on SDK version LOLLIPOP_MR1 or
greater and cleared on lesser SDK versions.

Also, replaced flags FLAG_NEEDS_MENU_KEY and
PRIVATE_FLAG_NEEDS_MENU_KEY_SET with needsMenuKey state
variable to make room for the new
FLAG_LAYOUT_ATTACHED_IN_DECOR flag.

Bug: 17789629
Change-Id: I2150e0c6ac688c966c0e8f7e54d42fd20285bea6
 2014-10-21 12:45:53 -07:00
Adam Powell
0b3c11260a Intent chooser callback 
Let an app specify an IntentSender as an extra for ACTION_CHOOSER that
will be notified of the user's chosen target. Apps can use this to
implement things like one-touch last used affordances without
implementing their own one-off chooser UI.

Bug 17363684

Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
 2014-10-21 12:17:50 -07:00
Ye Wen
2cb65604bc Send HTTP status code back in case of MMS HTTP failure (1/3) 
We need this in SMS app so that we can treat 404 specially

b/17520290

Change-Id: Ifae1c1b323411143c740fb589c2b978b5ff9bc4e
 2014-10-21 10:58:06 -07:00
Andrew Lee
1557a226a7 Merge "Add functions to update on conference changes." into lmp-mr1-dev 2014-10-18 00:15:36 +00:00
Dianne Hackborn
3182987eb8 am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit 'bab9b48efcc55ee247c428aa3f53725c25222166':
  SDK only: hide the old L API version constant.
 2014-10-17 18:53:37 +00:00
Andrew Lee
4b116453e8 Add functions to update on conference changes. 
+ Add onConferenceChanged() to Connection, so that the Connection can
make act on changes to the conference.
+ Add a utility function to PhoneCapabilities to remove a capability
from a PhoneCapabilities bitmask. Figure this abstracts some bit
logic away to make things more readable.

Bug: 17429707
Change-Id: I0c97731a95dd6573488cd10f094a63abe2428bce
 2014-10-17 10:38:02 -07:00
Dianne Hackborn
bab9b48efc am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit '52476989b8afc0e96c2218625031ed550b12c79b':
  SDK only: hide the old L API version constant.
 2014-10-17 17:15:08 +00:00
Dianne Hackborn
3b6968876f Add API level for MR1. 
Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e
 2014-10-16 18:14:12 -07:00
Dianne Hackborn
d3511d4be1 SDK only: hide the old L API version constant. 
Also update the LOLLIPOP version constant to describe more things
that change when you target it.

Change-Id: I15e2c26a0f997ff2bfc8dd5076c827da7f42ee66
 2014-10-16 17:49:45 -07:00
Alan Viverette
8afc90fd71 Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 2014-10-16 00:44:36 +00:00
Alan Viverette
29632521c3 Add style support to PopupMenu, clean up constructor javadoc 
BUG: 18002523
Change-Id: Ice492686b814460248ccbe9727c64dd002e7ed7a
 2014-10-15 17:19:30 -07:00
Jay Shrauner
2ec53ebbc6 Remove unused onConferenceWith method 
Never part of public API

Bug:17860628
Change-Id: Ib7c4f4c402bd29d82cc0b9e1f496496ea86efce1
 2014-10-15 11:48:04 -07:00
Dongwon Kang
ba766977f5 TIF: Define more cannonical genres in TvContract 
Background: while categorizing broadcast genres into cannonical genres,
it turned out that the existing 11 genres are not enough. 6 more genres
are added.

Bug: 17597747
Change-Id: I14c00771d69f1e30fc2c0e3978298c67066117e5
 2014-10-15 11:32:20 +09:00
Amith Yamasani
2079133871 am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '4bf0356ee2058c7f033a41e02fa3eb86909c450c':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-14 22:04:01 +00:00
Amith Yamasani
4bf0356ee2 am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '15a5f82f9b6b389614b1df78749bd627d97d5417':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-14 19:57:46 +00:00
Amith Yamasani
6d93491f50 Hide DISALLOW_OUTGOING_BEAM API 
This is not fully functional in managed profiles, so it is being removed for L.

Bug: 17973040
Change-Id: If660e5e565076cdf61649e9f5ca12877425e9df3
 2014-10-14 09:31:30 -07:00
Adam Lesinski
03be7ab529 am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '6167950b7a5a8b9f021e9656b42b9b48bfbcbf80':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 16:57:34 +00:00
Adam Lesinski
6167950b7a am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 16:46:14 +00:00
Dianne Hackborn
d83e9e4280 am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:03:21 +00:00
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-09 00:14:54 +00:00
Adam Lesinski
59d208ddc1 Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-dev 2014-10-08 20:34:55 +00:00
Adam Lesinski
54e064bcea Remove UsageEvents#resetToStart() as it doesn't work 
After completely iterating over a UsageEvents object, the internal parcel
is recycled. If resetToStart is called then, it does nothing.

Bug:17909428
Change-Id: I7bc68d3429e4621a50dedbfc1789576d44dbb3be
 2014-10-08 12:33:16 -07:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Pete Gast
af6781dcfe Expand WearableExtender to customize labels. 
BUG: 15774526
Change-Id: I5796ab0e27975b5746d677be084b1ba1ada80a76
 2014-10-07 15:17:36 -04:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:22:53 +00:00
Dianne Hackborn
90d557b7a6 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:17:10 +00:00
Adam Powell
00092db1af Fix build breakage in API check 
Change-Id: I0fe7849b8b834fb32b13e60657685f72d1110d21
 2014-10-06 10:11:43 -07:00
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change 
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
 2014-10-03 16:26:04 -07:00
Ihab Awad
463dcae219 Update api/current.txt 
Changes made in branch lmp-dev are @hide-den there but not here. When
they propagate downstream, we need to update api/current.txt.

Change-Id: Ic267f62391503d9acfb8451b16d5bb18035c948c
 2014-10-02 10:13:30 -07:00
Przemyslaw Szczepaniak
16f5ec1207 am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit '8924617dd13785fa6285d5f9eb6fd20423077a73':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:31:04 +00:00
Przemyslaw Szczepaniak
d95788bf85 am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit 'f0a7c7672f158bc85ce400c1f59ec7fd973855d2':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:17:53 +00:00
Przemyslaw Szczepaniak
759962ab6d Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 2014-09-26 08:11:23 +00:00
Sailesh Nepal
57c4452e7b Run update-api to fix build 
Change-Id: Idfbf5aad2d693833bb3ac8ce77ad0331bd4f3613
 2014-09-25 18:46:45 -07:00
Junda Liu
8aa0aa538f Update api/current.txt to unhide APIs by ag/554960 
Bug: b/17639966
Change-Id: Ic11f362b170cf6fa16ce16a606c47f045bee9900
 2014-09-25 16:04:15 -07:00
Junda Liu
f52ac900ca Revert "Hide CarrierPrivilege APIs in TelMgr." 
This reverts commit b7aa9e4a6338811d4dacc77e6024a0b97a99e5e9.

Change-Id: I212cd4f1b7b45e0523fc47b2a9c2a6b487e9dbb5
 2014-09-25 18:56:11 +00:00
Ye Wen
ba049f7632 am a0945b40: resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev 
* commit 'a0945b409818052e8bc0e2a8711dbed6b2e56e33':
  Hide carrier app intents in Telephony (1/2)
 2014-09-25 18:27:55 +00:00
Ye Wen
7558bde120 resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev 
Change-Id: Ic27b03fa49bb921c36cd2825bf5486903dfd0317
 2014-09-25 11:20:08 -07:00
Junda Liu
cfac510914 am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '63f0b87ee3a0df19eec15e73cfbfb9b97623534c':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-25 18:17:52 +00:00
Junda Liu
cb6b5f9bd1 am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '96c548791145ab33ceb0935f38323d3182d44419':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-25 17:46:39 +00:00
Ye Wen
864a8b667a Merge "Hide carrier app intents in Telephony (1/2)" into lmp-dev 2014-09-25 17:36:32 +00:00
Junda Liu
698b3b2981 Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 2014-09-25 17:36:11 +00:00
Junda Liu
bac6d61ab6 Hide CarrierPrivilege APIs in TelMgr. 
Per API council decision, we will polish and public in MR1.

Bug: b/17639966
Change-Id: Id009cd62b4d44dd17fe7a30e0f8037c6fb373c32
 2014-09-25 10:25:10 -07:00
Ye Wen
6c88ddaef6 Hide carrier app intents in Telephony (1/2) 
b/17608135

Change-Id: Ib42d40cf8aac98f62c7237fa450463ff7c1a0f47
 2014-09-25 09:30:06 -07:00
Przemyslaw Szczepaniak
6ddd9c29b3 Fix ambiguous TTS#playSilence method. 
Due to recent fixes for TTS API review (b/17389935)
overloaded playSilence method became ambiguous when
the last argument is null. This change renames the new
method to playSilentUtterance solving the issue.

Also, since LMP API level is 21, I updated invalid
references to it as API level 20 inside speech.tts.

Bug: 17389935
Change-Id: I9f9fae988240d1cec45d44650e53ffc29803ccac
 2014-09-25 11:26:31 +01:00
Evan Charlton
8635c578f0 Revert "@hide ConnectionService APIs." 
This reverts commit 86935c406e4a8bb0e2ad871b51009f3603df9e87.
 2014-09-24 14:06:12 -07:00
Jeff Tinker
766dc23b88 am 3eeac344: Merge "Implement API review feedback." into lmp-dev 
* commit '3eeac344b1aedf116b2340f3028f2cbaf34945d1':
  Implement API review feedback.
 2014-09-23 17:43:07 +00:00
Jeff Tinker
f7efd5c6a8 Merge "Implement API review feedback." into lmp-dev 2014-09-23 17:39:31 +00:00
Tyler Gunn
157bd0e39d am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev 
* commit 'fa5456e5455d215fa73a504d78a8f152d8cd1b05':
  @hide ConnectionService APIs.
 2014-09-23 17:25:07 +00:00