| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- | 2 <!-- |
| 3 Copyright 2015 Google Inc. All Rights Reserved. | 3 Copyright 2015 Google Inc. All Rights Reserved. |
| 4 | 4 |
| 5 Licensed under the Apache License, Version 2.0 (the "License"); | 5 Licensed under the Apache License, Version 2.0 (the "License"); |
| 6 you may not use this file except in compliance with the License. | 6 you may not use this file except in compliance with the License. |
| 7 You may obtain a copy of the License at | 7 You may obtain a copy of the License at |
| 8 | 8 |
| 9 http://www.apache.org/licenses/LICENSE-2.0 | 9 http://www.apache.org/licenses/LICENSE-2.0 |
| 10 | 10 |
| 11 Unless required by applicable law or agreed to in writing, software | 11 Unless required by applicable law or agreed to in writing, software |
| 12 distributed under the License is distributed on an "AS IS" BASIS, | 12 distributed under the License is distributed on an "AS IS" BASIS, |
| 13 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 13 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 14 See the License for the specific language governing permissions and | 14 See the License for the specific language governing permissions and |
| 15 limitations under the License. | 15 limitations under the License. |
| 16 --> | 16 --> |
| 17 <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 17 <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 18 package="org.chromium.customtabsdemos" > | 18 package="org.chromium.customtabsdemos" > |
| 19 <uses-permission android:name="android.permission.INTERNET" /> | 19 <uses-permission android:name="android.permission.INTERNET" /> |
| 20 <uses-permission android:name="android.permission.CAMERA" /> |
| 21 <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" /> |
| 22 |
| 20 <application | 23 <application |
| 21 android:allowBackup="true" | 24 android:allowBackup="true" |
| 22 android:icon="@mipmap/ic_launcher" | 25 android:icon="@mipmap/ic_launcher" |
| 23 android:label="@string/app_name" | 26 android:label="@string/app_name" |
| 24 android:theme="@style/AppTheme" > | 27 android:theme="@style/AppTheme" > |
| 25 <activity | 28 <activity |
| 26 android:name=".DemoListActivity" | 29 android:name=".DemoListActivity" |
| 27 android:label="@string/app_name" > | 30 android:label="@string/app_name" > |
| 28 <intent-filter> | 31 <intent-filter> |
| 29 <action android:name="android.intent.action.MAIN" /> | 32 <action android:name="android.intent.action.MAIN" /> |
| (...skipping 21 matching lines...) Expand all Loading... |
| 51 android:name=".SimpleCustomTabActivity" | 54 android:name=".SimpleCustomTabActivity" |
| 52 android:label="@string/title_activity_simple_chrome_tab" | 55 android:label="@string/title_activity_simple_chrome_tab" |
| 53 android:parentActivityName=".DemoListActivity" > | 56 android:parentActivityName=".DemoListActivity" > |
| 54 <meta-data | 57 <meta-data |
| 55 android:name="android.support.PARENT_ACTIVITY" | 58 android:name="android.support.PARENT_ACTIVITY" |
| 56 android:value=".DemoListActivity" /> | 59 android:value=".DemoListActivity" /> |
| 57 </activity> | 60 </activity> |
| 58 <activity | 61 <activity |
| 59 android:name=".CustomUIActivity" | 62 android:name=".CustomUIActivity" |
| 60 android:label="@string/title_activity_customized_chrome_tab" | 63 android:label="@string/title_activity_customized_chrome_tab" |
| 61 android:parentActivityName=".DemoListActivity" > | 64 android:parentActivityName=".DemoListActivity"> |
| 62 <meta-data | 65 <meta-data |
| 63 android:name="android.support.PARENT_ACTIVITY" | 66 android:name="android.support.PARENT_ACTIVITY" |
| 64 android:value=".DemoListActivity" /> | 67 android:value=".DemoListActivity" /> |
| 65 </activity> | 68 </activity> |
| 66 <activity | 69 <activity |
| 70 android:name=".AdvancedUISettingActivity" |
| 71 android:label="Advanced UI Setting" |
| 72 android:parentActivityName=".CustomUIActivity"> |
| 73 <meta-data |
| 74 android:name="android.support.PARENT_ACTIVITY" |
| 75 android:value=".CustomUIActivity" /> |
| 76 </activity> |
| 77 <activity |
| 67 android:name=".ServiceConnectionActivity" | 78 android:name=".ServiceConnectionActivity" |
| 68 android:label="@string/title_activity_service_connection" | 79 android:label="@string/title_activity_service_connection" |
| 69 android:parentActivityName=".DemoListActivity" > | 80 android:parentActivityName=".DemoListActivity" > |
| 70 <meta-data | 81 <meta-data |
| 71 android:name="android.support.PARENT_ACTIVITY" | 82 android:name="android.support.PARENT_ACTIVITY" |
| 72 android:value=".DemoListActivity" /> | 83 android:value=".DemoListActivity" /> |
| 73 </activity> | 84 </activity> |
| 85 <activity |
| 86 android:name=".Camera" |
| 87 android:label="Camera"> |
| 88 <meta-data |
| 89 android:name="android.support.PARENT_ACTIVITY" |
| 90 android:value=".DemoListActivity" /> |
| 91 </activity> |
| 74 <receiver android:name=".ShareBroadcastReceiver" /> | 92 <receiver android:name=".ShareBroadcastReceiver" /> |
| 75 </application> | 93 </application> |
| 76 | 94 |
| 77 </manifest> | 95 </manifest> |
| OLD | NEW |