diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-22 21:31:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-22 21:32:03 +0000 |
| commit | 9f3967fee124ba932ea6ad865d1c31c30ca58672 (patch) | |
| tree | b2d182371dd9e713af78f3a0a0d6306014a51050 | |
| parent | 182d5ec2d2e141a17eec6d74a68677cfcd19e401 (diff) | |
| parent | 856493b98acaea13206f40e70c05c60a09b5cae0 (diff) | |
| download | base-9f3967fee124ba932ea6ad865d1c31c30ca58672.tar.gz | |
Merge "Change PIP notification icon" into oc-dev
| -rw-r--r-- | packages/SystemUI/res/drawable/pip_icon.xml | 25 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/packages/SystemUI/res/drawable/pip_icon.xml b/packages/SystemUI/res/drawable/pip_icon.xml new file mode 100644 index 000000000000..bd92ccd2e6e3 --- /dev/null +++ b/packages/SystemUI/res/drawable/pip_icon.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (C) 2017 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="36dp" + android:height="36dp" + android:viewportWidth="25" + android:viewportHeight="25"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M19,7h-8v6h8L19,7zM21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,1.98 2,1.98h18c1.1,0 2,-0.88 2,-1.98L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19.01L3,19.01L3,4.98h18v14.03z"/> +</vector>
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java index f0745a0791ef..ac41b752020b 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java @@ -174,7 +174,7 @@ public class PipNotification { void onConfigurationChanged(Context context) { Resources res = context.getResources(); mDefaultTitle = res.getString(R.string.pip_notification_unknown_title); - mDefaultIconResId = R.drawable.pip_expand; + mDefaultIconResId = R.drawable.pip_icon; if (mNotified) { // update notification notifyPipNotification(); |