From cdd5e067f25825bb565b0723f6ce039d2347f828 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Fri, 10 Oct 2014 14:08:32 -0700
Subject: [PATCH] Fix inset drawable's intrinsic size, replace ic_text_dot
 asset

BUG: 17648301
Change-Id: I8af0f6d1beee7a1cb3a3b9db571ed2c407e24556
---
 core/res/res/drawable-hdpi/ic_text_dot.png    | Bin 545 -> 0 bytes
 core/res/res/drawable-ldpi/ic_text_dot.png    | Bin 611 -> 0 bytes
 core/res/res/drawable-mdpi/ic_text_dot.png    | Bin 453 -> 0 bytes
 core/res/res/drawable-xhdpi/ic_text_dot.png   | Bin 646 -> 0 bytes
 core/res/res/drawable-xxhdpi/ic_text_dot.png  | Bin 1518 -> 0 bytes
 core/res/res/drawable/ic_text_dot.xml         |  22 ++++++++++++++++++
 .../graphics/drawable/InsetDrawable.java      |   6 +++--
 7 files changed, 26 insertions(+), 2 deletions(-)
 delete mode 100644 core/res/res/drawable-hdpi/ic_text_dot.png
 delete mode 100644 core/res/res/drawable-ldpi/ic_text_dot.png
 delete mode 100644 core/res/res/drawable-mdpi/ic_text_dot.png
 delete mode 100644 core/res/res/drawable-xhdpi/ic_text_dot.png
 delete mode 100644 core/res/res/drawable-xxhdpi/ic_text_dot.png
 create mode 100644 core/res/res/drawable/ic_text_dot.xml

diff --git a/core/res/res/drawable-hdpi/ic_text_dot.png b/core/res/res/drawable-hdpi/ic_text_dot.png
deleted file mode 100644
index fa69c69adbb88ff3512cfc867b8a7934ce686af5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 545
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfizez!?|}o;S3Cnnw~C>ArXh)PIb&XWFX+WUv|m8B?Sy(whYpI
z4M$XWu%tUL^4``mIi%=WX(GE)OVaj}Y$x+mE06s@{;fhORBNi&Q{Dnq&o9jS>YR~3
zA2rQUxqsrFpI=<;%}+UOf49$`GcC$%*DI|jkL|kp5`5$oZITXmGB`XqqITA<FTbhL
zU8X}~np^w5q*ad1H<)A<JEa@>ZXA1I!rWdkM^V<_pW&RL)!75e*Zd#xPc}W&ubpz}
z)1<JhU#H{~vbLPke!_FCm@Djgkk2LGZ%XG+mv~G5XK#-vsH{9GE_PYpa@tEi4(4u)
zduIceDZP6%LoQNb$?-CuiIO}?8{cKV*WZ~Me@pAsthtjXzjTiOHRZ~yX!}orw(1|I
zm)+%6n|<@v*8_)m>nud{*M(?JJ!SoY`@XNVk3`tH*T4`|Epd$~Nl7e8wMs5Z1yT$~
z28M>Zh6cKZCLxCARz?O^CI-3&=2iv<I;A`|C>nC}Q!>*kQ8btVRa+StLNs`pE#d%b
vkObKfoS#-wo>-L1;Fyx1l&avFo0y&&l$w}QS$HxPWGaKFtDnm{r-UW|^gYOv

diff --git a/core/res/res/drawable-ldpi/ic_text_dot.png b/core/res/res/drawable-ldpi/ic_text_dot.png
deleted file mode 100644
index 4aff20ce976352059399e9c39ddf4e7a3f7e38dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 611
zcmeAS@N?(olHy`uVBq!ia0vp^;vmey0wleZWwe15Q<As43&a2R{xkc5JkA1-$YLPv
z0mg18v+Y2FWd)AuKpL!<fv<^s4+8^Zwx^3@h{fr<lkD}K3q{)I7w3QNHwbW=J;B4}
zP{S+t7wQ3GvkyMfp3#$ZSY=}bkCI!b02?QBqQJ&2vVX2m*m5>E@AWHNvAv3=$)fM`
zEiEh0owVHl`B3~+174Ptqbnp|w`mGD{5Z_8dC`^o%NPYR6Ksw?b<CVA<@qJfc1?VM
zOThiaXDO2oUfg@w`uWSh|NcI(m>ZQ8`m4U}ve2T;gy)+U{Jb^UZa1s#u9tp%hRJ^z
z+yk6v#_zd0XL6x&-m$a$?!G=WYmv}5jrErV3RUmeCMA1D>S%VSPJ8L;v3$kLT!|Iz
zrVR^3YYvP3{lhA(?H~}7pSZp{R8)8F^BkGA8LeGmS09=j*ACg5D3Kb`())Jq?g^3%
zKC{l={c}rg>XsdHdDogHA{piUy>x4H1H(_fNf)0!SNBbJXQJsmPr(JN|5{4QcDu)S
z^^41<>sM~rfA?#5RL6vbJ(?n_VsAWJ8QAK-&Rp;MhbR2}uisDqzh)Mn-Wgl)-Od>p
z2dX8m5hW>!C8<`)MX5lF!N|bSK-bVv*T5*m(9p`j#LC!I*TCG$z+j^Is@o_Ua`RI%
z(<*Umc;F=jie*WV4Z-<oCFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5X7(8A5T-G@y
GGywqYGV5mm

diff --git a/core/res/res/drawable-mdpi/ic_text_dot.png b/core/res/res/drawable-mdpi/ic_text_dot.png
deleted file mode 100644
index 2225bd581425fd3a742b09c02af6cd4df4272029..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 453
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE|787)5S5w<M`XjhFpgYcwFn}tYzWa>$+S{q5R~8
zyX|kU7z!Arzqxd5ee+zW?#C4;Ug!&a+phCk+EYuzf+2KHn(bPZhuc2}Ox_XaT~w5~
zb<=Or4a>@`UTVEuxV$H3(S!di9L+Bz7$sgZP5y0or9-aZ-~#t6JFjcI9A?;~@S~A!
z;?e{A?=$s@@?|_WozbhKW?kfbXeMWc^9SMQHJouRtkV(_Y-i6t5S}=bamL2RPM77<
zFBi>TvisRvx2{#cwtZSOKUAk8e@2hWbg5-cP0k+}7g#Kv;QJ)~8qi~^C9V-ADTyVi
zR>?)FK#IZ0z|c_F&_LJFB*f6%%E-XV#6Z`;+{(Z}r<BJAMMG|WN@iLmiUu>FYAXXn
zhz2jSMI1m4k{}y`^V3So6N^$A98>a>QWZRN6Vp?JQWH}u3s0tkOl9zN^>bP0l+XkK
D&3&Ts

diff --git a/core/res/res/drawable-xhdpi/ic_text_dot.png b/core/res/res/drawable-xhdpi/ic_text_dot.png
deleted file mode 100644
index 869dd95beacee62d5871e38c4caa0e540d96b37f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 646
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfwTh{zxw<mfq{Xs&(p;*B;(%OX@-8Xh5~K&?<ZS0&C*!3;GP+;
zhvp6rq2mrRt-=K?Doad6GK*U@L`*m|MQm(;FOJyXYI8#PUW&7E{MPLL^t#*Do0%O2
zSU~8*xh3CJ?biCLIK=R8+npU3sI05u@73VqKJU?ni*-En8~JOV34dtLztgignD6V`
zhps+J?`M{;+xhv-zH@)d42oOgJKXPGyKppUexB{B&BdM)<@IY`oqEobfBbdu4DSO@
zZ~ms<<FNNQaql*NSTU!^qo3V(?d@AXAIy?t^t|&qanIN3BJy{HrG*w|2V7wM{U&GY
z&BXm@v%4FnB#3XTNoLx;a;3-?j*8i}i;s&Hw`Om9tIv4-(xi4>Cawb0DYxw>?OZkO
z|GZgk;#qa3?3=0#)1~-YUmRGvI$R|sT+epKc7a6oc`H(#owlt|znbL6c-VB#wGT(9
zu8x|qY5D)>^)q}PEu5}*{ICArF9mb5KUuC-e5s*QweN%AkCWm1l<$7{x_#%Idy{gP
zJw8(R;{B{k>&%v>Rs~CegH3?t{W)d7c?*s2p0#@gj3U(%*NBpo#FA92<f2p{#b9J$
zXsBywplfInVrXt<WME}tple`mWniFF%436~AvZrIGp!OugBeh@m4P8dgO}MN4xk1}
ukPX54X(i=}MX3yqDfvmM3ZA)%>8U}fi7AzZCsRSDGI+ZBxvX<aXaWG6JpYma

diff --git a/core/res/res/drawable-xxhdpi/ic_text_dot.png b/core/res/res/drawable-xxhdpi/ic_text_dot.png
deleted file mode 100644
index a74c2862bb9d09833de2e7888a447dd358f1ebd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1518
zcmbVMeN5bB7%v~&E(A8vOl5#6U9t?vUE4eEt8&0`?TvHZ0mnITC|T(hu7hh!Tet(_
zJV%7hm}OZ=9FmM>8JZ{~IQEfqBRDZL5C%*V34;ZlLAHo<bBQjZnJsYWA7m~zY2WvG
z-{<#xzI&v|wL2khTO0rY3628XEwB5PSG7_8-aZj9$xE_Clu0FAl@uTa8nAk~N*Z+d
z$!gk7litR<VLBTCVyYNVnN;R{6{9%6hE#MkK|e2}0U$d!$dgnJErFGEHN#q<UoH<q
zAmg<_rFtjg<ZZN%DQFVtk|vjjYO0~kUMM#Q%no8QfuEL0FzBykMJ#B6mU%IGuN=b=
zxU3@8SfCZB%A7@@jT2~4uR+ulVn9FxszG&GMx!wk)FLPXBU%{Ms!=1R(_#n$u0D`#
zP4HG>Zrr|VOO`B<Pm*{Hh690sCZN-BLN$z<&1Qu|t5wSyYO#@($e@}Pw?`OoTBHPq
zml%!(6-Kg>tCuX0?CDAfe%|R^BWA_bM9C?GgCq~58U*(HmAIC*MafP7<How$qNkCk
zVK*&u^#Uc=qiTBuEa&dYh7?8F8>~=Z<f4$ZI7ij{X;yOJ7D&F)co{EdBC@n5lSymU
zY7GVxikgh5-EPV!aKvcVp?WmJu^!fnShXg-2`2~xilPK!#m!c`PR3bnR>YWZh+rM8
zD3L5hN9;1P-BqmZiCD}g(4@o(9*(PxbU=}hlQ_}G@u00l4?0PTVHH^^&q}m7EietV
z*Di2=a5=vivyT1$j(Y{`{XaQ_WoKZeIsVlwkt4YSmF-&V%fj05(5yT$f;<`o-~2NG
zM8D|3t)Ae`#ZKpLyg0ROJnP8e!#k6%e?&k~E0g?IXm7V+^4#>)rWY<8n9MBKzjr4F
z?`*K)ozL}WKm;D2)Nydi^68DyEVy(bb$p1^-TSL6ywD-uo9XZjR2c8S9Y3)_l?Q-8
zR0xO#q7#9q74Cm%-7@&F{oLu%ozMQ(UpikLcArc-7XQ=8(c}L9H;Igl>YP;1NK5Wr
z^-Eum<hL!|%9t5ZM}J=JG#9sCo_$<0?bakt+-etZe!MTG*X8JqD|7cYKbklG+MT(}
zsPYx=3zt?cy>aQ2(Tus-P3L!X<t?O?>&8{S@s@#Wg@^7`qz|clF3r_3<Hd%}QP+nz
ze$#p>`o|b%s66V2cg}x*HY9=m;I8j1#|&4t7A2fX;5K-onW34K&(i0K<URZ!9a#_h
z)9qitcv{ITeFulT#{zY+`1>aw)!~Ei^K*;T;cW|{Z}Buw!729Yg|WbEd0&Oyi`2mB
zvv*T_2anH|HZ=Ftomvbxg>tU6&v}lv-`M>7Qs1O&dcNf$N$#CKnZ4z)scmZUV)E3>
za~~v41iShU+<y1<$sHAEwkD~sHEADw*|TR#qqjYinA(#-0MS5{3Wx=P#1N48ltO6k
ZPZa{Bg{fS=){(6IfgOYk@6F$T=x?}S1!({P

diff --git a/core/res/res/drawable/ic_text_dot.xml b/core/res/res/drawable/ic_text_dot.xml
new file mode 100644
index 0000000000000..f8f39645378e7
--- /dev/null
+++ b/core/res/res/drawable/ic_text_dot.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:inset="10dp">
+    <shape android:shape="oval">
+        <solid android:color="?android:attr/textColorSecondary" />
+        <size android:width="4dp" android:height="4dp" />
+    </shape>
+</inset>
diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java
index 88c36d44c405b..60196c05e7db7 100644
--- a/graphics/java/android/graphics/drawable/InsetDrawable.java
+++ b/graphics/java/android/graphics/drawable/InsetDrawable.java
@@ -339,12 +339,14 @@ public class InsetDrawable extends Drawable implements Drawable.Callback {
 
     @Override
     public int getIntrinsicWidth() {
-        return mInsetState.mDrawable.getIntrinsicWidth();
+        return mInsetState.mDrawable.getIntrinsicWidth()
+                + mInsetState.mInsetLeft + mInsetState.mInsetRight;
     }
 
     @Override
     public int getIntrinsicHeight() {
-        return mInsetState.mDrawable.getIntrinsicHeight();
+        return mInsetState.mDrawable.getIntrinsicHeight()
+                + mInsetState.mInsetTop + mInsetState.mInsetBottom;
     }
 
     @Override