drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tabs -> spaces in frameworks/base."

Browse Source
This commit is contained in:
John Spurlock
2014-02-25 19:57:33 +00:00
committed by Android (Google) Code Review
parent 6924c4ef8d 8a985d24ce
commit a77cf87354
56 changed files with 290 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Activity.java
View File

@ -1030,7 +1030,7 @@ public class Activity extends ContextThemeWrapper
/**
* Called after {@link #onCreate} — or after {@link #onRestart} when
* the activity had been stopped, but is now again being displayed to the
* user. It will be followed by {@link #onResume}.
* user. It will be followed by {@link #onResume}.
*
* <p><em>Derived classes must call through to the super class's
* implementation of this method. If they do not, an exception will be

2
core/java/android/app/ApplicationPackageManager.java
View File

@ -1059,7 +1059,7 @@ final class ApplicationPackageManager extends PackageManager {
}
@Override
public void installPackageWithVerificationAndEncryption(Uri packageURI,
public void installPackageWithVerificationAndEncryption(Uri packageURI,
IPackageInstallObserver observer, int flags, String installerPackageName,
VerificationParams verificationParams, ContainerEncryptionParams encryptionParams) {
try {

4
core/java/android/app/ApplicationThreadNative.java
View File

@ -714,7 +714,7 @@ class ApplicationThreadProxy implements IApplicationThread {
}
public final void scheduleSendResult(IBinder token, List<ResultInfo> results)
throws RemoteException {
throws RemoteException {
Parcel data = Parcel.obtain();
data.writeInterfaceToken(IApplicationThread.descriptor);
data.writeStrongBinder(token);
@ -884,7 +884,7 @@ class ApplicationThreadProxy implements IApplicationThread {
}
public final void scheduleServiceArgs(IBinder token, boolean taskRemoved, int startId,
int flags, Intent args) throws RemoteException {
int flags, Intent args) throws RemoteException {
Parcel data = Parcel.obtain();
data.writeInterfaceToken(IApplicationThread.descriptor);
data.writeStrongBinder(token);

2
core/java/android/app/OnActivityPausedListener.java
View File

@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of 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
* distributed under the License is distributed on an "AS IS" BASIS,

2
core/java/android/appwidget/AppWidgetProviderInfo.java
View File

@ -172,7 +172,7 @@ public class AppWidgetProviderInfo implements Parcelable {
* <p>This field corresponds to the <code>android:previewImage</code> attribute in
* the <code>&lt;receiver&gt;</code> element in the AndroidManifest.xml file.
*/
public int previewImage;
public int previewImage;
/**
* The rules by which a widget can be resized. See {@link #RESIZE_NONE},

2
core/java/android/hardware/GeomagneticField.java
View File

@ -361,7 +361,7 @@ public class GeomagneticField {
mP[0] = new float[] { 1.0f };
mPDeriv[0] = new float[] { 0.0f };
for (int n = 1; n <= maxN; n++) {
mP[n] = new float[n + 1];
mP[n] = new float[n + 1];
mPDeriv[n] = new float[n + 1];
for (int m = 0; m <= n; m++) {
if (n == m) {

2
core/java/android/nfc/NdefRecord.java
View File

@ -815,7 +815,7 @@ public final class NdefRecord implements Parcelable {
throw new FormatException("expected TNF_UNCHANGED in non-leading chunk");
} else if (!inChunk && tnf == NdefRecord.TNF_UNCHANGED) {
throw new FormatException("" +
"unexpected TNF_UNCHANGED in first chunk or unchunked record");
"unexpected TNF_UNCHANGED in first chunk or unchunked record");
}
int typeLength = buffer.get() & 0xFF;

8
core/java/android/os/Broadcaster.java
View File

@ -171,10 +171,10 @@ public class Broadcaster
public void broadcast(Message msg)
{
synchronized (this) {
if (mReg == null) {
return;
}
if (mReg == null) {
return;
}
int senderWhat = msg.what;
Registration start = mReg;
Registration r = start;

2
core/java/android/preference/GenericInflater.java
View File

@ -191,7 +191,7 @@ abstract class GenericInflater<T, P extends GenericInflater.Parent> {
public void setFactory(Factory<T> factory) {
if (mFactorySet) {
throw new IllegalStateException("" +
"A factory has already been set on this inflater");
"A factory has already been set on this inflater");
}
if (factory == null) {
throw new NullPointerException("Given factory can not be null");

20
core/java/android/text/style/BackgroundColorSpan.java
View File

@ -26,9 +26,9 @@ public class BackgroundColorSpan extends CharacterStyle
private final int mColor;
public BackgroundColorSpan(int color) {
mColor = color;
}
public BackgroundColorSpan(int color) {
mColor = color;
}
public BackgroundColorSpan(Parcel src) {
mColor = src.readInt();
@ -46,12 +46,12 @@ public class BackgroundColorSpan extends CharacterStyle
dest.writeInt(mColor);
}
public int getBackgroundColor() {
return mColor;
}
public int getBackgroundColor() {
return mColor;
}
@Override
public void updateDrawState(TextPaint ds) {
ds.bgColor = mColor;
}
@Override
public void updateDrawState(TextPaint ds) {
ds.bgColor = mColor;
}
}

2
core/java/android/text/style/CharacterStyle.java
View File

@ -24,7 +24,7 @@ import android.text.TextPaint;
* ones may just implement {@link UpdateAppearance}.
*/
public abstract class CharacterStyle {
public abstract void updateDrawState(TextPaint tp);
public abstract void updateDrawState(TextPaint tp);
/**
* A given CharacterStyle can only applied to a single region of a given

20
core/java/android/text/style/ForegroundColorSpan.java
View File

@ -26,9 +26,9 @@ public class ForegroundColorSpan extends CharacterStyle
private final int mColor;
public ForegroundColorSpan(int color) {
mColor = color;
}
public ForegroundColorSpan(int color) {
mColor = color;
}
public ForegroundColorSpan(Parcel src) {
mColor = src.readInt();
@ -46,12 +46,12 @@ public class ForegroundColorSpan extends CharacterStyle
dest.writeInt(mColor);
}
public int getForegroundColor() {
return mColor;
}
public int getForegroundColor() {
return mColor;
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setColor(mColor);
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setColor(mColor);
}
}

22
core/java/android/text/style/MaskFilterSpan.java
View File

@ -21,18 +21,18 @@ import android.text.TextPaint;
public class MaskFilterSpan extends CharacterStyle implements UpdateAppearance {
private MaskFilter mFilter;
private MaskFilter mFilter;
public MaskFilterSpan(MaskFilter filter) {
mFilter = filter;
}
public MaskFilterSpan(MaskFilter filter) {
mFilter = filter;
}
public MaskFilter getMaskFilter() {
return mFilter;
}
public MaskFilter getMaskFilter() {
return mFilter;
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setMaskFilter(mFilter);
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setMaskFilter(mFilter);
}
}

2
core/java/android/text/style/MetricAffectingSpan.java
View File

@ -26,7 +26,7 @@ public abstract class MetricAffectingSpan
extends CharacterStyle
implements UpdateLayout {
public abstract void updateMeasureState(TextPaint p);
public abstract void updateMeasureState(TextPaint p);
/**
* Returns "this" for most MetricAffectingSpans, but for

22
core/java/android/text/style/RasterizerSpan.java
View File

@ -21,18 +21,18 @@ import android.text.TextPaint;
public class RasterizerSpan extends CharacterStyle implements UpdateAppearance {
private Rasterizer mRasterizer;
private Rasterizer mRasterizer;
public RasterizerSpan(Rasterizer r) {
mRasterizer = r;
}
public RasterizerSpan(Rasterizer r) {
mRasterizer = r;
}
public Rasterizer getRasterizer() {
return mRasterizer;
}
public Rasterizer getRasterizer() {
return mRasterizer;
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setRasterizer(mRasterizer);
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setRasterizer(mRasterizer);
}
}

30
core/java/android/text/style/RelativeSizeSpan.java
View File

@ -23,11 +23,11 @@ import android.text.TextUtils;
public class RelativeSizeSpan extends MetricAffectingSpan implements ParcelableSpan {
private final float mProportion;
private final float mProportion;
public RelativeSizeSpan(float proportion) {
mProportion = proportion;
}
public RelativeSizeSpan(float proportion) {
mProportion = proportion;
}
public RelativeSizeSpan(Parcel src) {
mProportion = src.readFloat();
@ -45,17 +45,17 @@ public class RelativeSizeSpan extends MetricAffectingSpan implements ParcelableS
dest.writeFloat(mProportion);
}
public float getSizeChange() {
return mProportion;
}
public float getSizeChange() {
return mProportion;
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setTextSize(ds.getTextSize() * mProportion);
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setTextSize(ds.getTextSize() * mProportion);
}
@Override
public void updateMeasureState(TextPaint ds) {
ds.setTextSize(ds.getTextSize() * mProportion);
}
@Override
public void updateMeasureState(TextPaint ds) {
ds.setTextSize(ds.getTextSize() * mProportion);
}
}

30
core/java/android/text/style/ScaleXSpan.java
View File

@ -23,11 +23,11 @@ import android.text.TextUtils;
public class ScaleXSpan extends MetricAffectingSpan implements ParcelableSpan {
private final float mProportion;
private final float mProportion;
public ScaleXSpan(float proportion) {
mProportion = proportion;
}
public ScaleXSpan(float proportion) {
mProportion = proportion;
}
public ScaleXSpan(Parcel src) {
mProportion = src.readFloat();
@ -45,17 +45,17 @@ public class ScaleXSpan extends MetricAffectingSpan implements ParcelableSpan {
dest.writeFloat(mProportion);
}
public float getScaleX() {
return mProportion;
}
public float getScaleX() {
return mProportion;
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setTextScaleX(ds.getTextScaleX() * mProportion);
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setTextScaleX(ds.getTextScaleX() * mProportion);
}
@Override
public void updateMeasureState(TextPaint ds) {
ds.setTextScaleX(ds.getTextScaleX() * mProportion);
}
@Override
public void updateMeasureState(TextPaint ds) {
ds.setTextScaleX(ds.getTextScaleX() * mProportion);
}
}

8
core/java/android/text/style/StrikethroughSpan.java
View File

@ -40,8 +40,8 @@ public class StrikethroughSpan extends CharacterStyle
public void writeToParcel(Parcel dest, int flags) {
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setStrikeThruText(true);
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setStrikeThruText(true);
}
}

36
core/java/android/text/style/StyleSpan.java
View File

@ -33,17 +33,17 @@ import android.text.TextUtils;
*/
public class StyleSpan extends MetricAffectingSpan implements ParcelableSpan {
private final int mStyle;
private final int mStyle;
/**
*
* @param style An integer constant describing the style for this span. Examples
* include bold, italic, and normal. Values are constants defined
* in {@link android.graphics.Typeface}.
*/
public StyleSpan(int style) {
mStyle = style;
}
/**
*
* @param style An integer constant describing the style for this span. Examples
* include bold, italic, and normal. Values are constants defined
* in {@link android.graphics.Typeface}.
*/
public StyleSpan(int style) {
mStyle = style;
}
public StyleSpan(Parcel src) {
mStyle = src.readInt();
@ -61,19 +61,19 @@ public class StyleSpan extends MetricAffectingSpan implements ParcelableSpan {
dest.writeInt(mStyle);
}
/**
* Returns the style constant defined in {@link android.graphics.Typeface}.
*/
public int getStyle() {
return mStyle;
}
/**
* Returns the style constant defined in {@link android.graphics.Typeface}.
*/
public int getStyle() {
return mStyle;
}
@Override
@Override
public void updateDrawState(TextPaint ds) {
apply(ds, mStyle);
}
@Override
@Override
public void updateMeasureState(TextPaint paint) {
apply(paint, mStyle);
}

8
core/java/android/text/style/UnderlineSpan.java
View File

@ -40,8 +40,8 @@ public class UnderlineSpan extends CharacterStyle
public void writeToParcel(Parcel dest, int flags) {
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setUnderlineText(true);
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setUnderlineText(true);
}
}

2
core/java/com/android/internal/app/LocalePicker.java
View File

@ -117,7 +117,7 @@ public class LocalePicker extends ListFragment {
/** - TODO: Enable when zz_ZY Pseudolocale is complete
* if (!localeList.contains("zz_ZY")) {
* localeList.add("zz_ZY");
* }
* }
*/
}
String[] locales = new String[localeList.size()];