Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa71fac authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'gingerbread' of... 

Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_frameworks_base into gingerbread-release
parents 8b801f18 ab0f4c5f

core/java/android/app/ConnectionSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ import org.xmlpull.v1.XmlPullParserException; 
import java.io.IOException;



/** @hide */

public class ConnectionSettings implements Parcelable {

public final class ConnectionSettings implements Parcelable {



    private int mConnectionId;

    private int mValue;

core/java/android/app/Profile.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import java.util.HashMap; 
import java.util.Map;

import java.util.UUID;



public class Profile implements Parcelable {

public final class Profile implements Parcelable {



    private String mName;

    private int mNameResId;

core/java/android/app/ProfileGroup.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import android.util.Log; 
import java.io.IOException;

import java.util.UUID;



public class ProfileGroup implements Parcelable {

public final class ProfileGroup implements Parcelable {

    private static final String TAG = "ProfileGroup";



    private String mName;

core/java/android/app/StreamSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import android.os.Parcelable; 
import java.io.IOException;



/** @hide */

public class StreamSettings implements Parcelable{

public final class StreamSettings implements Parcelable{



    private int mStreamId;

    private int mValue;

core/java/com/android/internal/widget/RingSelector.java

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ public class RingSelector extends ViewGroup { 
                trans.setDuration(ANIM_DURATION);

                trans.setFillAfter(true);

                ring.startAnimation(trans);

                ring.setVisibility(View.INVISIBLE);

                target.setVisibility(View.INVISIBLE);

            }

        }