Chromium Code Reviews| Index: demos/src/main/AndroidManifest.xml |
| diff --git a/demos/src/main/AndroidManifest.xml b/demos/src/main/AndroidManifest.xml |
| index ff8829bbd2c98192e087643e5a3648a48b54781a..c9efc0f3e577edda8a02619a0f4d6a00111e7f81 100644 |
| --- a/demos/src/main/AndroidManifest.xml |
| +++ b/demos/src/main/AndroidManifest.xml |
| @@ -17,6 +17,10 @@ |
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| package="org.chromium.customtabsdemos" > |
| <uses-permission android:name="android.permission.INTERNET" /> |
| + <uses-permission android:name="android.permission.CAMERA" /> |
| + <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" /> |
| + /> |
|
Ian Wen
2016/02/09 00:14:15
Is this correctly formatted?
BigBossZhiling
2016/02/09 01:03:11
Done.
|
| + |
| <application |
| android:allowBackup="true" |
| android:icon="@mipmap/ic_launcher" |
| @@ -58,12 +62,21 @@ |
| <activity |
| android:name=".CustomUIActivity" |
| android:label="@string/title_activity_customized_chrome_tab" |
| - android:parentActivityName=".DemoListActivity" > |
| + android:parentActivityName=".DemoListActivity" |
| + android:launchMode="singleTop"> |
|
Ian Wen
2016/02/09 00:14:15
Why making it singletop?
BigBossZhiling
2016/02/09 01:03:11
After coming back from advanced ui setting, I want
Ian Wen
2016/02/10 02:36:06
If you use startActivityForResult() in CustomUIAct
|
| <meta-data |
| android:name="android.support.PARENT_ACTIVITY" |
| android:value=".DemoListActivity" /> |
| </activity> |
| <activity |
| + android:name=".AdvancedUISettingActivity" |
| + android:label="Advanced UI Setting" |
| + android:parentActivityName=".CustomUIActivity" > |
| + <meta-data |
| + android:name="android.support.PARENT_ACTIVITY" |
| + android:value=".CustomUIActivity" /> |
| + </activity> |
| + <activity |
| android:name=".ServiceConnectionActivity" |
| android:label="@string/title_activity_service_connection" |
| android:parentActivityName=".DemoListActivity" > |
| @@ -71,6 +84,13 @@ |
| android:name="android.support.PARENT_ACTIVITY" |
| android:value=".DemoListActivity" /> |
| </activity> |
| + <activity |
| + android:name=".Camera" |
| + android:label="Camera"> |
| + <meta-data |
| + android:name="android.support.PARENT_ACTIVITY" |
| + android:value=".DemoListActivity" /> |
| + </activity> |
| <receiver android:name=".ShareBroadcastReceiver" /> |
| </application> |