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

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

Browse Source 
automerge: d67ad20

* commit 'd67ad203db73eb986f105cf65c85467ad610b221':
  Add button in "hidden" settings to flip "VoLTE Provisioned" flag
This commit is contained in:
Pavel Zhamaitsiak
2015-01-28 21:28:39 +00:00
committed by android-build-merger
parent ab4068c387 d67ad203db
commit dd8aa9d3d2
4 changed files with 66 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout/radio_info.xml
View File

@@ -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"