Merge "Remove trailing spaces and tabs"
This commit is contained in:
@@ -1,12 +1,12 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2007-2008 The Android Open Source Project
|
* Copyright (C) 2007-2008 The Android Open Source Project
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
||||||
* use this file except in compliance with the License. You may obtain a copy of
|
* use this file except in compliance with the License. You may obtain a copy of
|
||||||
* the License at
|
* the License at
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
@@ -64,7 +64,7 @@ public final class InputMethodInfo implements Parcelable {
|
|||||||
* The Service that implements this input method component.
|
* The Service that implements this input method component.
|
||||||
*/
|
*/
|
||||||
final ResolveInfo mService;
|
final ResolveInfo mService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The unique string Id to identify the input method. This is generated
|
* The unique string Id to identify the input method. This is generated
|
||||||
* from the input method component.
|
* from the input method component.
|
||||||
@@ -144,22 +144,22 @@ public final class InputMethodInfo implements Parcelable {
|
|||||||
throw new XmlPullParserException("No "
|
throw new XmlPullParserException("No "
|
||||||
+ InputMethod.SERVICE_META_DATA + " meta-data");
|
+ InputMethod.SERVICE_META_DATA + " meta-data");
|
||||||
}
|
}
|
||||||
|
|
||||||
Resources res = pm.getResourcesForApplication(si.applicationInfo);
|
Resources res = pm.getResourcesForApplication(si.applicationInfo);
|
||||||
|
|
||||||
AttributeSet attrs = Xml.asAttributeSet(parser);
|
AttributeSet attrs = Xml.asAttributeSet(parser);
|
||||||
|
|
||||||
int type;
|
int type;
|
||||||
while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
|
while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
|
||||||
&& type != XmlPullParser.START_TAG) {
|
&& type != XmlPullParser.START_TAG) {
|
||||||
}
|
}
|
||||||
|
|
||||||
String nodeName = parser.getName();
|
String nodeName = parser.getName();
|
||||||
if (!"input-method".equals(nodeName)) {
|
if (!"input-method".equals(nodeName)) {
|
||||||
throw new XmlPullParserException(
|
throw new XmlPullParserException(
|
||||||
"Meta-data does not start with input-method tag");
|
"Meta-data does not start with input-method tag");
|
||||||
}
|
}
|
||||||
|
|
||||||
TypedArray sa = res.obtainAttributes(attrs,
|
TypedArray sa = res.obtainAttributes(attrs,
|
||||||
com.android.internal.R.styleable.InputMethod);
|
com.android.internal.R.styleable.InputMethod);
|
||||||
settingsActivityComponent = sa.getString(
|
settingsActivityComponent = sa.getString(
|
||||||
@@ -338,7 +338,7 @@ public final class InputMethodInfo implements Parcelable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Load the user-displayed label for this input method.
|
* Load the user-displayed label for this input method.
|
||||||
*
|
*
|
||||||
* @param pm Supply a PackageManager used to load the input method's
|
* @param pm Supply a PackageManager used to load the input method's
|
||||||
* resources.
|
* resources.
|
||||||
*/
|
*/
|
||||||
@@ -348,7 +348,7 @@ public final class InputMethodInfo implements Parcelable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Load the user-displayed icon for this input method.
|
* Load the user-displayed icon for this input method.
|
||||||
*
|
*
|
||||||
* @param pm Supply a PackageManager used to load the input method's
|
* @param pm Supply a PackageManager used to load the input method's
|
||||||
* resources.
|
* resources.
|
||||||
*/
|
*/
|
||||||
@@ -362,7 +362,7 @@ public final class InputMethodInfo implements Parcelable {
|
|||||||
* an {@link android.content.Intent} whose action is MAIN and with an
|
* an {@link android.content.Intent} whose action is MAIN and with an
|
||||||
* explicit {@link android.content.ComponentName}
|
* explicit {@link android.content.ComponentName}
|
||||||
* composed of {@link #getPackageName} and the class name returned here.
|
* composed of {@link #getPackageName} and the class name returned here.
|
||||||
*
|
*
|
||||||
* <p>A null will be returned if there is no settings activity associated
|
* <p>A null will be returned if there is no settings activity associated
|
||||||
* with the input method.
|
* with the input method.
|
||||||
*/
|
*/
|
||||||
@@ -419,7 +419,7 @@ public final class InputMethodInfo implements Parcelable {
|
|||||||
pw.println(prefix + "Service:");
|
pw.println(prefix + "Service:");
|
||||||
mService.dump(pw, prefix + " ");
|
mService.dump(pw, prefix + " ");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "InputMethodInfo{" + mId
|
return "InputMethodInfo{" + mId
|
||||||
@@ -430,7 +430,7 @@ public final class InputMethodInfo implements Parcelable {
|
|||||||
/**
|
/**
|
||||||
* Used to test whether the given parameter object is an
|
* Used to test whether the given parameter object is an
|
||||||
* {@link InputMethodInfo} and its Id is the same to this one.
|
* {@link InputMethodInfo} and its Id is the same to this one.
|
||||||
*
|
*
|
||||||
* @return true if the given parameter object is an
|
* @return true if the given parameter object is an
|
||||||
* {@link InputMethodInfo} and its Id is the same to this one.
|
* {@link InputMethodInfo} and its Id is the same to this one.
|
||||||
*/
|
*/
|
||||||
@@ -467,7 +467,7 @@ public final class InputMethodInfo implements Parcelable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Used to package this object into a {@link Parcel}.
|
* Used to package this object into a {@link Parcel}.
|
||||||
*
|
*
|
||||||
* @param dest The {@link Parcel} to be written.
|
* @param dest The {@link Parcel} to be written.
|
||||||
* @param flags The flags used for parceling.
|
* @param flags The flags used for parceling.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user