diff options
| author | 2019-04-01 16:26:22 +0000 | |
|---|---|---|
| committer | 2019-04-01 16:26:22 +0000 | |
| commit | 0cf63c31d4d31b660b7671280c31fbfb943da73e (patch) | |
| tree | fefcae3c6179a892c155afea50a61490e8710ca8 | |
| parent | 2a80a980e9f8a824470123d9e46203cc195a5a50 (diff) | |
| parent | fa50f3f25aab64f4d4f264d363aac1d22924c02a (diff) | |
Merge "Separate insets from drawable for camera icon."
| -rw-r--r-- | packages/SystemUI/res/drawable/ic_camera.xml | 25 | ||||
| -rw-r--r-- | packages/SystemUI/res/drawable/stat_sys_camera.xml | 13 |
2 files changed, 27 insertions, 11 deletions
diff --git a/packages/SystemUI/res/drawable/ic_camera.xml b/packages/SystemUI/res/drawable/ic_camera.xml new file mode 100644 index 000000000000..b330875864d3 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_camera.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2019 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="17dp" + android:height="17dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFF" + android:pathData="M20,5h-3.17L15,3H9L7.17,5H4C2.9,5 2,5.9 2,7v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V7C22,5.9 21.1,5 20,5zM20,19H4V7h16V19zM12,9c-2.21,0 -4,1.79 -4,4c0,2.21 1.79,4 4,4s4,-1.79 4,-4C16,10.79 14.21,9 12,9z"/> +</vector> diff --git a/packages/SystemUI/res/drawable/stat_sys_camera.xml b/packages/SystemUI/res/drawable/stat_sys_camera.xml index eb3e9632dd35..c914262571ea 100644 --- a/packages/SystemUI/res/drawable/stat_sys_camera.xml +++ b/packages/SystemUI/res/drawable/stat_sys_camera.xml @@ -18,14 +18,5 @@ --> <inset xmlns:android="http://schemas.android.com/apk/res/android" android:insetLeft="3dp" - android:insetRight="3dp"> - <vector - android:width="17dp" - android:height="17dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FFF" - android:pathData="M20,5h-3.17L15,3H9L7.17,5H4C2.9,5 2,5.9 2,7v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V7C22,5.9 21.1,5 20,5zM20,19H4V7h16V19zM12,9c-2.21,0 -4,1.79 -4,4c0,2.21 1.79,4 4,4s4,-1.79 4,-4C16,10.79 14.21,9 12,9z"/> - </vector> -</inset> + android:insetRight="3dp" + android:drawable="@drawable/ic_camera" />
\ No newline at end of file |