Chromium Code Reviews| 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 /> | |
|
Ian Wen
2016/02/09 00:14:15
Is this correctly formatted?
BigBossZhiling
2016/02/09 01:03:11
Done.
| |
| 23 | |
| 20 <application | 24 <application |
| 21 android:allowBackup="true" | 25 android:allowBackup="true" |
| 22 android:icon="@mipmap/ic_launcher" | 26 android:icon="@mipmap/ic_launcher" |
| 23 android:label="@string/app_name" | 27 android:label="@string/app_name" |
| 24 android:theme="@style/AppTheme" > | 28 android:theme="@style/AppTheme" > |
| 25 <activity | 29 <activity |
| 26 android:name=".DemoListActivity" | 30 android:name=".DemoListActivity" |
| 27 android:label="@string/app_name" > | 31 android:label="@string/app_name" > |
| 28 <intent-filter> | 32 <intent-filter> |
| 29 <action android:name="android.intent.action.MAIN" /> | 33 <action android:name="android.intent.action.MAIN" /> |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 51 android:name=".SimpleCustomTabActivity" | 55 android:name=".SimpleCustomTabActivity" |
| 52 android:label="@string/title_activity_simple_chrome_tab" | 56 android:label="@string/title_activity_simple_chrome_tab" |
| 53 android:parentActivityName=".DemoListActivity" > | 57 android:parentActivityName=".DemoListActivity" > |
| 54 <meta-data | 58 <meta-data |
| 55 android:name="android.support.PARENT_ACTIVITY" | 59 android:name="android.support.PARENT_ACTIVITY" |
| 56 android:value=".DemoListActivity" /> | 60 android:value=".DemoListActivity" /> |
| 57 </activity> | 61 </activity> |
| 58 <activity | 62 <activity |
| 59 android:name=".CustomUIActivity" | 63 android:name=".CustomUIActivity" |
| 60 android:label="@string/title_activity_customized_chrome_tab" | 64 android:label="@string/title_activity_customized_chrome_tab" |
| 61 android:parentActivityName=".DemoListActivity" > | 65 android:parentActivityName=".DemoListActivity" |
| 66 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
| |
| 62 <meta-data | 67 <meta-data |
| 63 android:name="android.support.PARENT_ACTIVITY" | 68 android:name="android.support.PARENT_ACTIVITY" |
| 64 android:value=".DemoListActivity" /> | 69 android:value=".DemoListActivity" /> |
| 65 </activity> | 70 </activity> |
| 66 <activity | 71 <activity |
| 72 android:name=".AdvancedUISettingActivity" | |
| 73 android:label="Advanced UI Setting" | |
| 74 android:parentActivityName=".CustomUIActivity" > | |
| 75 <meta-data | |
| 76 android:name="android.support.PARENT_ACTIVITY" | |
| 77 android:value=".CustomUIActivity" /> | |
| 78 </activity> | |
| 79 <activity | |
| 67 android:name=".ServiceConnectionActivity" | 80 android:name=".ServiceConnectionActivity" |
| 68 android:label="@string/title_activity_service_connection" | 81 android:label="@string/title_activity_service_connection" |
| 69 android:parentActivityName=".DemoListActivity" > | 82 android:parentActivityName=".DemoListActivity" > |
| 70 <meta-data | 83 <meta-data |
| 71 android:name="android.support.PARENT_ACTIVITY" | 84 android:name="android.support.PARENT_ACTIVITY" |
| 72 android:value=".DemoListActivity" /> | 85 android:value=".DemoListActivity" /> |
| 73 </activity> | 86 </activity> |
| 87 <activity | |
| 88 android:name=".Camera" | |
| 89 android:label="Camera"> | |
| 90 <meta-data | |
| 91 android:name="android.support.PARENT_ACTIVITY" | |
| 92 android:value=".DemoListActivity" /> | |
| 93 </activity> | |
| 74 <receiver android:name=".ShareBroadcastReceiver" /> | 94 <receiver android:name=".ShareBroadcastReceiver" /> |
| 75 </application> | 95 </application> |
| 76 | 96 |
| 77 </manifest> | 97 </manifest> |
| OLD | NEW |