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

Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev

Browse Source
This commit is contained in:
Amit Mahajan
2015-05-01 16:49:41 +00:00
committed by Android (Google) Code Review
parent 0488dc9768 7e28221640
commit 0255f595bd
3 changed files with 143 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
res/values/arrays.xml
View File

@@ -526,18 +526,57 @@
<!-- Bearer Info used in APN editor -->
<string-array name="bearer_entries">
<item>LTE</item>
<item>eHRPD</item>
<item>Unspecified</item>
<item>LTE</item>
<item>HSPAP</item>
<item>HSPA</item>
<item>HSUPA</item>
<item>HSDPA</item>
<item>UMTS</item>
<item>EDGE</item>
<item>GPRS</item>
<item>eHRPD</item>
<item>EVDO_B</item>
<item>EVDO_A</item>
<item>EVDO_0</item>
<item>1xRTT</item>
<item>IS95B</item>
<item>IS95A</item>
</string-array>
<string-array translatable="false" name="bearer_values">
<!-- Do not translate. -->
<item>0</item>
<!-- Do not translate. -->
<item>14</item>
<!-- Do not translate. -->
<item>15</item>
<!-- Do not translate. -->
<item>11</item>
<!-- Do not translate. -->
<item>10</item>
<!-- Do not translate. -->
<item>9</item>
<!-- Do not translate. -->
<item>3</item>
<!-- Do not translate. -->
<item>2</item>
<!-- Do not translate. -->
<item>1</item>
<!-- Do not translate. -->
<item>13</item>
<!-- Do not translate. -->
<item>0</item>
<item>12</item>
<!-- Do not translate. -->
<item>8</item>
<!-- Do not translate. -->
<item>7</item>
<!-- Do not translate. -->
<item>6</item>
<!-- Do not translate. -->
<item>5</item>
<!-- Do not translate. -->
<item>4</item>
</string-array>
<!-- MVNO Info used in APN editor -->

6
res/xml/apn_editor.xml
View File

@@ -135,9 +135,9 @@
android:summaryOn="@string/carrier_enabled_summaryOn"
android:summaryOff="@@string/carrier_enabled_summaryOff"
/>
<ListPreference
<MultiSelectListPreference
android:title="@string/bearer"
android:key="bearer"
android:key="bearer_multi"
android:entries="@array/bearer_entries"
android:entryValues="@array/bearer_values"
/>
@@ -154,4 +154,4 @@
android:singleLine="true"
android:inputType="text"
/>
</PreferenceScreen>
</PreferenceScreen>