diff options
| author | Pavel Zhamaitsiak <pavelz@google.com> | 2015-01-28 21:28:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-28 21:28:39 +0000 |
| commit | dd8aa9d3d2b4ba5df960aea630b6b370b0c97278 (patch) | |
| tree | eb85fc2ca69ea23dda0138c5b6046bdaae8f229e /res/layout | |
| parent | ab4068c387d9219f1b5f0b596028ccac6cfd2788 (diff) | |
| parent | d67ad203db73eb986f105cf65c85467ad610b221 (diff) | |
| download | packages_apps_Settings-dd8aa9d3d2b4ba5df960aea630b6b370b0c97278.zip packages_apps_Settings-dd8aa9d3d2b4ba5df960aea630b6b370b0c97278.tar.gz packages_apps_Settings-dd8aa9d3d2b4ba5df960aea630b6b370b0c97278.tar.bz2 | |
resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp
automerge: d67ad20
* commit 'd67ad203db73eb986f105cf65c85467ad610b221':
Add button in "hidden" settings to flip "VoLTE Provisioned" flag
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/radio_info.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml index d81dad6..a288224 100644 --- a/res/layout/radio_info.xml +++ b/res/layout/radio_info.xml @@ -226,6 +226,14 @@ android:layout_height="wrap_content" /> + <!-- VoLTE provisioned --> + <Button android:id="@+id/volte_provisioned_flag" + android:textSize="14sp" + android:layout_marginTop="8dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + /> + <!-- SMS over IMS --> <Button android:id="@+id/sms_over_ims" android:textSize="14sp" |