demos/src/main/AndroidManifest.xml - Issue 1603383003: color, package and action bar configuration.

Unified Diff: demos/src/main/AndroidManifest.xml

Issue 1603383003: color, package and action bar configuration. (Closed) Base URL: https://github.com/GoogleChrome/custom-tabs-client.git@master

Patch Set: fixes Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « demos/build.gradle ('k') | demos/src/main/java/org/chromium/customtabsdemos/AdvancedUISettingActivity.java » ('j') | demos/src/main/java/org/chromium/customtabsdemos/AdvancedUISettingActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: demos/src/main/AndroidManifest.xml

diff --git a/demos/src/main/AndroidManifest.xml b/demos/src/main/AndroidManifest.xml

index ff8829bbd2c98192e087643e5a3648a48b54781a..096a02cb415b25d35d014a2b28d6c230ad4a815f 100644

--- a/demos/src/main/AndroidManifest.xml

+++ b/demos/src/main/AndroidManifest.xml

@@ -17,6 +17,9 @@

<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" />

<application

android:allowBackup="true"

android:icon="@mipmap/ic_launcher"

@@ -58,12 +61,21 @@

<activity

android:name=".CustomUIActivity"

android:label="@string/title_activity_customized_chrome_tab"

- android:parentActivityName=".DemoListActivity" >

+ android:parentActivityName=".DemoListActivity"

+ android:launchMode="singleTop">

<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 +83,13 @@

android:name="android.support.PARENT_ACTIVITY"

android:value=".DemoListActivity" />

</activity>

+ <activity

+ android:name=".Camera"

Ian Wen 2016/02/10 02:36:06 s/Camera/CameraActivity. Always name objects accor

BigBossZhiling 2016/02/17 05:18:09 I noticed that the previous activity, for example

Ian Wen 2016/03/16 01:35:30 Yes. In code review, s/A/B means replace A with B

+ android:label="Camera">

+ <meta-data

+ android:name="android.support.PARENT_ACTIVITY"

+ android:value=".DemoListActivity" />

+ </activity>

</application>