Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ed7c697 authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce

parents 37177f96 52a069f0

AndroidManifest.xml

+0 −13
Original line number Diff line number Diff line
@@ -284,19 +284,6 @@ 
                android:configChanges="keyboardHidden|orientation|screenSize"

                android:theme="@style/Theme.Gallery.Dialog"/>



        <activity android:name="com.android.camera.NewCameraActivity"

                android:taskAffinity="com.android.camera.NewCameraActivity"

                android:theme="@style/Theme.Camera"

                android:label="@string/camera_label"

                android:configChanges="orientation|screenSize|keyboardHidden"

                android:clearTaskOnLaunch="true"

                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>



        <activity android:name="com.android.camera.CameraActivity"

                android:taskAffinity="com.android.camera.CameraActivity"

                android:label="@string/camera_label"

res/layout/camera.xml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent" >

    <!-- NewCameraRootView needs to be in a FrameLayout to set margins

         in the layout parameters. -->

    <com.android.camera.ui.NewCameraRootView

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/camera_app_root"

        android:layout_width="match_parent"

        android:layout_height="match_parent" >

    </com.android.camera.ui.NewCameraRootView>

</FrameLayout>

res/layout/camera_filmstrip.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.camera.ui.FilmStripView

xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/filmstrip_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />

res/layout/new_photo_module.xml

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- This layout is shared by phone and tablet in both landscape and portrait

 orientation. The purpose of having this layout is to eventually not manually

 recreate views when the orientation changes, by migrating the views that do not

 need to be recreated in onConfigurationChanged from old photo_module to this

 layout. -->



<merge xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center">

    <TextureView

        android:id="@+id/preview_content"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

    <ViewStub android:id="@+id/face_view_stub"

        android:inflatedId="@+id/face_view"

        android:layout="@layout/face_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone"/>

    <com.android.camera.ui.RenderOverlay

        android:id="@+id/render_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

    <include layout="@layout/camera_controls"

        android:layout_gravity="center"

        style="@style/CameraControls"/>

</merge>
 
 No newline at end of file

res/layout/new_video_module.xml

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- This layout is shared by phone and tablet in landscape orientation. -->

<merge xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_height="match_parent"

    android:layout_width="match_parent">

    <TextureView

        android:id="@+id/preview_content"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

    <FrameLayout android:id="@+id/preview_border"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="gone"

            android:background="@drawable/ic_snapshot_border" />

    <com.android.camera.ui.RenderOverlay

        android:id="@+id/render_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

    <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect"

            style="@style/ViewfinderLabelLayout">

        <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels" />

    </com.android.camera.ui.RotateLayout>

    <ImageView android:id="@+id/review_image"

            android:layout_height="match_parent"

            android:layout_width="match_parent"

            android:visibility="gone"

            android:background="@android:color/black"/>

    <ImageView

            android:id="@+id/btn_play"

            style="@style/ReviewControlIcon"

            android:layout_centerInParent="true"

            android:src="@drawable/ic_gallery_play_big"

            android:visibility="gone"

            android:onClick="onReviewPlayClicked"/>



    <include layout="@layout/camera_controls"

        android:layout_gravity="center"

        style="@style/CameraControls"/>

</merge>