diff options
| author | mingwax <mingwax@codeaurora.org> | 2017-05-11 11:18:11 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-29 19:26:04 -0700 |
| commit | 7050adb7ff6c3eb1e7c7bbf3b3c332c41b20c677 (patch) | |
| tree | 983df10c671b4b423db81a4d1a0d58eefa93508a /res/layout | |
| parent | a5eb667e4f654501063ade99f2ce7ededed1515a (diff) | |
| download | android_packages_apps_Snap-7050adb7ff6c3eb1e7c7bbf3b3c332c41b20c677.tar.gz android_packages_apps_Snap-7050adb7ff6c3eb1e7c7bbf3b3c332c41b20c677.tar.bz2 android_packages_apps_Snap-7050adb7ff6c3eb1e7c7bbf3b3c332c41b20c677.zip | |
SnapdragonCamera： Fix UI Display confusion in ProMode
Refactoring the layout of pro_mode_layout.xml, optimizing layout
files, and reducing performace overhead.
CRs-Fixed: 2027214
Change-Id: I7005b5a38498b6867c0d6b971aef13fcd1359433
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/pro_mode_layout.xml | 114 |
1 files changed, 37 insertions, 77 deletions
diff --git a/res/layout/pro_mode_layout.xml b/res/layout/pro_mode_layout.xml index 54ccb556c..b295ac318 100644 --- a/res/layout/pro_mode_layout.xml +++ b/res/layout/pro_mode_layout.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. +<!-- Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -35,114 +35,74 @@ <com.android.camera.ui.RotateLayout android:id="@+id/exposure_rotate_layout" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"> - <LinearLayout - android:id="@+id/exposure_layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + <TextView + android:id="@+id/exposure_value" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:focusable="true" + android:drawableTop="@drawable/promode_exposure" android:gravity="center" - android:orientation="vertical"> + android:layout_gravity="center" + android:layout_weight="1"/> - <ImageView - android:id="@+id/exposure" - android:layout_width="30dp" - android:layout_height="30dp" - android:layout_gravity="center" - android:src="@drawable/icon_exposure" /> - - <TextView - android:id="@+id/exposure_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" /> - </LinearLayout> </com.android.camera.ui.RotateLayout> <com.android.camera.ui.RotateLayout android:id="@+id/manual_rotate_layout" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"> - <LinearLayout - android:id="@+id/manual_layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + <TextView + android:id="@+id/manual_value" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:focusable="true" + android:drawableTop="@drawable/promode_manual" android:gravity="center" - android:orientation="vertical"> - - <ImageView - android:id="@+id/manual" - android:layout_width="30dp" - android:layout_height="30dp" - android:layout_gravity="center" - android:src="@drawable/icon_manual" /> + android:layout_gravity="center" + android:layout_weight="1" /> - <TextView - android:id="@+id/manual_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" /> - </LinearLayout> </com.android.camera.ui.RotateLayout> <com.android.camera.ui.RotateLayout android:id="@+id/white_balance_rotate_layout" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"> - <LinearLayout - android:id="@+id/white_balance_layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + <TextView + android:id="@+id/white_balance_value" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:focusable="true" + android:drawableTop="@drawable/promode_white_balance" android:gravity="center" - android:orientation="vertical"> + android:layout_gravity="center" + android:layout_weight="1"/> - <ImageView - android:id="@+id/white_balance" - android:layout_width="30dp" - android:layout_height="30dp" - android:layout_gravity="center" - android:src="@drawable/icon_white_balance" /> - - <TextView - android:id="@+id/white_balance_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" /> - </LinearLayout> </com.android.camera.ui.RotateLayout> <com.android.camera.ui.RotateLayout android:id="@+id/iso_rotate_layout" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"> - <LinearLayout - android:id="@+id/iso_layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + <TextView + android:id="@+id/iso_value" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:drawableTop="@drawable/promode_iso" + android:focusable="true" android:gravity="center" - android:orientation="vertical"> - - <ImageView - android:id="@+id/iso" - android:layout_width="30dp" - android:layout_height="30dp" - android:layout_gravity="center" - android:src="@drawable/icon_iso" /> + android:layout_gravity="center" + android:layout_weight="1"/> - <TextView - android:id="@+id/iso_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" /> - </LinearLayout> </com.android.camera.ui.RotateLayout> </LinearLayout> |