Removing deprecated live_folders creation support (c373c322) · Commits · e / os / android_packages_modules_Bluetooth

android/app/AndroidManifest.xml

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -182,16 +182,6 @@
	android:theme="@*android:style/Theme.Holo.Dialog.Alert"		android:theme="@*android:style/Theme.Holo.Dialog.Alert"
	android:enabled="@bool/profile_supported_opp">		android:enabled="@bool/profile_supported_opp">
	</activity>		</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"		<activity android:name=".opp.BluetoothOppTransferHistory"
	android:process="@string/process"		android:process="@string/process"
	android:label=""		android:label=""

android/app/AndroidManifest_test.xml

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -82,14 +82,6 @@
	<activity android:name=".opp.BluetoothOppTransferActivity"		<activity android:name=".opp.BluetoothOppTransferActivity"
	android:process="@string/process">		android:process="@string/process">
	</activity>		</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"		<activity android:name=".pbap.BluetoothPbapActivity"
	android:process="@string/process"		android:process="@string/process"
	android:label=" "		android:label=" "

android/app/res/drawable-hdpi/ic_launcher_folder_bluetooth.png

deleted100644 → 0

−5.59 KiB

Loading image diff...

android/app/res/drawable-mdpi/ic_launcher_folder_bluetooth.png

deleted100644 → 0

−2.85 KiB

Loading image diff...

android/app/src/com/android/bluetooth/opp/BluetoothOppLiveFolder.java

deleted100644 → 0

+0 −82

Original line number	Original line	Diff line number	Diff line
	/*
	* 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;
	}

	}