diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2015-01-16 16:31:29 +0000 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2016-01-12 12:55:29 -0800 |
| commit | 2c3e40d3af620990aaba1a4ac9f32629d2ff4b16 (patch) | |
| tree | d00800bb85a93ae2132db8c8bbc93240f755c837 /res/layout | |
| parent | 35a185c53180b4e4996de3c7b49baf6a327cb647 (diff) | |
| download | packages_apps_Settings-2c3e40d3af620990aaba1a4ac9f32629d2ff4b16.zip packages_apps_Settings-2c3e40d3af620990aaba1a4ac9f32629d2ff4b16.tar.gz packages_apps_Settings-2c3e40d3af620990aaba1a4ac9f32629d2ff4b16.tar.bz2 | |
Squash commit of SAR and IC Code.
TICKET: CYNGNOS-1586
Settings: Show SAR on Regulatory Info (from CM11)
This brings these three commits from CM11:
Settings: Create SAR level preference, allow overlay.
Change-Id: I1af616696702f72b8a6276b3b01e940d61735137
Change Regulatory Info Activity to prefer string over image
Change-Id: I9ea5c2bf469af8f654ec4e4bb4f2a8a5738e6a95
Settings: Allow Regulator Information Dialog Title to be overlaid.
Change-Id: I5aead313589f5d5291d20a0388d2d8bc7242b711
Settings: Refactory regulatory dialog. Display IC Code.
Change-Id: Id268830404d09eed318e38474fe1a9062fc4e962
Diffstat (limited to 'res/layout')
| -rwxr-xr-x | res/layout/regulatory_info.xml | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml index fd888d9..2af43d8 100755 --- a/res/layout/regulatory_info.xml +++ b/res/layout/regulatory_info.xml @@ -13,15 +13,33 @@ See the License for the specific language governing permissions and limitations under the License. --> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView + android:id="@+id/sarValues" + android:textColor="@color/regulatory_text_color" + android:textSize="14sp" + android:padding="5dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center"/> + <TextView + android:id="@+id/icCodes" + android:textColor="@color/regulatory_text_color" + android:textSize="14sp" + android:padding="5dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center"/> <ImageView android:id="@+id/regulatoryInfo" android:adjustViewBounds="true" android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="centerCrop" - android:src="@drawable/regulatory_info" /> -</ScrollView> + android:src="@drawable/regulatory_info" + android:visibility="gone"/> +</LinearLayout> |