Merge "Merge daff51d0cb4b0b93b6ef41150c3614759ba9e514 on remote branch" (81158c4f) · Commits · e / os / android_frameworks_base

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -310,7 +310,7 @@ public class ChooseTypeAndAccountActivity extends Activity
		if (resultCode == RESULT_CANCELED) {
		// if canceling out of addAccount and the original state caused us to skip this,
		// finish this activity
		if (mAccounts.isEmpty()) {
		if (null == mAccounts \|\| mAccounts.isEmpty()) {
		setResult(Activity.RESULT_CANCELED);
		finish();
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -461,6 +461,10 @@ public class DialogFragment extends Fragment
		return;
		}

		if (mDialog == null) {
		return;
		}

		View view = getView();
		if (view != null) {
		if (view.getParent() != null) {

+14 −0

Original line number	Diff line number	Diff line
		@@ -221,6 +221,20 @@ public final class Sensor {
		*/
		public static final int TYPE_GEOMAGNETIC_ROTATION_VECTOR = 20;

		/**
		* A constant describing the motion accelerometer sensor.
		* <p>
		* This sensor is similar to the accelerometer sensor, however it only
		* streams data when the device is in motion, and stops streaming data
		* when the device is stationary.
		* Generally this kind of sensor would consume less power than the generic
		* accelerometer sensor, and hence can be used in applications that do not
		* require accelerometer streaming when device is stationary, such as the
		* screen auto-rotation.
		* {@hide}
		*/
		public static final int TYPE_MOTION_ACCEL = 33171011;

		/**
		* A constant describing all sensor types.
		*/

+4 −0

Original line number	Diff line number	Diff line
		@@ -207,6 +207,10 @@ public class Environment {
		return buildPaths(mExternalDirsForApp, DIR_ANDROID, DIR_OBB);
		}

		public File[] buildExternalStorageAndroidObbDirsForVold() {
		return buildPaths(mExternalDirsForVold, DIR_ANDROID, DIR_OBB);
		}

		public File[] buildExternalStorageAppDataDirs(String packageName) {
		return buildPaths(mExternalDirsForApp, DIR_ANDROID, DIR_DATA, packageName);
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -1953,7 +1953,10 @@ public class NumberPicker extends LinearLayout {
		, '\u0669',
		// Extended Arabic-Indic
		'\u06f0', '\u06f1', '\u06f2', '\u06f3', '\u06f4', '\u06f5', '\u06f6', '\u06f7', '\u06f8'
		, '\u06f9'
		, '\u06f9',
		// Bengali-Indic
		'\u09e6', '\u09e7', '\u09e8', '\u09e9', '\u09ea', '\u09eb', '\u09ec', '\u09ed', '\u09ee'
		, '\u09ef'
		};

		/**