diff options
| author | kecinzer <kecinzer@gmail.com> | 2014-03-12 07:56:37 +0100 |
|---|---|---|
| committer | LorDClockaN <davor@losinj.com> | 2014-03-12 18:33:13 +0100 |
| commit | abcd89298622b55f42c70860a314a516ed4e8e6d (patch) | |
| tree | fbd661adbfb71d4544bd955e847a6cd5043ba567 | |
| parent | bb3950dce82b067fb72ac2551fa0b5980c82f282 (diff) | |
Networkstate mode toggle [3/3]
Change-Id: I296c14a775efb49a93cc70723e123f301ffe4015
Signed-off-by: kecinzer <kecinzer@gmail.com>
| -rw-r--r-- | res/layout/fragment_toggle_setup.xml | 12 | ||||
| -rw-r--r-- | res/values-cs/strings.xml | 5 | ||||
| -rw-r--r-- | res/values/arrays_settings.xml | 12 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | src/com/aokp/romcontrol/fragments/toggles/ToggleSettingsFragment.java | 17 |
5 files changed, 51 insertions, 1 deletions
diff --git a/res/layout/fragment_toggle_setup.xml b/res/layout/fragment_toggle_setup.xml index 66711e4..1e9e8d1 100644 --- a/res/layout/fragment_toggle_setup.xml +++ b/res/layout/fragment_toggle_setup.xml @@ -124,5 +124,17 @@ android:entryValues="@array/screenshot_delayValues" /> + <com.aokp.romcontrol.settings.SingleChoiceSetting + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/network_modes_toggle" + + android:key="network_modes_toggle" + android:title="@string/network_modes_toggle_title" + android:entries="@array/network_modes_toggle_entries" + android:entryValues="@array/network_modes_toggle_values" + android:defaultValue="1" + /> + </LinearLayout> </ScrollView> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index f15f68f..29b0703 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -234,6 +234,11 @@ <string name="toggle_favcontact_summary">Zvolit oblíbený kontakt</string> <string name="toggle_screenshot_delay_title">Prodleva snímku obrazovky</string> <string name="toggle_screenshot_delay_summary">Prodleva před odesláním pokynu k pořízení snímku obrazovky</string> + <string name="network_modes_toggle_title">Síťové režimy k přepínání</string> + <string name="network_modes_toggle_all">Všechny (LTE/3G/2G)</string> + <string name="network_modes_toggle_lte2g">LTE/2G</string> + <string name="hide_ribbon_timeout_lte3g">LTE/3G</string> + <string name="hide_ribbon_timeout_3g2g">3G/2G</string> <string name="enable_navigation_bar_title">Zapnout navigační lištu</string> <string name="enable_navigation_bar_summary">Zapnout navigační lištu na obrazovce</string> <string name="navbar_ring_cat">Položky navigačního kruhu</string> diff --git a/res/values/arrays_settings.xml b/res/values/arrays_settings.xml index 651712b..82b857b 100644 --- a/res/values/arrays_settings.xml +++ b/res/values/arrays_settings.xml @@ -248,6 +248,18 @@ <item>7000</item> <item>8000</item> </string-array> + <string-array name="network_modes_toggle_entries" translatable="false"> + <item>@string/network_modes_toggle_all</item> + <item>@string/network_modes_toggle_lte2g</item> + <item>@string/hide_ribbon_timeout_lte3g</item> + <item>@string/hide_ribbon_timeout_3g2g</item> + </string-array> + <string-array name="network_modes_toggle_values" translatable="false"> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + </string-array> <string-array name="power_menuEntries" translatable="false"> <item>@string/hide_option</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 901884d..aec6100 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -318,6 +318,12 @@ <string name="toggle_screenshot_delay_title">Screenshot delay</string> <string name="toggle_screenshot_delay_summary">Delay for screenshot toggle to send intent to capture screen</string> + <string name="network_modes_toggle_title">Network modes for toggle</string> + <string name="network_modes_toggle_all">All (LTE/3G/2G)</string> + <string name="network_modes_toggle_lte2g">LTE/2G</string> + <string name="hide_ribbon_timeout_lte3g">LTE/3G</string> + <string name="hide_ribbon_timeout_3g2g">3G/2G</string> + <!-- Navigation Bar --> <string name="enable_navigation_bar_title">Enable navigation bar</string> <string name="enable_navigation_bar_summary">Enable the on-screen navigation bar</string> diff --git a/src/com/aokp/romcontrol/fragments/toggles/ToggleSettingsFragment.java b/src/com/aokp/romcontrol/fragments/toggles/ToggleSettingsFragment.java index 21ed4cf..6793b0f 100644 --- a/src/com/aokp/romcontrol/fragments/toggles/ToggleSettingsFragment.java +++ b/src/com/aokp/romcontrol/fragments/toggles/ToggleSettingsFragment.java @@ -25,10 +25,12 @@ import android.net.Uri; import android.os.Bundle; import android.provider.ContactsContract; import android.provider.Settings; +import android.telephony.TelephonyManager; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import com.android.internal.telephony.PhoneConstants; import com.aokp.romcontrol.R; import com.aokp.romcontrol.settings.BaseSetting; import com.aokp.romcontrol.settings.BaseSetting.OnSettingChangedListener; @@ -42,7 +44,7 @@ public class ToggleSettingsFragment extends Fragment implements OnSettingChanged private final int PICK_CONTACT = 200; BaseSetting mTogglesFast, mSwipeToSwitch, mFavContact; - SingleChoiceSetting mTogglesPerRow, mToggleStyle, mToggleSide; + SingleChoiceSetting mTogglesPerRow, mToggleStyle, mToggleSide, mToggleNetworkModes; public ToggleSettingsFragment() { @@ -58,6 +60,10 @@ public class ToggleSettingsFragment extends Fragment implements OnSettingChanged mToggleStyle = (SingleChoiceSetting) v.findViewById(R.id.toggles_style); mToggleSide = (SingleChoiceSetting) v.findViewById(R.id.toggles_fast_side); mFavContact = (BaseSetting) v.findViewById(R.id.toggles_fav_contact); + mToggleNetworkModes = (SingleChoiceSetting) v.findViewById(R.id.network_modes_toggle); + if (!hasLTE()) { + mToggleNetworkModes.setVisibility(View.GONE); + } mToggleStyle.setOnSettingChangedListener(this); mFavContact.setOnClickListener(this); @@ -125,4 +131,13 @@ public class ToggleSettingsFragment extends Fragment implements OnSettingChanged } super.onActivityResult(requestCode, resultCode, data); } + + private boolean hasLTE() { + if (TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE + || TelephonyManager.getLteOnGsmModeStatic() != 0) { + return true; + } else { + return false; + } + } } |
