From d6ef9163ed0e7c1824ee5b6c9ff2f556ef652aa3 Mon Sep 17 00:00:00 2001 From: Ye Wen Date: Thu, 4 Sep 2014 15:41:13 -0700 Subject: MMS API cleanup (4/4) - Hide APIs not approved by API council (b/17189780) - Change configOverrides in MMS APIs from ContentValues to Bundle to be consistent (b/17390017) - Change SmsManager.MMS_EXTRA_DATA to EXTRA_MMS_DATA per API council review (b/17390977) b/17189780 b/17390017 b/17390977 Change-Id: Id9ae09ae4ef083186b93677ffabf5640c54aa99d --- samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java b/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java index 4f900a5a0..40209fcbd 100644 --- a/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java +++ b/samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java @@ -235,7 +235,7 @@ public class MmsMessagingDemo extends Activity { mSendFile.delete(); int status = R.string.mms_status_failed; if (code == Activity.RESULT_OK) { - final byte[] response = intent.getByteArrayExtra(SmsManager.MMS_EXTRA_DATA); + final byte[] response = intent.getByteArrayExtra(SmsManager.EXTRA_MMS_DATA); if (response != null) { final GenericPdu pdu = new PduParser(response).parse(); if (pdu instanceof SendConf) { -- cgit v1.2.3 From 00fc6d9b06046a9be0d0e33e3c35d511588383ba Mon Sep 17 00:00:00 2001 From: George Mount Date: Fri, 29 Aug 2014 13:03:53 -0700 Subject: API Review: change SharedElementListener to SharedElementCallback Bug 17289526 Change-Id: I5d28a77d870b83cc93483be23635bc669978cefc --- .../src/com/example/android/apis/animation/ActivityTransition.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java b/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java index b29582669..c969742b0 100644 --- a/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java +++ b/samples/ApiDemos/src/com/example/android/apis/animation/ActivityTransition.java @@ -19,7 +19,7 @@ import com.example.android.apis.R; import android.app.Activity; import android.app.ActivityOptions; -import android.app.SharedElementListener; +import android.app.SharedElementCallback; import android.content.Intent; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; @@ -104,9 +104,9 @@ public class ActivityTransition extends Activity { mHero = null; if (name != null) { mHero = (ImageView) findViewById(getIdForKey(name)); - setEnterSharedElementListener(new SharedElementListener() { + setEnterSharedElementCallback(new SharedElementCallback() { @Override - public void remapSharedElements(List names, + public void onMapSharedElements(List names, Map sharedElements) { sharedElements.put("hero", mHero); } -- cgit v1.2.3 From b794db463fe62da21b724776013e2aba980a07a1 Mon Sep 17 00:00:00 2001 From: anaddaf Date: Fri, 5 Sep 2014 10:25:50 -0700 Subject: Adding a missing permission to phone component Since the Wearable component needed VIBRATE permissions and since that was missing on the phone component, auto install was not successful. Bug: 17334885 Change-Id: I898792e459aedf50902bc9eb54755d187bfc2dc0 --- samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml b/samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml index 9df37e367..79999bab8 100644 --- a/samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml +++ b/samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml @@ -17,6 +17,7 @@ + Date: Fri, 5 Sep 2014 11:35:33 -0700 Subject: Enforce READ_SMS permission in file provider used by MMS API demo b/17403930 Change-Id: I7cc17f53c95d3779e43003538b8c833369c5a182 --- samples/ApiDemos/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml index 60287d55e..dde787391 100644 --- a/samples/ApiDemos/AndroidManifest.xml +++ b/samples/ApiDemos/AndroidManifest.xml @@ -1369,7 +1369,7 @@ -- cgit v1.2.3 From ab56bf9812e33d637b1d2ef9e0067673d613676e Mon Sep 17 00:00:00 2001 From: Ye Wen Date: Fri, 5 Sep 2014 21:23:47 +0000 Subject: Revert "Enforce READ_SMS permission in file provider used by MMS API demo" This reverts commit 3060e54b6e73e60c4ea1480b6619bca22abd8c9a. Change-Id: I430f84f2694511130879eefb11311fe7d2565f43 --- samples/ApiDemos/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml index dde787391..60287d55e 100644 --- a/samples/ApiDemos/AndroidManifest.xml +++ b/samples/ApiDemos/AndroidManifest.xml @@ -1369,7 +1369,7 @@ -- cgit v1.2.3