diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-08-04 14:54:19 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-08-07 15:21:54 +0000 |
| commit | 10ae593a59aa50963e1d3159747da2d65ca79bed (patch) | |
| tree | 7f98300ff2318f2eefb50d84ca2701a416590fb4 /assets | |
| parent | e1a73952372a7ceee493863520e5046e6d979dc0 (diff) | |
| download | android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.gz android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.bz2 android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.zip | |
This change brings Dialer oc-mr1-dev up to date with v11.1 RC06.
This is to resolve a merge conflict in:
I48296c56fb1d275a06b7c314f5380266c1195ef2
Test: make
master is already up to date and
Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9
Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png | bin | 0 -> 197 bytes | |||
| -rw-r--r-- | assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png | bin | 0 -> 150 bytes | |||
| -rw-r--r-- | assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png | bin | 0 -> 211 bytes | |||
| -rw-r--r-- | assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png | bin | 0 -> 276 bytes | |||
| -rw-r--r-- | assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png | bin | 0 -> 366 bytes | |||
| -rw-r--r-- | assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml | 2 |
6 files changed, 1 insertions, 1 deletions
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png Binary files differnew file mode 100644 index 000000000..63edb42b6 --- /dev/null +++ b/assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png Binary files differnew file mode 100644 index 000000000..88fa79443 --- /dev/null +++ b/assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png Binary files differnew file mode 100644 index 000000000..9b9d49fe6 --- /dev/null +++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png Binary files differnew file mode 100644 index 000000000..e0721e63b --- /dev/null +++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png Binary files differnew file mode 100644 index 000000000..29ac881a9 --- /dev/null +++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png diff --git a/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml index 6495ac7eb..b3493b8f5 100644 --- a/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml +++ b/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml @@ -6,5 +6,5 @@ android:tint="?attr/colorControlNormal"> <path android:fillColor="@android:color/white" - android:pathData="M14,16.5h-4L10,15L3,15v4c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-4h-7v1.5zM20,6h-3.5L16.5,4.5L15,3L9,3L7.5,4.55L7.5,6L4,6c-1.1,0 -2,0.9 -2,2v4c0,1.1 0.9,2 2,2h6v-1.5h4L14,14h6c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM15,6L9,6L9,4.5h6L15,6z"/> + android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM14,6h-4L10,4h4v2z"/> </vector> |
