release-request-60a1dec6-db7d-4d2a-8ddf-8cf91c3bd1f8-for-git_oc-dr1-release-41... (ba1a6110) · Commits · e / os / android_packages_apps_Settings

res/layout/fingerprint_enroll_find_sensor_base.xml

+13 −22

Original line number	Diff line number	Diff line
		@@ -24,23 +24,17 @@
		android:layout_height="match_parent"
		app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">

		<FrameLayout
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:clipToPadding="false"
		android:clipChildren="false">

		<include
		layout="@layout/fingerprint_enroll_find_sensor_graphic"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center_horizontal\|bottom"/>

		<LinearLayout
		style="@style/SuwContentFrame"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:clipToPadding="false"
		android:clipChildren="false">
		@@ -51,21 +45,18 @@
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/suw_description_glif_margin_top"
		android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
		</LinearLayout>

		<View
		<Space
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:layout_width="match_parent"
		android:layout_weight="1" />

		<Button
		style="@style/SuwGlifButton.Secondary"
		android:id="@+id/next_button"
		android:layout_width="wrap_content"
		<include
		layout="@layout/fingerprint_enroll_find_sensor_graphic"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="4dp"
		android:layout_gravity="end"
		android:text="@string/fingerprint_enroll_button_next" />
		android:layout_gravity="center_horizontal"/>

		</LinearLayout>
		</FrameLayout>
		</com.android.setupwizardlib.GlifLayout>

src/com/android/settings/applications/ManageApplications.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -214,8 +214,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		}

		// Storage types. Used to determine what the extra item in the list of preferences is.
		public static final int STORAGE_TYPE_DEFAULT = 0;
		public static final int STORAGE_TYPE_DEFAULT = 0; // Show all apps that are not categorized.
		public static final int STORAGE_TYPE_MUSIC = 1;
		public static final int STORAGE_TYPE_LEGACY = 2; // Show apps even if they can be categorized.

		// sort order
		private int mSortOrder = R.id.sort_order_alpha;
		@@ -433,7 +434,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		if (listType == LIST_TYPE_STORAGE) {
		if (storageType == STORAGE_TYPE_MUSIC) {
		filter = new CompoundFilter(ApplicationsState.FILTER_AUDIO, filter);
		} else {
		} else if (storageType == STORAGE_TYPE_DEFAULT) {
		filter = new CompoundFilter(ApplicationsState.FILTER_OTHER_APPS, filter);
		}
		return filter;

src/com/android/settings/bluetooth/DevicePickerFragment.java

+16 −3

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.os.Bundle;
		import android.os.UserManager;
		import android.support.annotation.VisibleForTesting;
		import android.view.Menu;
		import android.view.MenuInflater;

		@@ -43,15 +44,18 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
		private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
		private static final String TAG = "DevicePickerFragment";

		public DevicePickerFragment() {
		super(null /* Not tied to any user restrictions. */);
		}
		@VisibleForTesting
		BluetoothProgressCategory mAvailableDevicesCategory;

		private boolean mNeedAuth;
		private String mLaunchPackage;
		private String mLaunchClass;
		private boolean mScanAllowed;

		public DevicePickerFragment() {
		super(null /* Not tied to any user restrictions. */);
		}

		@Override
		void initPreferencesFromPreferenceScreen() {
		Intent intent = getActivity().getIntent();
		@@ -60,6 +64,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
		BluetoothDevicePicker.FILTER_TYPE_ALL));
		mLaunchPackage = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_PACKAGE);
		mLaunchClass = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_CLASS);
		mAvailableDevicesCategory = (BluetoothProgressCategory) findPreference(KEY_BT_DEVICE_LIST);
		}

		@Override
		@@ -88,6 +93,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
		mSelectedDevice = null;
		if (mScanAllowed) {
		enableScanning();
		mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
		}
		}

		@@ -123,6 +129,13 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
		}
		}

		@Override
		public void onScanningStateChanged(boolean started) {
		super.onScanningStateChanged(started);
		started \|= mScanEnabled;
		mAvailableDevicesCategory.setProgress(started);
		}

		public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice,
		int bondState) {
		BluetoothDevice device = cachedDevice.getDevice();

src/com/android/settings/deviceinfo/PrivateVolumeSettings.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -473,6 +473,9 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
		StorageUseActivity.class.getName());
		args.putString(ManageApplications.EXTRA_VOLUME_UUID, mVolume.getFsUuid());
		args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
		args.putInt(
		ManageApplications.EXTRA_STORAGE_TYPE,
		ManageApplications.STORAGE_TYPE_LEGACY);
		intent = Utils.onBuildStartFragmentIntent(getActivity(),
		ManageApplications.class.getName(), args, null, R.string.apps_storage, null,
		false, getMetricsCategory());

src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -34,11 +34,17 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro
		private static final int MY_USER = UserHandle.myUserId();

		private final AmbientDisplayConfiguration mConfig;
		private final OnPreferenceChangedCallback mCallback;

		public interface OnPreferenceChangedCallback {
		void onPreferenceChanged();
		}

		public AmbientDisplayAlwaysOnPreferenceController(Context context,
		AmbientDisplayConfiguration config) {
		AmbientDisplayConfiguration config, OnPreferenceChangedCallback callback) {
		super(context);
		mConfig = config;
		mCallback = callback;
		}

		@Override
		@@ -55,6 +61,9 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		int enabled = (boolean) newValue ? 1 : 0;
		Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ALWAYS_ON, enabled);
		if (mCallback != null) {
		mCallback.onPreferenceChanged();
		}
		return true;
		}