Merge "Support self-explanatory icon for GET INKEY and GET INPUT commands" (f80c9f7a) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/cat/CommandParamsFactory.java

100755 → 100644

+2 −0

Original line number	Diff line number	Diff line
		@@ -454,6 +454,7 @@ class CommandParamsFactory extends Handler {
		ctlv = searchForTag(ComprehensionTlvTag.ICON_ID, ctlvs);
		if (ctlv != null) {
		iconId = ValueParser.retrieveIconId(ctlv);
		input.iconSelfExplanatory = iconId.selfExplanatory;
		}

		// parse duration
		@@ -531,6 +532,7 @@ class CommandParamsFactory extends Handler {
		ctlv = searchForTag(ComprehensionTlvTag.ICON_ID, ctlvs);
		if (ctlv != null) {
		iconId = ValueParser.retrieveIconId(ctlv);
		input.iconSelfExplanatory = iconId.selfExplanatory;
		}

		input.digitOnly = (cmdDet.commandQualifier & 0x01) == 0;

+4 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ public class Input implements Parcelable {
		public boolean yesNo;
		public boolean helpAvailable;
		public Duration duration;
		public boolean iconSelfExplanatory;

		Input() {
		text = "";
		@@ -51,6 +52,7 @@ public class Input implements Parcelable {
		yesNo = false;
		helpAvailable = false;
		duration = null;
		iconSelfExplanatory = false;
		}

		private Input(Parcel in) {
		@@ -66,6 +68,7 @@ public class Input implements Parcelable {
		yesNo = in.readInt() == 1 ? true : false;
		helpAvailable = in.readInt() == 1 ? true : false;
		duration = in.readParcelable(null);
		iconSelfExplanatory = in.readInt() == 1 ? true : false;
		}

		@Override
		@@ -87,6 +90,7 @@ public class Input implements Parcelable {
		dest.writeInt(yesNo ? 1 : 0);
		dest.writeInt(helpAvailable ? 1 : 0);
		dest.writeParcelable(duration, 0);
		dest.writeInt(iconSelfExplanatory ? 1 : 0);
		}

		public static final Parcelable.Creator<Input> CREATOR = new Parcelable.Creator<Input>() {