| diff --cc packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java |
| index ba64768e7ba,4530f8062f0..00000000000 |
| --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java |
| +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java |
| @@@ -2601,8 -2601,8 +2601,13 @@@ class DatabaseHelper extends SQLiteOpen |
| for (int phoneId = 0; |
| phoneId < TelephonyManager.getDefault().getPhoneCount(); phoneId++) { |
| mode = TelephonyManager.getTelephonyProperty(phoneId, |
| ++<<<<<<< HEAD |
| + "ro.telephony.default_network", |
| + Integer.toString(RILConstants.NETWORK_MODE_WCDMA_PREF)); |
| ++======= |
| + "ro.telephony.default_network", |
| + Integer.toString(RILConstants.PREFERRED_NETWORK_MODE)); |
| ++>>>>>>> keystone/p-fs-release |
| if (phoneId == 0) { |
| val = mode; |
| } else { |
| diff --cc packages/SystemUI/res/layout/mobile_signal_group.xml |
| index 34084240014,2da03d2590e..00000000000 |
| --- a/packages/SystemUI/res/layout/mobile_signal_group.xml |
| +++ b/packages/SystemUI/res/layout/mobile_signal_group.xml |
| @@@ -66,56 -60,19 +72,73 @@@ |
| <FrameLayout |
| android:layout_width="wrap_content" |
| android:layout_height="wrap_content" |
| ++<<<<<<< HEAD |
| + > |
| + <FrameLayout |
| + android:id="@+id/mobile_signal_single" |
| + android:layout_width="wrap_content" |
| + android:layout_height="wrap_content" |
| + > |
| + <com.android.systemui.statusbar.AnimatedImageView |
| + android:theme="@style/DualToneLightTheme" |
| + android:id="@+id/mobile_signal" |
| + android:layout_height="wrap_content" |
| + android:layout_width="wrap_content" |
| + systemui:hasOverlappingRendering="false" |
| + /> |
| + <com.android.systemui.statusbar.AnimatedImageView |
| + android:theme="@style/DualToneDarkTheme" |
| + android:id="@+id/mobile_signal_dark" |
| + android:layout_height="wrap_content" |
| + android:layout_width="wrap_content" |
| + android:alpha="0.0" |
| + systemui:hasOverlappingRendering="false" |
| + /> |
| + <ImageView |
| + android:id="@+id/mobile_roaming" |
| + android:layout_width="wrap_content" |
| + android:layout_height="17dp" |
| + android:paddingStart="22dp" |
| + android:paddingTop="1.5dp" |
| + android:paddingBottom="3dp" |
| + android:scaleType="fitCenter" |
| + android:src="@drawable/stat_sys_roaming" |
| + android:contentDescription="@string/data_connection_roaming" |
| + android:visibility="gone" /> |
| + </FrameLayout> |
| + <LinearLayout |
| + android:id="@+id/mobile_signal_stacked" |
| + android:layout_width="wrap_content" |
| + android:layout_height="wrap_content" |
| + android:orientation="vertical" |
| + android:visibility="gone" |
| + > |
| + <ImageView |
| + android:id="@+id/mobile_signal_data" |
| + android:layout_width="wrap_content" |
| + android:layout_height="wrap_content" |
| + /> |
| + <ImageView |
| + android:id="@+id/mobile_signal_voice" |
| + android:layout_width="wrap_content" |
| + android:layout_height="wrap_content" |
| + /> |
| + </LinearLayout> |
| ++======= |
| + android:layout_gravity="center_vertical"> |
| + <com.android.systemui.statusbar.AnimatedImageView |
| + android:id="@+id/mobile_signal" |
| + android:layout_height="wrap_content" |
| + android:layout_width="wrap_content" |
| + systemui:hasOverlappingRendering="false" |
| + /> |
| + <ImageView |
| + android:id="@+id/mobile_roaming" |
| + android:layout_width="wrap_content" |
| + android:layout_height="wrap_content" |
| + android:src="@drawable/stat_sys_roaming" |
| + android:contentDescription="@string/data_connection_roaming" |
| + android:visibility="gone" /> |
| ++>>>>>>> keystone/p-fs-release |
| </FrameLayout> |
| </com.android.keyguard.AlphaOptimizedLinearLayout> |
| diff --cc packages/SystemUI/res/values-zh-rCN/strings.xml |
| index 8189c1d2e37,b0d08d49cc4..00000000000 |
| --- a/packages/SystemUI/res/values-zh-rCN/strings.xml |
| +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml |
| @@@ -148,18 -150,19 +150,34 @@@ |
| <string name="accessibility_desc_off" msgid="6475508157786853157">"关闭。"</string> |
| <string name="accessibility_desc_connected" msgid="8366256693719499665">"已连接。"</string> |
| <string name="accessibility_desc_connecting" msgid="3812924520316280149">"正在连接。"</string> |
| ++<<<<<<< HEAD |
| + <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> |
| + <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> |
| + <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> |
| + <string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string> |
| + <string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string> |
| + <string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string> |
| + <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string> |
| + <string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string> |
| + <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string> |
| + <string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string> |
| + <string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"数据漫游"</string> |
| + <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string> |
| ++======= |
| + <string name="data_connection_gprs" msgid="7652872568358508452">"GPRS"</string> |
| + <string name="data_connection_1x" msgid="396105635197711584">"1 X"</string> |
| + <string name="data_connection_hspa" msgid="1499615426569473562">"HSPA"</string> |
| + <string name="data_connection_3g" msgid="503045449315378373">"3G"</string> |
| + <string name="data_connection_3_5g" msgid="5218328297191657602">"3.5G"</string> |
| + <string name="data_connection_3_5g_plus" msgid="7570783890290275297">"3.5G+"</string> |
| + <string name="data_connection_4g" msgid="9139963475267449144">"4G"</string> |
| + <string name="data_connection_4g_plus" msgid="1148687201877800700">"4G+"</string> |
| + <string name="data_connection_lte" msgid="2694876797724028614">"LTE"</string> |
| + <string name="data_connection_lte_plus" msgid="3423013208570937424">"LTE+"</string> |
| + <string name="data_connection_cdma" msgid="4677985502159869585">"CDMA"</string> |
| + <string name="data_connection_roaming" msgid="6037232010953697354">"漫游"</string> |
| + <string name="data_connection_edge" msgid="871835227939216682">"EDGE"</string> |
| ++>>>>>>> keystone/p-fs-release |
| <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"WLAN"</string> |
| <string name="accessibility_no_sim" msgid="8274017118472455155">"无 SIM 卡。"</string> |
| <string name="accessibility_cell_data" msgid="5326139158682385073">"移动数据"</string> |
| diff --cc packages/SystemUI/res/values-zh-rTW/strings.xml |
| index 695677ee9f8,e3c521dee94..00000000000 |
| --- a/packages/SystemUI/res/values-zh-rTW/strings.xml |
| +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml |
| @@@ -148,18 -150,19 +150,34 @@@ |
| <string name="accessibility_desc_off" msgid="6475508157786853157">"關閉。"</string> |
| <string name="accessibility_desc_connected" msgid="8366256693719499665">"已連線。"</string> |
| <string name="accessibility_desc_connecting" msgid="3812924520316280149">"連線中。"</string> |
| ++<<<<<<< HEAD |
| + <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> |
| + <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> |
| + <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> |
| + <string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string> |
| + <string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string> |
| + <string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string> |
| + <string name="accessibility_data_connection_4g_plus" msgid="3032226872470658661">"4G+"</string> |
| + <string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string> |
| + <string name="accessibility_data_connection_lte_plus" msgid="361876866906946007">"LTE+"</string> |
| + <string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string> |
| + <string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"數據漫遊"</string> |
| + <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string> |
| ++======= |
| + <string name="data_connection_gprs" msgid="7652872568358508452">"GPRS"</string> |
| + <string name="data_connection_1x" msgid="396105635197711584">"1 X"</string> |
| + <string name="data_connection_hspa" msgid="1499615426569473562">"HSPA"</string> |
| + <string name="data_connection_3g" msgid="503045449315378373">"3G"</string> |
| + <string name="data_connection_3_5g" msgid="5218328297191657602">"3.5G"</string> |
| + <string name="data_connection_3_5g_plus" msgid="7570783890290275297">"3.5G+"</string> |
| + <string name="data_connection_4g" msgid="9139963475267449144">"4G"</string> |
| + <string name="data_connection_4g_plus" msgid="1148687201877800700">"4G+"</string> |
| + <string name="data_connection_lte" msgid="2694876797724028614">"LTE"</string> |
| + <string name="data_connection_lte_plus" msgid="3423013208570937424">"LTE+"</string> |
| + <string name="data_connection_cdma" msgid="4677985502159869585">"CDMA"</string> |
| + <string name="data_connection_roaming" msgid="6037232010953697354">"漫遊"</string> |
| + <string name="data_connection_edge" msgid="871835227939216682">"EDGE"</string> |
| ++>>>>>>> keystone/p-fs-release |
| <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string> |
| <string name="accessibility_no_sim" msgid="8274017118472455155">"沒有 SIM 卡。"</string> |
| <string name="accessibility_cell_data" msgid="5326139158682385073">"行動數據"</string> |
| diff --cc packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java |
| index 1bc27343be6,3cf77416f15..00000000000 |
| --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java |
| +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java |
| @@@ -648,12 -614,8 +645,13 @@@ public class SignalClusterView extends |
| private ImageView mMobileActivityOut; |
| public boolean mActivityIn; |
| public boolean mActivityOut; |
| + private SignalDrawable mMobileSignalDrawable; |
| |
| + private int mDataActivityId = 0; |
| + private int mStackedDataId = 0, mStackedVoiceId = 0; |
| + private ImageView mDataActivity, mStackedData, mStackedVoice; |
| + private ViewGroup mMobileSingleGroup, mMobileStackedGroup; |
| + |
| public PhoneState(int subId, Context context) { |
| ViewGroup root = (ViewGroup) LayoutInflater.from(context) |
| .inflate(R.layout.mobile_signal_group, null); |
| @@@ -664,33 -626,19 +662,42 @@@ |
| public void setViews(ViewGroup root) { |
| mMobileGroup = root; |
| mMobile = root.findViewById(R.id.mobile_signal); |
| - mMobileDark = root.findViewById(R.id.mobile_signal_dark); |
| mMobileType = root.findViewById(R.id.mobile_type); |
| mMobileRoaming = root.findViewById(R.id.mobile_roaming); |
| + mMobileRoamingSpace = root.findViewById(R.id.mobile_roaming_space); |
| mMobileActivityIn = root.findViewById(R.id.mobile_in); |
| mMobileActivityOut = root.findViewById(R.id.mobile_out); |
| ++<<<<<<< HEAD |
| + // TODO: Remove the 2 instances because now the drawable can handle darkness. |
| + mMobile.setImageDrawable(new SignalDrawable(mMobile.getContext())); |
| + SignalDrawable drawable = new SignalDrawable(mMobileDark.getContext()); |
| + drawable.setDarkIntensity(1); |
| + mMobileDark.setImageDrawable(drawable); |
| + mDataActivity = (ImageView) root.findViewById(R.id.data_inout); |
| + mStackedData = (ImageView) root.findViewById(R.id.mobile_signal_data); |
| + mStackedVoice = (ImageView) root.findViewById(R.id.mobile_signal_voice); |
| + mMobileSingleGroup = (ViewGroup) root.findViewById(R.id.mobile_signal_single); |
| + mMobileStackedGroup = (ViewGroup) root.findViewById(R.id.mobile_signal_stacked); |
| ++======= |
| + mMobileSignalDrawable = new SignalDrawable(mMobile.getContext()); |
| + mMobile.setImageDrawable(mMobileSignalDrawable); |
| ++>>>>>>> keystone/p-fs-release |
| } |
| |
| public boolean apply(boolean isSecondaryIcon) { |
| if (mMobileVisible && !mIsAirplaneMode) { |
| if (mLastMobileStrengthId != mMobileStrengthId) { |
| ++<<<<<<< HEAD |
| + if (mReadIconsFromXML) { |
| + setIconForView(mMobile, mMobileStrengthId); |
| + setIconForView(mMobileDark, mMobileStrengthId); |
| + }else { |
| + mMobile.getDrawable().setLevel(mMobileStrengthId); |
| + mMobileDark.getDrawable().setLevel(mMobileStrengthId); |
| + } |
| ++======= |
| + mMobile.getDrawable().setLevel(mMobileStrengthId); |
| ++>>>>>>> keystone/p-fs-release |
| mLastMobileStrengthId = mMobileStrengthId; |
| } |
| |
| @@@ -734,10 -663,10 +736,15 @@@ |
| (mMobileVisible ? "VISIBLE" : "GONE"), mMobileStrengthId, mMobileTypeId)); |
| |
| mMobileType.setVisibility(mMobileTypeId != 0 ? View.VISIBLE : View.GONE); |
| ++<<<<<<< HEAD |
| + mMobileRoaming.setVisibility((mRoaming && !mReadIconsFromXML)? View.VISIBLE : View.GONE); |
| ++======= |
| + mMobileRoaming.setVisibility(mRoaming ? View.VISIBLE : View.GONE); |
| + mMobileRoamingSpace.setVisibility(mRoaming ? View.VISIBLE : View.GONE); |
| ++>>>>>>> keystone/p-fs-release |
| mMobileActivityIn.setVisibility(mActivityIn ? View.VISIBLE : View.GONE); |
| mMobileActivityOut.setVisibility(mActivityOut ? View.VISIBLE : View.GONE); |
| + mDataActivity.setVisibility(mDataActivityId != 0 ? View.VISIBLE : View.GONE); |
| |
| return mMobileVisible; |
| } |
| diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java |
| index 2d12c2a059c,0716b37ff8d..00000000000 |
| --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java |
| +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java |
| @@@ -918,9 -914,15 +919,22 @@@ public class KeyguardBottomAreaView ext |
| } |
| } |
| |
| ++<<<<<<< HEAD |
| + private void updateEmergencyButton() { |
| + if (mEmergencyButton != null) { |
| + mEmergencyButton.updateEmergencyCallButton(); |
| + } |
| ++======= |
| + @Override |
| + public WindowInsets onApplyWindowInsets(WindowInsets insets) { |
| + int bottom = insets.getDisplayCutout() != null |
| + ? insets.getDisplayCutout().getSafeInsetBottom() : 0; |
| + if (isPaddingRelative()) { |
| + setPaddingRelative(getPaddingStart(), getPaddingTop(), getPaddingEnd(), bottom); |
| + } else { |
| + setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), bottom); |
| + } |
| + return insets; |
| ++>>>>>>> keystone/p-fs-release |
| } |
| } |
| diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java |
| index 50511af0eae,04cb620be9d..00000000000 |
| --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java |
| +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java |
| @@@ -51,8 -46,6 +46,11 @@@ import com.android.systemui.doze.DozeLo |
| import com.android.systemui.statusbar.FlingAnimationUtils; |
| import com.android.systemui.statusbar.StatusBarState; |
| import com.android.systemui.statusbar.VibratorHelper; |
| ++<<<<<<< HEAD |
| +import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; |
| +import android.util.BoostFramework; |
| ++======= |
| ++>>>>>>> keystone/p-fs-release |
| |
| import java.io.FileDescriptor; |
| import java.io.PrintWriter; |
| @@@ -218,11 -208,9 +218,11 @@@ public abstract class PanelView extend |
| mFalsingManager = FalsingManager.getInstance(context); |
| mNotificationsDragEnabled = |
| getResources().getBoolean(R.bool.config_enableNotificationShadeDrag); |
| - mVibratorHelper = new VibratorHelper(context); |
| + mVibratorHelper = Dependency.get(VibratorHelper.class); |
| mVibrateOnOpening = mContext.getResources().getBoolean( |
| R.bool.config_vibrateOnIconAnimation); |
| + |
| + mPerf = new BoostFramework(); |
| } |
| |
| protected void loadDimens() { |
| diff --cc telephony/java/com/android/internal/telephony/RILConstants.java |
| index c1c6b2f1118,ee7084ad86c..00000000000 |
| --- a/telephony/java/com/android/internal/telephony/RILConstants.java |
| +++ b/telephony/java/com/android/internal/telephony/RILConstants.java |
| @@@ -163,11 -163,8 +163,16 @@@ public interface RILConstants |
| int NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA = 20; /* TD-SCDMA, GSM/WCDMA and LTE */ |
| int NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 21; /*TD-SCDMA,EvDo,CDMA,GSM/WCDMA*/ |
| int NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 22; /* TD-SCDMA/LTE/GSM/WCDMA, CDMA, and EvDo */ |
| ++<<<<<<< HEAD |
| + |
| + int PREFERRED_NETWORK_MODE = Integer.parseInt(TelephonyManager.getTelephonyProperty( |
| + 0/* return first slot n/w mode when used PREFERRED_NETWORK_MODE */, |
| + "ro.telephony.default_network", |
| + Integer.toString(NETWORK_MODE_WCDMA_PREF))); |
| ++======= |
| + int PREFERRED_NETWORK_MODE = Integer.parseInt(TelephonyManager.getTelephonyProperty(0, |
| + "ro.telephony.default_network", Integer.toString(NETWORK_MODE_WCDMA_PREF))); |
| ++>>>>>>> keystone/p-fs-release |
| |
| int BAND_MODE_UNSPECIFIED = 0; //"unspecified" (selected by baseband automatically) |
| int BAND_MODE_EURO = 1; //"EURO band" (GSM-900 / DCS-1800 / WCDMA-IMT-2000) |