diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/filter_mode_view.xml | 56 | ||||
-rw-r--r-- | res/layout/pano_module_capture.xml | 1 | ||||
-rw-r--r-- | res/layout/pano_module_review.xml | 1 | ||||
-rw-r--r-- | res/layout/scene_mode_view.xml | 4 |
4 files changed, 34 insertions, 28 deletions
diff --git a/res/layout/filter_mode_view.xml b/res/layout/filter_mode_view.xml index dfa036c1f..558d7ce77 100644 --- a/res/layout/filter_mode_view.xml +++ b/res/layout/filter_mode_view.xml @@ -26,32 +26,36 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="@dimen/filter_mode_width" - android:layout_height="@dimen/filter_mode_height" - android:layout_gravity="center" - android:orientation="vertical" - android:padding="@dimen/filter_mode_padding" > +<com.android.camera.ui.RotateLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="@dimen/filter_mode_padding"> - <ImageView - android:id="@+id/image" - android:layout_width="80dp" - android:layout_height="80dp" - android:layout_gravity="center" - android:padding="2dp" /> + <LinearLayout + android:layout_width="@dimen/filter_mode_width" + android:layout_height="@dimen/filter_mode_height" + android:orientation="vertical"> - <TextView - android:id="@+id/label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:shadowColor="@android:color/black" - android:shadowDx="1" - android:shadowDy="1" - android:shadowRadius="2" - android:singleLine="true" - android:textColor="@android:color/white" - android:textSize="13sp" - android:textStyle="bold" /> + <ImageView + android:id="@+id/image" + android:layout_width="80dp" + android:layout_height="80dp" + android:layout_gravity="center" + android:padding="2dp" /> -</LinearLayout> + <TextView + android:id="@+id/label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:shadowColor="@android:color/black" + android:shadowDx="1" + android:shadowDy="1" + android:shadowRadius="2" + android:singleLine="true" + android:textColor="@android:color/white" + android:textSize="13sp" + android:textStyle="bold" /> + </LinearLayout> +</com.android.camera.ui.RotateLayout> diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml index c6c131741..6ab8c9e4b 100644 --- a/res/layout/pano_module_capture.xml +++ b/res/layout/pano_module_capture.xml @@ -63,6 +63,7 @@ <!-- The bottom bar with progress bar and direction indicators --> <FrameLayout + android:id="@+id/pano_progress_layout" style="@style/PanoViewHorizontalBar" android:paddingTop="20dp" android:gravity="top" diff --git a/res/layout/pano_module_review.xml b/res/layout/pano_module_review.xml index 3f80e8af0..6aeaa753c 100644 --- a/res/layout/pano_module_review.xml +++ b/res/layout/pano_module_review.xml @@ -22,6 +22,7 @@ android:layout_width="match_parent"> <TextView + android:id="@+id/pano_review_indicator" style="@style/PanoViewHorizontalBar" android:layout_width="match_parent" android:layout_height="0dp" diff --git a/res/layout/scene_mode_view.xml b/res/layout/scene_mode_view.xml index e8a9499d6..d4c2a259c 100644 --- a/res/layout/scene_mode_view.xml +++ b/res/layout/scene_mode_view.xml @@ -26,7 +26,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center" @@ -64,4 +64,4 @@ android:textStyle="bold" /> </LinearLayout> -</LinearLayout> +</com.android.camera.ui.RotateLayout> |