Removing deprecated live_folders creation support
> live_folders are no longer supported by launcher
Change-Id: I08aed20b22f57cccdfce1cb193d6e03de494bc76
diff --git a/android/app/AndroidManifest.xml b/android/app/AndroidManifest.xml
index e879a75..5384b94 100644
--- a/android/app/AndroidManifest.xml
+++ b/android/app/AndroidManifest.xml
@@ -182,16 +182,6 @@
android:theme="@*android:style/Theme.Holo.Dialog.Alert"
android:enabled="@bool/profile_supported_opp">
</activity>
- <activity android:name=".opp.BluetoothOppLiveFolder"
- android:process="@string/process"
- android:icon="@drawable/ic_launcher_folder_bluetooth"
- android:label="@string/btopp_live_folder"
- android:enabled="@bool/profile_supported_opp">
- <intent-filter>
- <action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
<activity android:name=".opp.BluetoothOppTransferHistory"
android:process="@string/process"
android:label=""
diff --git a/android/app/AndroidManifest_test.xml b/android/app/AndroidManifest_test.xml
index 8511dae..5a0e295 100644
--- a/android/app/AndroidManifest_test.xml
+++ b/android/app/AndroidManifest_test.xml
@@ -82,14 +82,6 @@
<activity android:name=".opp.BluetoothOppTransferActivity"
android:process="@string/process">
</activity>
- <activity android:name=".opp.BluetoothOppLiveFolder"
- android:process="@string/process"
- android:label="@string/btopp_live_folder">
- <intent-filter>
- <action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
<activity android:name=".pbap.BluetoothPbapActivity"
android:process="@string/process"
android:label=" "
diff --git a/android/app/res/drawable-hdpi/ic_launcher_folder_bluetooth.png b/android/app/res/drawable-hdpi/ic_launcher_folder_bluetooth.png
deleted file mode 100644
index 64f9cf4..0000000
--- a/android/app/res/drawable-hdpi/ic_launcher_folder_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/android/app/res/drawable-mdpi/ic_launcher_folder_bluetooth.png b/android/app/res/drawable-mdpi/ic_launcher_folder_bluetooth.png
deleted file mode 100644
index dd34211..0000000
--- a/android/app/res/drawable-mdpi/ic_launcher_folder_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/android/app/src/com/android/bluetooth/opp/BluetoothOppLiveFolder.java b/android/app/src/com/android/bluetooth/opp/BluetoothOppLiveFolder.java
deleted file mode 100644
index 0cc0a21..0000000
--- a/android/app/src/com/android/bluetooth/opp/BluetoothOppLiveFolder.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2008-2009, Motorola, Inc.
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * - Neither the name of the Motorola, Inc. nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.android.bluetooth.opp;
-
-import com.android.bluetooth.R;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.LiveFolders;
-
-// TODO: To make livefolder work, process acore need BluetoothOppProvider permission
-// Or disable provider permission. Need Google's comments
-public class BluetoothOppLiveFolder extends Activity {
- public static final Uri CONTENT_URI = Uri
- .parse("content://com.android.bluetooth.opp/live_folders/received");
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- final Intent intent = getIntent();
- final String action = intent.getAction();
-
- if (LiveFolders.ACTION_CREATE_LIVE_FOLDER.equals(action)) {
- setResult(RESULT_OK, createLiveFolder(this, CONTENT_URI, this
- .getString(R.string.btopp_live_folder),
- R.drawable.ic_launcher_folder_bluetooth));
- } else {
- setResult(RESULT_CANCELED);
- }
-
- finish();
- }
-
- private static Intent createLiveFolder(Context context, Uri uri, String name, int icon) {
- final Intent intent = new Intent();
-
- intent.setDataAndNormalize(uri);
- intent.putExtra(LiveFolders.EXTRA_LIVE_FOLDER_BASE_INTENT, new Intent(
- Constants.ACTION_OPEN, BluetoothShare.CONTENT_URI));
- intent.putExtra(LiveFolders.EXTRA_LIVE_FOLDER_NAME, name);
- intent.putExtra(LiveFolders.EXTRA_LIVE_FOLDER_ICON, Intent.ShortcutIconResource
- .fromContext(context, icon));
- intent.putExtra(LiveFolders.EXTRA_LIVE_FOLDER_DISPLAY_MODE, LiveFolders.DISPLAY_MODE_LIST);
-
- return intent;
- }
-
-}
diff --git a/android/app/src/com/android/bluetooth/opp/BluetoothOppProvider.java b/android/app/src/com/android/bluetooth/opp/BluetoothOppProvider.java
index 864d6a2..9c6bb2b 100644
--- a/android/app/src/com/android/bluetooth/opp/BluetoothOppProvider.java
+++ b/android/app/src/com/android/bluetooth/opp/BluetoothOppProvider.java
@@ -90,22 +90,9 @@
/** URI matcher constant for the URI of an individual share */
private static final int SHARES_ID = 2;
- /** URI matcher constant for the URI of live folder */
- private static final int LIVE_FOLDER_RECEIVED_FILES = 3;
static {
sURIMatcher.addURI("com.android.bluetooth.opp", "btopp", SHARES);
sURIMatcher.addURI("com.android.bluetooth.opp", "btopp/#", SHARES_ID);
- sURIMatcher.addURI("com.android.bluetooth.opp", "live_folders/received",
- LIVE_FOLDER_RECEIVED_FILES);
- }
-
- private static final HashMap<String, String> LIVE_FOLDER_PROJECTION_MAP;
- static {
- LIVE_FOLDER_PROJECTION_MAP = new HashMap<String, String>();
- LIVE_FOLDER_PROJECTION_MAP.put(LiveFolders._ID, BluetoothShare._ID + " AS "
- + LiveFolders._ID);
- LIVE_FOLDER_PROJECTION_MAP.put(LiveFolders.NAME, BluetoothShare.FILENAME_HINT + " AS "
- + LiveFolders.NAME);
}
/** The database that lies underneath this content provider */
@@ -318,14 +305,6 @@
qb.appendWhere(uri.getPathSegments().get(1));
break;
}
- case LIVE_FOLDER_RECEIVED_FILES: {
- qb.setTables(DB_TABLE);
- qb.setProjectionMap(LIVE_FOLDER_PROJECTION_MAP);
- qb.appendWhere(BluetoothShare.DIRECTION + "=" + BluetoothShare.DIRECTION_INBOUND
- + " AND " + BluetoothShare.STATUS + "=" + BluetoothShare.STATUS_SUCCESS);
- sortOrder = "_id DESC, " + sortOrder;
- break;
- }
default: {
if (D) Log.d(TAG, "querying unknown URI: " + uri);
throw new IllegalArgumentException("Unknown URI: " + uri);
