Browser actions sample
Change-Id: I5ce95d2ae363581453d65a52527cfecec3ca9163
Reviewed-on: https://chromium-review.googlesource.com/1039371
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Commit-Queue: Dmitry Malykhanov <dmalykhanov@google.com>
diff --git a/demos/build.gradle b/demos/build.gradle
index 0ef6a0e..815f13f 100644
--- a/demos/build.gradle
+++ b/demos/build.gradle
@@ -23,6 +23,6 @@
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:27.0.2'
compile 'com.android.support:recyclerview-v7:27.0.2'
- compile 'com.android.support:customtabs:27.0.2'
+ compile 'com.android.support:customtabs:27.1.0'
compile project(':shared')
}
diff --git a/demos/src/main/AndroidManifest.xml b/demos/src/main/AndroidManifest.xml
index cbb6983..fd22f2c 100644
--- a/demos/src/main/AndroidManifest.xml
+++ b/demos/src/main/AndroidManifest.xml
@@ -71,6 +71,16 @@
android:name="android.support.PARENT_ACTIVITY"
android:value=".DemoListActivity" />
</activity>
+
+ <activity
+ android:name=".BrowserActionActivity"
+ android:label="@string/title_activity_browser_actions"
+ android:parentActivityName=".DemoListActivity">
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value=".DemoListActivity"/>
+ </activity>
+
<receiver android:name=".ActionBroadcastReceiver" />
</application>
diff --git a/demos/src/main/java/org/chromium/customtabsdemos/BrowserActionActivity.java b/demos/src/main/java/org/chromium/customtabsdemos/BrowserActionActivity.java
new file mode 100644
index 0000000..e9db1e9
--- /dev/null
+++ b/demos/src/main/java/org/chromium/customtabsdemos/BrowserActionActivity.java
@@ -0,0 +1,138 @@
+// Copyright 2018 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.chromium.customtabsdemos;
+
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+import android.support.customtabs.CustomTabsIntent;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+
+import java.util.ArrayList;
+
+import androidx.browser.browseractions.BrowserActionItem;
+import androidx.browser.browseractions.BrowserActionsIntent;
+
+public class BrowserActionActivity extends AppCompatActivity {
+
+ private final static String URL = "https://www.google.com/";
+ private final static String ALT_URL = "https://example.com/";
+
+ private CustomTabActivityHelper mCustomTabActivityHelper;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_browser_action);
+
+ mCustomTabActivityHelper = new CustomTabActivityHelper();
+
+ final Button openLinkButton = findViewById(R.id.open_link);
+ openLinkButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ openCustomTabsLink(Uri.parse(URL));
+ }
+ });
+ openLinkButton.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View view) {
+ openBrowserActionsLink(Uri.parse(URL), Uri.parse(ALT_URL));
+ return true;
+ }
+ });
+ openIntentLink(getIntent());
+ }
+
+ @Override
+ protected void onNewIntent(Intent intent) {
+ openIntentLink(intent);
+ super.onNewIntent(intent);
+ setIntent(intent);
+ }
+
+ private void openIntentLink(final Intent intent) {
+ if (Intent.ACTION_VIEW.equals(intent.getAction())) {
+ final Uri url = intent.getData();
+ if (url != null) {
+ openCustomTabsLink(url);
+ }
+ }
+ }
+
+ protected void openCustomTabsLink(final Uri url) {
+ final CustomTabsIntent intent =
+ new CustomTabsIntent.Builder(mCustomTabActivityHelper.getSession()).build();
+ intent.launchUrl(BrowserActionActivity.this, url);
+ }
+
+ protected void openBrowserActionsLink(final Uri url, final Uri altUrl) {
+ final Intent viewAltUrlIntent = new Intent(Intent.ACTION_VIEW, altUrl)
+ .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+ .setComponent(
+ new ComponentName(
+ this,
+ BrowserActionActivity.class));
+
+ final BrowserActionItemList actions = new BrowserActionItemList(this)
+ .add(R.string.label_open_alternate_link,
+ PendingIntent.getActivity(this,
+ 0,
+ viewAltUrlIntent,
+ 0),
+ R.drawable.ic_chrome_reader_mode_black_24dp);
+
+
+ BrowserActionsIntent.openBrowserAction(
+ BrowserActionActivity.this,
+ url,
+ BrowserActionsIntent.URL_TYPE_NONE,
+ actions.items(),
+ null);
+ }
+
+ public static class BrowserActionItemList {
+ private final ArrayList<BrowserActionItem> mItems = new ArrayList<>();
+ private final Context context;
+
+ public BrowserActionItemList(@NonNull Context context) {
+ this.context = context.getApplicationContext();
+ }
+
+ public ArrayList<BrowserActionItem> items() {
+ return mItems;
+ }
+
+ public BrowserActionItemList add(@StringRes int titleId, @NonNull PendingIntent action,
+ @DrawableRes int iconId) {
+ mItems.add(new BrowserActionItem(context.getString(titleId), action, iconId));
+ return this;
+ }
+
+ public BrowserActionItemList add(@StringRes int titleId, @NonNull PendingIntent action) {
+ mItems.add(new BrowserActionItem(context.getString(titleId), action));
+ return this;
+ }
+
+ }
+}
diff --git a/demos/src/main/java/org/chromium/customtabsdemos/DemoListActivity.java b/demos/src/main/java/org/chromium/customtabsdemos/DemoListActivity.java
index f805286..ebebf65 100644
--- a/demos/src/main/java/org/chromium/customtabsdemos/DemoListActivity.java
+++ b/demos/src/main/java/org/chromium/customtabsdemos/DemoListActivity.java
@@ -59,6 +59,11 @@
NotificationParentActivity.class);
activityDescList.add(activityDesc);
+ activityDesc = createActivityDesc(R.string.title_activity_browser_actions,
+ R.string.description_activity_browser_actions,
+ BrowserActionActivity.class);
+ activityDescList.add(activityDesc);
+
RecyclerView recyclerView = (RecyclerView) findViewById(android.R.id.list);
recyclerView.setAdapter(listAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(this));
diff --git a/demos/src/main/res/drawable-hdpi/ic_chrome_reader_mode_black_24dp.png b/demos/src/main/res/drawable-hdpi/ic_chrome_reader_mode_black_24dp.png
new file mode 100644
index 0000000..83ac7ed
--- /dev/null
+++ b/demos/src/main/res/drawable-hdpi/ic_chrome_reader_mode_black_24dp.png
Binary files differ
diff --git a/demos/src/main/res/drawable-mdpi/ic_chrome_reader_mode_black_24dp.png b/demos/src/main/res/drawable-mdpi/ic_chrome_reader_mode_black_24dp.png
new file mode 100644
index 0000000..e1d8bbc
--- /dev/null
+++ b/demos/src/main/res/drawable-mdpi/ic_chrome_reader_mode_black_24dp.png
Binary files differ
diff --git a/demos/src/main/res/drawable-xhdpi/ic_chrome_reader_mode_black_24dp.png b/demos/src/main/res/drawable-xhdpi/ic_chrome_reader_mode_black_24dp.png
new file mode 100644
index 0000000..720c280
--- /dev/null
+++ b/demos/src/main/res/drawable-xhdpi/ic_chrome_reader_mode_black_24dp.png
Binary files differ
diff --git a/demos/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode_black_24dp.png b/demos/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode_black_24dp.png
new file mode 100644
index 0000000..011b28a
--- /dev/null
+++ b/demos/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode_black_24dp.png
Binary files differ
diff --git a/demos/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode_black_24dp.png b/demos/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode_black_24dp.png
new file mode 100644
index 0000000..12bbfa8
--- /dev/null
+++ b/demos/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode_black_24dp.png
Binary files differ
diff --git a/demos/src/main/res/layout/activity_browser_action.xml b/demos/src/main/res/layout/activity_browser_action.xml
new file mode 100644
index 0000000..dc5835a
--- /dev/null
+++ b/demos/src/main/res/layout/activity_browser_action.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2018 Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context="org.chromium.customtabsdemos.BrowserActionActivity">
+
+ <Button
+ android:id="@+id/open_link"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="@string/label_open_link"
+ android:longClickable="true"/>
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="16dp"
+ android:layout_below="@+id/open_link"
+ android:text="@string/browser_actions_desc"/>
+
+</RelativeLayout>
diff --git a/demos/src/main/res/values/strings.xml b/demos/src/main/res/values/strings.xml
index 8215d99..098adee 100644
--- a/demos/src/main/res/values/strings.xml
+++ b/demos/src/main/res/values/strings.xml
@@ -39,6 +39,7 @@
<string name="title_activity_simple_chrome_tab">Simple Chrome Custom Tab</string>
<string name="title_activity_customized_chrome_tab">Customized UI Chrome Custom Tab</string>
<string name="title_activity_service_connection">Service Connection Activity</string>
+ <string name="title_activity_browser_actions">Browser Actions Demo</string>
<!-- Demo Activities Descriptions -->
<string name="description_activity_simple_chrome_tab">
@@ -60,14 +61,24 @@
Creates a Notification that opens a Chrome Custom Tab when clicked, and returns to the host
app when the user hits Back or Up
</string>
+
+ <string name="description_activity_browser_actions">
+ Demonstrates the usage of Browser Actions with a Custom Tab. A simple click on a button
+ opens a link in the custom tab. A long-click will trigger browser actions and give the
+ user further options on how to open the tab.
+ </string>
+
<string name="label_custom_back_button">Custom back button</string>
<string name="label_show_title">Show title</string>
<string name="label_auto_hide_appbar">Auto-hide AppBar</string>
<string name="label_add_default_share">Add default share</string>
<string name="label_toobar_secondary_color">Secondary Toolbar Color</string>
<string name="label_add_toolbar_item">Add toolbar item</string>
+ <string name="label_open_link">Open Link</string>
+ <string name="label_open_alternate_link">Open Alternate Link</string>
<string name="action_button_toast_text">Action Button Clicked with URL: %s</string>
<string name="menu_item_toast_text">Menu Item Clicked with URL: %s</string>
<string name="toolbar_toast_text">Toolbar Clicked with URL: %s</string>
<string name="unknown_toast_text">Unknown Action Clicked with URL: %s</string>
+ <string name="browser_actions_desc">Tap the button to open custom tab. Long press the button to see the actions menu.</string>
</resources>
