diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-05 16:20:32 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-05 16:20:32 +0000 |
commit | 6b01cc165aeefd0fea2e61397f0d89362a34baf8 (patch) | |
tree | aaef4f7e93d1f907734999bc8e7521a317211348 | |
parent | 607e39755796afa9b7e75876f8952b9943f87170 (diff) | |
parent | b0f4e65aadf459f3bbfae93aa257619ee87b09ba (diff) | |
download | tests-6b01cc165aeefd0fea2e61397f0d89362a34baf8.tar.gz |
Snap for 6562623 from b0f4e65aadf459f3bbfae93aa257619ee87b09ba to mainline-release
Change-Id: I559bd36b0171c81180cc68794c3a4cedd51b8e0f
6 files changed, 179 insertions, 2 deletions
diff --git a/RotaryPlayground/res/layout/rotary_menu.xml b/RotaryPlayground/res/layout/rotary_menu.xml index 176d58c..659f119 100644 --- a/RotaryPlayground/res/layout/rotary_menu.xml +++ b/RotaryPlayground/res/layout/rotary_menu.xml @@ -39,11 +39,11 @@ android:layout_weight="1" android:text="Grid" /> <Button - android:id="@+id/menu_item_4" + android:id="@+id/notification" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:text="Menu Item 4" /> + android:text="Notification" /> <Button android:id="@+id/scroll" android:layout_width="match_parent" diff --git a/RotaryPlayground/res/layout/rotary_notification.xml b/RotaryPlayground/res/layout/rotary_notification.xml new file mode 100644 index 0000000..998febe --- /dev/null +++ b/RotaryPlayground/res/layout/rotary_notification.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2020 The Android Open Source Project + ~ + ~ 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" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.android.car.ui.FocusArea + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true"> + <TextView + android:layout_width="0dp" + android:layout_height="@dimen/button_height" + android:layout_weight="1" + android:gravity="center" + android:text="Under HUN"/> + <Button + android:id="@+id/add_notification_button1" + android:layout_width="0dp" + android:layout_height="@dimen/button_height" + android:layout_weight="1" + android:layout_margin="5dp" + android:background="@color/button_background_color" + android:text="Add Notification"/> + <Button + android:id="@+id/clear_notification_button1" + android:layout_width="0dp" + android:layout_height="@dimen/button_height" + android:layout_weight="1" + android:layout_margin="5dp" + android:background="@color/button_background_color" + android:text="Clear Notification"/> + </com.android.car.ui.FocusArea> + + <com.android.car.ui.FocusArea + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true"> + <TextView + android:layout_width="0dp" + android:layout_height="@dimen/button_height" + android:layout_weight="1" + android:gravity="center" + android:text="Not Under HUN"/> + <Button + android:id="@+id/add_notification_button2" + android:layout_width="0dp" + android:layout_height="@dimen/button_height" + android:layout_weight="1" + android:layout_margin="5dp" + android:background="@color/button_background_color" + android:text="Add Notification"/> + <Button + android:id="@+id/clear_notification_button2" + android:layout_width="0dp" + android:layout_height="@dimen/button_height" + android:layout_weight="1" + android:layout_margin="5dp" + android:background="@color/button_background_color" + android:text="Clear Notification"/> + </com.android.car.ui.FocusArea> + +</RelativeLayout> diff --git a/RotaryPlayground/res/values/colors.xml b/RotaryPlayground/res/values/colors.xml index b49ea51..87480a0 100644 --- a/RotaryPlayground/res/values/colors.xml +++ b/RotaryPlayground/res/values/colors.xml @@ -18,6 +18,7 @@ <color name="card_background_color">#37393d</color> <color name="card_disabled_background_color">#61646b</color> <color name="grid_item_background_color">#006666</color> + <color name="button_background_color">#660000</color> <color name="button_disabled_background_color">#61646b</color> <color name="scroll_text_background_color">#61646b</color> </resources>
\ No newline at end of file diff --git a/RotaryPlayground/res/values/dimens.xml b/RotaryPlayground/res/values/dimens.xml index 77e907f..02a5406 100644 --- a/RotaryPlayground/res/values/dimens.xml +++ b/RotaryPlayground/res/values/dimens.xml @@ -24,4 +24,6 @@ <dimen name="card_width">400dp</dimen> <dimen name="card_padding">20dp</dimen> <dimen name="description_height">200dp</dimen> + <!-- Notification values --> + <dimen name="button_height">70dp</dimen> </resources>
\ No newline at end of file diff --git a/RotaryPlayground/src/com/android/car/rotaryplayground/HeadsUpNotificationFragment.java b/RotaryPlayground/src/com/android/car/rotaryplayground/HeadsUpNotificationFragment.java new file mode 100644 index 0000000..0744ac0 --- /dev/null +++ b/RotaryPlayground/src/com/android/car/rotaryplayground/HeadsUpNotificationFragment.java @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * 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 com.android.car.rotaryplayground; + +import android.app.Notification; +import android.app.NotificationChannel; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.content.Intent; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +public class HeadsUpNotificationFragment extends Fragment { + private static final String NOTIFICATION_CHANNEL_ID = "rotary_notification"; + private static final int NOTIFICATION_ID = 1; + + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.rotary_notification, container, false); + NotificationManager notificationManager = + getContext().getSystemService(NotificationManager.class); + notificationManager.createNotificationChannel( + new NotificationChannel(NOTIFICATION_CHANNEL_ID, "Rotary Playground", + NotificationManager.IMPORTANCE_HIGH)); + view.findViewById(R.id.add_notification_button1).setOnClickListener( + v -> notificationManager.notify(NOTIFICATION_ID, createNotification())); + view.findViewById(R.id.clear_notification_button1).setOnClickListener( + v -> notificationManager.cancel(NOTIFICATION_ID)); + view.findViewById(R.id.add_notification_button2).setOnClickListener( + v -> notificationManager.notify(NOTIFICATION_ID, createNotification())); + view.findViewById(R.id.clear_notification_button2).setOnClickListener( + v -> notificationManager.cancel(NOTIFICATION_ID)); + + return view; + } + + /** + * Creates a notification with CATEGORY_CALL in a channel with IMPORTANCE_HIGH. This will + * produce a heads-up notification even for non-system apps that aren't privileged and aren't + * signed with the platform key. The notification includes three actions which appear as buttons + * in the HUN. + */ + private Notification createNotification() { + Intent intent = new Intent(getContext(), RotaryActivity.class); + PendingIntent pendingIntent = PendingIntent.getActivity(getContext(), 0, intent, 0); + return new Notification.Builder(getContext(), NOTIFICATION_CHANNEL_ID) + .setContentTitle("Example heads-up notification") + .setContentText("Try nudging up to HUN") + .setSmallIcon(R.drawable.ic_launcher) + .addAction(new Notification.Action.Builder(null, "Action1", pendingIntent).build()) + .addAction(new Notification.Action.Builder(null, "Action2", pendingIntent).build()) + .addAction(new Notification.Action.Builder(null, "Action3", pendingIntent).build()) + .setColor(getContext().getColor(android.R.color.holo_red_light)) + .setCategory(Notification.CATEGORY_CALL) + .build(); + } +} diff --git a/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryMenu.java b/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryMenu.java index d28d007..a1ede40 100644 --- a/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryMenu.java +++ b/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryMenu.java @@ -20,6 +20,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; + import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; @@ -33,11 +34,13 @@ public class RotaryMenu extends Fragment { private Fragment mRotaryCards = null; private Fragment mRotaryGrid = null; private Fragment mDirectManipulation = null; + private Fragment mNotificationFragment = null; private Fragment mScrollFragment = null; private Button mCardButton; private Button mGridButton; private Button mDirectManipulationButton; + private Button mNotificationButton; private Button mScrollButton; @Override @@ -59,6 +62,11 @@ public class RotaryMenu extends Fragment { mDirectManipulationButton.setOnClickListener( (v -> showDirectManipulationExamples(/* hasFocus= */ true))); + mNotificationButton = view.findViewById(R.id.notification); + mNotificationButton.setOnFocusChangeListener( + (v, hasFocus) -> showNotificationExample(hasFocus)); + mNotificationButton.setOnClickListener(v -> showNotificationExample(/* hasFocus= */ true)); + mScrollButton = view.findViewById(R.id.scroll); mScrollButton.setOnFocusChangeListener((v, hasFocus) -> showScrollFragment(hasFocus)); mScrollButton.setOnClickListener(v -> showScrollFragment(/* hasFocus= */ true)); @@ -98,6 +106,16 @@ public class RotaryMenu extends Fragment { showFragment(mDirectManipulation); } + private void showNotificationExample(boolean hasFocus) { + if (!hasFocus) { + return; // do nothing if no focus. + } + if (mNotificationFragment == null) { + mNotificationFragment = new HeadsUpNotificationFragment(); + } + showFragment(mNotificationFragment); + } + private void showScrollFragment(boolean hasFocus) { if (!hasFocus) { return; // Do nothing if no focus. |