Merge pull request #2 from muhammadaksar/camera_latest_Nov25

Add advance features in MultiCamera app
projectceladon · Nov 27, 2019 · a5fc3eb · a5fc3eb
2 parents e4cf786 + c1997be
commit a5fc3eb
Show file tree

Hide file tree

Showing 82 changed files with 4,687 additions and 2,693 deletions.
diff --git a/camera/MultiCameraApplication/AndroidManifest.xml b/camera/MultiCameraApplication/AndroidManifest.xml
@@ -9,53 +9,50 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <uses-feature android:name="android.hardware.camera2.full"/>
-
+    <uses-feature android:name="android.hardware.usb.host" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        android:requestLegacyExternalStorage="true">
+	android:theme="@style/AppTheme"
+	android:requestLegacyExternalStorage="true">
 
-        <activity
-                android:name=".PermissionsActivity"
-                android:label="@string/app_name"
-                android:excludeFromRecents="true"
-                android:parentActivityName=".MainActivity">
-            <meta-data android:name="android.support.PARENT_ACTIVITY"
-                       android:value="com.intel.multicamera.MainActivity"/>
+        <activity android:name=".CtsCameraIntentsActivity"
+                  android:excludeFromRecents="true"
+                  android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.media.action.IMAGE_CAPTURE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.media.action.VIDEO_CAPTURE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <activity
-            android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings"
-            android:theme="@style/AppTheme"
-            android:parentActivityName=".MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.intel.multicamera.MainActivity" />
-        </activity>
-        <activity
-            android:name=".MainActivity"
+            android:name=".MultiViewActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar">">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.media.action.IMAGE_CAPTURE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.media.action.VIDEO_CAPTURE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+
         </activity>
+
+        <activity
+                android:name=".PermissionsActivity"
+                android:label="@string/app_name"
+               >
+
+        </activity>
+
+
     </application>
 
 </manifest>
diff --git a/camera/MultiCameraApplication/ic_launcher-web.png b/camera/MultiCameraApplication/ic_launcher-web.png
diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/AutoFitTextureView.java b/camera/MultiCameraApplication/java/com/intel/multicamera/AutoFitTextureView.java
@@ -26,12 +26,15 @@
 public class AutoFitTextureView extends TextureView {
     private int mRatioWidth = 0;
     private int mRatioHeight = 0;
+
     public AutoFitTextureView(Context context) {
         this(context, null);
     }
+
     public AutoFitTextureView(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
+
     public AutoFitTextureView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
@@ -41,6 +44,7 @@ public AutoFitTextureView(Context context, AttributeSet attrs, int defStyle) {
      * on the ratio calculated from the parameters. Note that the actual sizes of parameters
      * don't matter, that is, calling setAspectRatio(2, 3) and setAspectRatio(4, 6) make the
      * same result.
+     *
      * @param width  Relative horizontal size
      * @param height Relative vertical size
      */