am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1 (c9b82ebb) · Commits · e / os / android_frameworks_base

libs/usb/tests/AccessoryChat/AndroidManifest.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@
	<manifest xmlns:android="http://schemas.android.com/apk/res/android"		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
	package="com.android.accessorychat">		package="com.android.accessorychat">

	<application>		<application android:label="Accessory Chat">
	<uses-library android:name="com.android.future.usb.accessory" />		<uses-library android:name="com.android.future.usb.accessory" />

	<activity android:name="AccessoryChat" android:label="Accessory Chat">		<activity android:name="AccessoryChat" android:label="Accessory Chat">

libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -155,7 +155,7 @@ static int usb_device_added(const char devname, void client_data) {

	send_string(device, ACCESSORY_STRING_MANUFACTURER, "Google, Inc.");		send_string(device, ACCESSORY_STRING_MANUFACTURER, "Google, Inc.");
	send_string(device, ACCESSORY_STRING_MODEL, "AccessoryChat");		send_string(device, ACCESSORY_STRING_MODEL, "AccessoryChat");
	send_string(device, ACCESSORY_STRING_DESCRIPTION, "Sample Program");		send_string(device, ACCESSORY_STRING_DESCRIPTION, "Accessory Chat");
	send_string(device, ACCESSORY_STRING_VERSION, "1.0");		send_string(device, ACCESSORY_STRING_VERSION, "1.0");
	send_string(device, ACCESSORY_STRING_URI, "http://www.android.com");		send_string(device, ACCESSORY_STRING_URI, "http://www.android.com");
	send_string(device, ACCESSORY_STRING_SERIAL, "1234567890");		send_string(device, ACCESSORY_STRING_SERIAL, "1234567890");

packages/SystemUI/res/values/strings.xml

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -129,7 +129,7 @@
	<string name="usb_accessory_confirm_prompt">Open %1$s when this USB accessory is connected?</string>		<string name="usb_accessory_confirm_prompt">Open %1$s when this USB accessory is connected?</string>

	<!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->		<!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
	<string name="usb_accessory_uri_prompt">Additional information for this device may be found at: %1$s</string>		<string name="usb_accessory_uri_prompt">Additional information for this USB accessory may be found at: %1$s</string>

	<!-- Title for USB accessory dialog. Used when the name of the accessory cannot be determined. [CHAR LIMIT=50] -->		<!-- Title for USB accessory dialog. Used when the name of the accessory cannot be determined. [CHAR LIMIT=50] -->
	<string name="title_usb_accessory">USB accessory</string>		<string name="title_usb_accessory">USB accessory</string>
	@@ -137,7 +137,10 @@
	<!-- View button label for USB dialogs. [CHAR LIMIT=15] -->		<!-- View button label for USB dialogs. [CHAR LIMIT=15] -->
	<string name="label_view">View</string>		<string name="label_view">View</string>

	<!-- Ignore button label for USB dialogs. [CHAR LIMIT=15] -->		<!-- Checkbox label for USB device dialogs. [CHAR LIMIT=50] -->
	<string name="label_ignore">Ignore</string>		<string name="always_use_device">Use by default for this USB device</string>

			<!-- Checkbox label for USB accessory dialogs. [CHAR LIMIT=50] -->
			<string name="always_use_accessory">Use by default for this USB accessory</string>

	</resources>		</resources>

packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,7 @@ public class UsbAccessoryUriActivity extends AlertActivity
	}		}
	ap.mMessage = getString(R.string.usb_accessory_uri_prompt, mUri);		ap.mMessage = getString(R.string.usb_accessory_uri_prompt, mUri);
	ap.mPositiveButtonText = getString(R.string.label_view);		ap.mPositiveButtonText = getString(R.string.label_view);
	ap.mNegativeButtonText = getString(R.string.label_ignore);		ap.mNegativeButtonText = getString(android.R.string.cancel);
	ap.mPositiveButtonListener = this;		ap.mPositiveButtonListener = this;
	ap.mNegativeButtonListener = this;		ap.mNegativeButtonListener = this;

packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -80,8 +80,8 @@ public class UsbConfirmActivity extends AlertActivity
	ap.mMessage = getString(R.string.usb_device_confirm_prompt, appName);		ap.mMessage = getString(R.string.usb_device_confirm_prompt, appName);
	mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice);		mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice);
	}		}
	ap.mPositiveButtonText = getString(com.android.internal.R.string.ok);		ap.mPositiveButtonText = getString(android.R.string.ok);
	ap.mNegativeButtonText = getString(com.android.internal.R.string.cancel);		ap.mNegativeButtonText = getString(android.R.string.cancel);
	ap.mPositiveButtonListener = this;		ap.mPositiveButtonListener = this;
	ap.mNegativeButtonListener = this;		ap.mNegativeButtonListener = this;

	@@ -90,7 +90,11 @@ public class UsbConfirmActivity extends AlertActivity
	Context.LAYOUT_INFLATER_SERVICE);		Context.LAYOUT_INFLATER_SERVICE);
	ap.mView = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null);		ap.mView = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null);
	mAlwaysUse = (CheckBox)ap.mView.findViewById(com.android.internal.R.id.alwaysUse);		mAlwaysUse = (CheckBox)ap.mView.findViewById(com.android.internal.R.id.alwaysUse);
	mAlwaysUse.setText(com.android.internal.R.string.alwaysUse);		if (mDevice == null) {
			mAlwaysUse.setText(R.string.always_use_accessory);
			} else {
			mAlwaysUse.setText(R.string.always_use_device);
			}
	mAlwaysUse.setOnCheckedChangeListener(this);		mAlwaysUse.setOnCheckedChangeListener(this);
	mClearDefaultHint = (TextView)ap.mView.findViewById(		mClearDefaultHint = (TextView)ap.mView.findViewById(
	com.android.internal.R.id.clearDefaultHint);		com.android.internal.R.id.clearDefaultHint);