Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (ddb5fb02) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/stat_sys_dnd.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,6 @@
		*/
		-->
		<inset xmlns:android="http://schemas.android.com/apk/res/android"
		android:insetLeft="2.5dp"
		android:insetRight="2.5dp"
		android:insetLeft="0dp"
		android:insetRight="0dp"
		android:drawable="@*android:drawable/ic_qs_dnd" />
		No newline at end of file

+3 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,9 @@
		<string name="global_action_current_user">Current</string>
		<string name="global_action_users">Users</string>

		<!-- Label for area where tiles can be added to the qs panel -->
		<string name="drag_or_tap_to_add_tiles">Hold & drag or tap to add tiles</string>

		<!-- Custom QS tiles -->
		<!-- Ambient display QS tile -->
		<string name="quick_settings_ambient_display_label">Ambient display</string>

+15 −1

Original line number	Diff line number	Diff line
		@@ -23,9 +23,11 @@ import android.graphics.Rect;
		import android.graphics.drawable.Drawable;
		import android.os.Handler;
		import android.view.LayoutInflater;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.View.OnClickListener;
		import android.view.View.OnLayoutChangeListener;
		import android.view.View.OnTouchListener;
		import android.view.ViewGroup;
		import android.widget.FrameLayout;
		import android.widget.TextView;
		@@ -331,7 +333,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
		final String titleText;
		Resources res = mContext.getResources();
		if (mCurrentDrag == null) {
		titleText = res.getString(R.string.drag_to_add_tiles);
		titleText = res.getString(R.string.drag_or_tap_to_add_tiles);
		} else if (!canRemoveTiles() && mCurrentDrag.getAdapterPosition() < mEditIndex) {
		titleText = res.getString(R.string.drag_to_remove_disabled, mMinNumTiles);
		} else {
		@@ -412,6 +414,18 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
		if (position == mFocusIndex) {
		focusOnHolder(holder);
		}
		holder.mTileView.setOnTouchListener(new OnTouchListener() {
		@Override
		public boolean onTouch(View v, MotionEvent ev) {
		if (ev.getAction() == MotionEvent.ACTION_UP) {
		int position = holder.getLayoutPosition();
		if (position >= mEditIndex \|\| canRemoveTiles()) {
		move(position, mEditIndex, true);
		}
		}
		return false;
		}
		});
		}

		private void focusOnHolder(Holder holder) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -272,10 +272,10 @@ public class SystemUIToast implements ToastPlugin.Toast {

		private static boolean showApplicationIcon(ApplicationInfo appInfo,
		PackageManager packageManager) {
		if (hasFlag(appInfo.flags, FLAG_UPDATED_SYSTEM_APP)) {
		if (hasFlag(appInfo.flags, FLAG_UPDATED_SYSTEM_APP \| FLAG_SYSTEM)) {
		return packageManager.getLaunchIntentForPackage(appInfo.packageName) != null;
		}
		return !hasFlag(appInfo.flags, FLAG_SYSTEM);
		return true;
		}

		private static boolean hasFlag(int flags, int flag) {

+9 −1

Original line number	Diff line number	Diff line
		@@ -1720,9 +1720,17 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		mContext.getSystemService(Context.TELEPHONY_SERVICE);
		int type = AGPS_SETID_TYPE_NONE;
		String setId = null;
		final Boolean isEmergency = mNIHandler.getInEmergency();

		// Unless we are in an emergency, do not provide sensitive subscriber information
		// to SUPL servers.
		if (!isEmergency) {
		mGnssNative.setAgpsSetId(type, "");
		return;
		}

		int subId = SubscriptionManager.getDefaultDataSubscriptionId();
		if (mNIHandler.getInEmergency() && mNetworkConnectivityHandler.getActiveSubId() >= 0) {
		if (isEmergency && mNetworkConnectivityHandler.getActiveSubId() >= 0) {
		subId = mNetworkConnectivityHandler.getActiveSubId();
		}
		if (SubscriptionManager.isValidSubscriptionId(subId)) {