Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of git://codeaurora.org/platform/frameworks/base into cm-14.0 (ff94386f) · Commits · e / os / android_frameworks_base

core/java/android/provider/CallLog.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -208,6 +208,8 @@ public class CallLog {
		*/
		public static final int BLACKLIST_TYPE = 8;

		/** Call log type for outgoing IMS calls. */
		private static final int OUTGOING_IMS_TYPE = 9;
		/** Call log type for missed IMS calls. */
		private static final int MISSED_IMS_TYPE = 10;
		/**
		@@ -831,7 +833,8 @@ public class CallLog {
		c = resolver.query(
		CONTENT_URI,
		new String[] {NUMBER},
		TYPE + " = " + OUTGOING_TYPE,
		TYPE + " = " + OUTGOING_TYPE + " OR " + TYPE + " = " + OUTGOING_IMS_TYPE +
		" OR " + TYPE + " = " + OUTGOING_WIFI_TYPE,
		null,
		DEFAULT_SORT_ORDER + " LIMIT 1");
		if (c == null \|\| !c.moveToFirst()) {

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -6811,6 +6811,12 @@ public final class Settings {
		*/
		public static final String AIRPLANE_MODE_ON = "airplane_mode_on";

		/**
		* Whether VoLTE Preferred is on
		* @hide
		*/
		public static final String VOLTE_PREFERRED_ON = "volte_preferred_on";

		/**
		* Whether Theater Mode is on.
		* {@hide}

core/java/android/view/ViewRootImpl.java

100644 → 100755

+21 −7

Original line number	Diff line number	Diff line
		@@ -3386,6 +3386,7 @@ public final class ViewRootImpl implements ViewParent,
		private final static int MSG_DISPATCH_WINDOW_SHOWN = 25;
		private final static int MSG_REQUEST_KEYBOARD_SHORTCUTS = 26;
		private final static int MSG_UPDATE_POINTER_ICON = 27;
		private final static int MSG_HIGHTEXT_CONTRAST_CHANGED = 28;

		final class ViewRootHandler extends Handler {
		@Override
		@@ -3435,6 +3436,8 @@ public final class ViewRootImpl implements ViewParent,
		return "MSG_DISPATCH_WINDOW_SHOWN";
		case MSG_UPDATE_POINTER_ICON:
		return "MSG_UPDATE_POINTER_ICON";
		case MSG_HIGHTEXT_CONTRAST_CHANGED:
		return "MSG_HIGHTEXT_CONTRAST_CHANGED";
		}
		return super.getMessageName(message);
		}
		@@ -3693,6 +3696,9 @@ public final class ViewRootImpl implements ViewParent,
		MotionEvent event = (MotionEvent) msg.obj;
		resetPointerIcon(event);
		} break;
		case MSG_HIGHTEXT_CONTRAST_CHANGED: {
		handleHighTextContrastChange(msg.arg1 != 0);
		} break;
		}
		}
		}
		@@ -7272,19 +7278,27 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		void handleHighTextContrastChange(boolean enabled) {
		mAttachInfo.mHighContrastText = enabled;
		// Destroy Displaylists so they can be recreated with high contrast recordings
		destroyHardwareResources();
		// Schedule redraw, which will rerecord + redraw all text
		invalidate();
		}

		public void dispatchHighTextContrastChange(boolean enabled) {
		Message msg = mHandler.obtainMessage(MSG_HIGHTEXT_CONTRAST_CHANGED);
		msg.arg1 = enabled ? 1 : 0;
		mHandler.sendMessage(msg);
		}

		final class HighContrastTextManager implements HighTextContrastChangeListener {
		HighContrastTextManager() {
		mAttachInfo.mHighContrastText = mAccessibilityManager.isHighTextContrastEnabled();
		}
		@Override
		public void onHighTextContrastStateChanged(boolean enabled) {
		mAttachInfo.mHighContrastText = enabled;

		// Destroy Displaylists so they can be recreated with high contrast recordings
		destroyHardwareResources();

		// Schedule redraw, which will rerecord + redraw all text
		invalidate();
		dispatchHighTextContrastChange(enabled);
		}
		}

core/res/res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -514,6 +514,9 @@
		<!-- Integer indicating RSSI boost given to current network -->
		<integer translatable="false" name="config_wifi_framework_current_network_boost">16</integer>

		<!-- Integer indicating the number of selective channel scan when Wifi turn on -->
		<integer translatable="false" name="config_max_initial_scans_on_selective_channels">2</integer>

		<!-- Integer indicating how to handle beacons with uninitialized RSSI value of 0 -->
		<integer translatable="false" name="config_wifi_framework_scan_result_rssi_level_patchup_value">-85</integer>

		@@ -2726,4 +2729,5 @@
		<!-- Allow the gesture to tap the power button N times to start
		the Emergency Call while the device is non-interactive. -->
		<bool name="config_emergencyCallOnPowerkeyTapGestureEnabled">false</bool>
		<bool name="config_volte_preferred">false</bool>
		</resources>

core/res/res/values/symbols.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -355,6 +355,7 @@
		<java-symbol type="integer" name="config_wifi_framework_network_switch_tx_packet_threshold" />
		<java-symbol type="integer" name="config_wifi_framework_network_switch_rx_packet_threshold" />
		<java-symbol type="integer" name="config_wifi_framework_current_network_boost" />
		<java-symbol type="integer" name="config_max_initial_scans_on_selective_channels" />
		<java-symbol type="bool" name="config_send_sms1x_on_voice_call" />
		<java-symbol type="integer" name="config_bluetooth_max_advertisers" />
		<java-symbol type="integer" name="config_bluetooth_max_scan_filters" />
		@@ -2710,4 +2711,5 @@
		<java-symbol type="integer" name="power_key_hits_emergency" />
		<java-symbol type="bool" name="config_emergencyCallOnPowerkeyTapGestureEnabled" />
		<java-symbol type="bool" name="config_usb_data_unlock" />
		<java-symbol type="bool" name="config_volte_preferred" />
		</resources>