PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp

Browse Source 
Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80
This commit is contained in:
Sanket Padawe
2014-10-09 20:19:59 -07:00
parent 711785f59c 61719a801c
commit ce1bfbb04e
4 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/layout/multi_sim_dialog.xml
View File

@@ -95,28 +95,6 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/sim_label_padding"
android:layout_marginTop="@dimen/sim_dialog_margin_top"
android:text="@string/sim_editor_num_format" />
<Spinner android:id="@+id/display_numbers"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:entries="@array/sim_card_data_range"
android:paddingBottom="@dimen/sim_dialog_margin_bottom"
android:paddingStart="@dimen/sim_content_padding"
android:prompt="@string/sim_editor_num_format" />
</LinearLayout>
</LinearLayout>
</ScrollView>

8
res/values/arrays.xml
View File

@@ -408,14 +408,6 @@
<item>Set usage cycle...</item>
</string-array>
<!-- Sim Cards display numbers. Range of data usage. -->
<string-array name="sim_card_data_range">
<!-- Last 4 digits [CHAR LIMIT=40]-->
<item>Last 4 digits</item>
<!-- First 4 digits [CHAR LIMIT=40]-->
<item>First 4 digits</item>
</string-array>
<!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
<string-array name="wifi_frequency_band_entries">
<!-- Operation on both 2.4 GHz and 5 GHz [CHAR LIMIT=25]-->

2
res/values/strings.xml
View File

@@ -5491,8 +5491,6 @@
<string name="sim_editor_number">Number</string>
<!-- Color label of Sim Editor. [CHAR LIMIT=40] -->
<string name="sim_editor_color">SIM color</string>
<!-- Display label numbers of Sim Editor. [CHAR LIMIT=40] -->
<string name="sim_editor_num_format">Display numbers</string>
<!-- Select label Title of Sim Editor. [CHAR LIMIT=40] -->
<string name="sim_card_select_title">Select SIM card</string>
<!-- Orange label. [CHAR LIMIT=40] -->

7
src/com/android/settings/sim/SimSettings.java
View File

@@ -449,13 +449,6 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
@Override
public void onClick(DialogInterface dialog, int whichButton) {
final EditText nameText = (EditText)dialogLayout.findViewById(R.id.sim_name);
final Spinner displayNumbers =
(Spinner)dialogLayout.findViewById(R.id.display_numbers);
SubscriptionManager.setDisplayNumberFormat(
displayNumbers.getSelectedItemPosition() == 0
? SubscriptionManager.DISPLAY_NUMBER_LAST
: SubscriptionManager.DISPLAY_NUMBER_FIRST, mSubInfoRecord.subId);
mSubInfoRecord.displayName = nameText.getText().toString();
SubscriptionManager.setDisplayName(mSubInfoRecord.displayName,