From 74b579db47d2184b61d8068c19d0bffa538aed50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Tue, 10 Nov 2015 11:35:59 -0500 Subject: [PATCH] cleanup unused ressources Remove unused icons and components Tuleap: #124 Change-Id: I696a72604b880fd13b9c406bffe3371aab2ec189 --- .../ring/adapters/SectionsPagerAdapter.java | 129 ------------------ .../ring/client/AccountEditionActivity.java | 3 - .../java/cx/ring/fragments/HomeFragment.java | 125 ----------------- .../java/cx/ring/utils/SipNotifications.java | 2 +- .../main/res/drawable-hdpi/ic_action_call.png | Bin 605 -> 0 bytes .../main/res/drawable-hdpi/ic_action_chat.png | Bin 294 -> 0 bytes .../res/drawable-hdpi/ic_action_dial_pad.png | Bin 344 -> 0 bytes .../ic_action_dial_pad_light.png | Bin 330 -> 0 bytes .../main/res/drawable-mdpi/ic_action_call.png | Bin 464 -> 0 bytes .../main/res/drawable-mdpi/ic_action_chat.png | Bin 263 -> 0 bytes .../res/drawable-mdpi/ic_action_dial_pad.png | Bin 347 -> 0 bytes .../ic_action_dial_pad_light.png | Bin 336 -> 0 bytes .../res/drawable-xhdpi/ic_action_call.png | Bin 792 -> 0 bytes .../res/drawable-xhdpi/ic_action_chat.png | Bin 307 -> 0 bytes .../res/drawable-xhdpi/ic_action_dial_pad.png | Bin 326 -> 0 bytes .../ic_action_dial_pad_light.png | Bin 307 -> 0 bytes .../res/drawable-xxhdpi/ic_action_call.png | Bin 1152 -> 0 bytes .../res/drawable-xxhdpi/ic_action_chat.png | Bin 422 -> 0 bytes .../drawable-xxhdpi/ic_action_dial_pad.png | Bin 474 -> 0 bytes .../ic_action_dial_pad_light.png | Bin 459 -> 0 bytes .../app/src/main/res/layout/frag_call.xml | 2 +- .../app/src/main/res/layout/frag_dialing.xml | 4 +- .../app/src/main/res/layout/item_contact.xml | 4 +- 23 files changed, 6 insertions(+), 263 deletions(-) delete mode 100644 ring-android/app/src/main/java/cx/ring/adapters/SectionsPagerAdapter.java delete mode 100644 ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.java delete mode 100644 ring-android/app/src/main/res/drawable-hdpi/ic_action_call.png delete mode 100644 ring-android/app/src/main/res/drawable-hdpi/ic_action_chat.png delete mode 100644 ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad.png delete mode 100644 ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad_light.png delete mode 100644 ring-android/app/src/main/res/drawable-mdpi/ic_action_call.png delete mode 100644 ring-android/app/src/main/res/drawable-mdpi/ic_action_chat.png delete mode 100644 ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad.png delete mode 100644 ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad_light.png delete mode 100644 ring-android/app/src/main/res/drawable-xhdpi/ic_action_call.png delete mode 100644 ring-android/app/src/main/res/drawable-xhdpi/ic_action_chat.png delete mode 100644 ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad.png delete mode 100644 ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad_light.png delete mode 100644 ring-android/app/src/main/res/drawable-xxhdpi/ic_action_call.png delete mode 100644 ring-android/app/src/main/res/drawable-xxhdpi/ic_action_chat.png delete mode 100644 ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad.png delete mode 100644 ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad_light.png diff --git a/ring-android/app/src/main/java/cx/ring/adapters/SectionsPagerAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/SectionsPagerAdapter.java deleted file mode 100644 index 1f3be0040..000000000 --- a/ring-android/app/src/main/java/cx/ring/adapters/SectionsPagerAdapter.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (C) 2004-2014 Savoir-Faire Linux Inc. - * - * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Additional permission under GNU GPL version 3 section 7: - * - * If you modify this program, or any covered work, by linking or - * combining it with the OpenSSL project's OpenSSL library (or a - * modified version of that library), containing parts covered by the - * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc. - * grants you additional permission to convey the resulting work. - * Corresponding Source for a non-source form of such a combination - * shall include the source code for the parts of OpenSSL used as well - * as that of the covered work. - */ - -package cx.ring.adapters; - -import java.util.ArrayList; -import java.util.Locale; - -import android.app.Fragment; -import android.app.FragmentManager; -import cx.ring.R; -import cx.ring.fragments.CallListFragment; -import cx.ring.fragments.DialingFragment; -import cx.ring.fragments.HistoryFragment; -import com.astuetz.PagerSlidingTabStrip; - -import android.content.Context; -import android.support.v13.app.FragmentStatePagerAdapter; -import android.util.Log; - -public class SectionsPagerAdapter extends FragmentStatePagerAdapter implements PagerSlidingTabStrip.IconTabProvider { - - private static final String TAG = SectionsPagerAdapter.class.getSimpleName(); - Context mContext; - private final ArrayList<Fragment> fragments = new ArrayList<>(); - - public SectionsPagerAdapter(Context c, FragmentManager fm) { - super(fm); - mContext = c; - fragments.add(new DialingFragment()); - fragments.add(new CallListFragment()); - fragments.add(new HistoryFragment()); - } - - @Override - public Fragment getItem(int i) { - - return fragments.get(i); - } - - public String getClassName(int i) { - String name; - - switch (i) { - case 0: - name = DialingFragment.class.getName(); - break; - case 1: - name = CallListFragment.class.getName(); - break; - case 2: - name = HistoryFragment.class.getName(); - break; - - default: - Log.e(TAG, "getClassName: unknown fragment position " + i); - return null; - } - - // Log.w(TAG, "getClassName: name=" + name); - return name; - } - - @Override - public int getCount() { - return fragments.size(); - } - - @Override - public CharSequence getPageTitle(int position) { - - switch (position) { - case 0: - return mContext.getString(R.string.title_section0).toUpperCase(Locale.getDefault()); - case 1: - return mContext.getString(R.string.title_section1).toUpperCase(Locale.getDefault()); - case 2: - return mContext.getString(R.string.title_section2).toUpperCase(Locale.getDefault()); - default: - Log.e(TAG, "getPageTitle: unknown tab position " + position); - break; - } - return null; - } - - @Override - public int getPageIconResId(int position) { - switch (position) { - case 0: - return R.drawable.ic_action_dial_pad_light; - case 1: - return R.drawable.ic_action_call; - case 2: - return R.drawable.ic_action_time; - default: - Log.e(TAG, "getPageTitle: unknown tab position " + position); - break; - } - return 0; - } -} \ No newline at end of file diff --git a/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java b/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java index bd93dd18a..8e5822b59 100644 --- a/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java +++ b/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java @@ -50,14 +50,11 @@ import android.view.MenuItem; import cx.ring.R; import cx.ring.fragments.AdvancedAccountFragment; import cx.ring.fragments.AudioManagementFragment; -import cx.ring.fragments.HomeFragment; -import cx.ring.fragments.MenuFragment; import cx.ring.fragments.NestedSettingsFragment; import cx.ring.fragments.SecurityAccountFragment; import cx.ring.model.account.Account; import cx.ring.service.ISipService; import cx.ring.service.LocalService; -import cx.ring.service.SipService; import com.astuetz.PagerSlidingTabStrip; import java.util.ArrayList; import java.util.Locale; diff --git a/ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.java deleted file mode 100644 index b0c58d865..000000000 --- a/ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2004-2014 Savoir-Faire Linux Inc. - * - * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Additional permission under GNU GPL version 3 section 7: - * - * If you modify this program, or any covered work, by linking or - * combining it with the OpenSSL project's OpenSSL library (or a - * modified version of that library), containing parts covered by the - * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc. - * grants you additional permission to convey the resulting work. - * Corresponding Source for a non-source form of such a combination - * shall include the source code for the parts of OpenSSL used as well - * as that of the covered work. - */ -package cx.ring.fragments; - -import cx.ring.R; -import cx.ring.adapters.SectionsPagerAdapter; -import cx.ring.client.HomeActivity; - -import com.astuetz.PagerSlidingTabStrip; - -import android.app.Activity; -import android.app.Fragment; - -import android.content.Intent; -import android.os.Bundle; -import android.support.v4.view.ViewPager; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -public class HomeFragment extends Fragment { - static final String TAG = HomeFragment.class.getSimpleName(); - - /** - * The {@link ViewPager} that will host the section contents. - */ - ViewPager mViewPager; - SectionsPagerAdapter mSectionsPagerAdapter; - - @Override - public void onResume() { - super.onResume(); - ((HomeActivity)getActivity()).setToolbarState(false, R.string.app_name); - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - } - - @Override - public void onDetach() { - super.onDetach(); - } - - @Override - public void onCreate(Bundle savedBundle) { - super.onCreate(savedBundle); - mSectionsPagerAdapter = new SectionsPagerAdapter(getActivity(), getChildFragmentManager()); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.frag_home, container, false); - - // Set up the ViewPager with the sections adapter. - mViewPager = (ViewPager) rootView.findViewById(R.id.pager); - mViewPager.setPageTransformer(true, new ZoomOutPageTransformer(0.7f)); - - mViewPager.setOffscreenPageLimit(2); - mViewPager.setAdapter(mSectionsPagerAdapter); - mViewPager.setCurrentItem(1); - - final PagerSlidingTabStrip strip = PagerSlidingTabStrip.class.cast(rootView.findViewById(R.id.pts_main)); - - strip.setViewPager(mViewPager); - - return rootView; - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - } - - public class ZoomOutPageTransformer implements ViewPager.PageTransformer { - private static final float MIN_ALPHA = .6f; - - public ZoomOutPageTransformer(float scalingStart) { - super(); - } - - @Override - public void transformPage(View page, float position) { - final float normalizedposition = Math.abs(Math.abs(position) - 1); - page.setAlpha(MIN_ALPHA + (1.f - MIN_ALPHA) * normalizedposition); - } - } - - public SectionsPagerAdapter getSectionsPagerAdapter() { - return mSectionsPagerAdapter; - } - - public ViewPager getViewPager() { - return mViewPager; - } -} \ No newline at end of file diff --git a/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java b/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java index 76fd929da..cf3400e52 100644 --- a/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java +++ b/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java @@ -153,7 +153,7 @@ public class SipNotifications { Builder nb = new NotificationCompat.Builder(context); nb.setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_launcher)); - nb.setSmallIcon(R.drawable.ic_action_call); + nb.setSmallIcon(R.drawable.ic_call_white_24dp); nb.setTicker(tickerText); nb.setWhen(when); diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_call.png deleted file mode 100644 index 01f21fd6cc6fe75f84d6a26e8d7c7ae9c48f5eaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 605 zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz|4BqaRCwC#Sj}yNFcjuRy>@_h02ZJF zWPqf1(mNf1+!OA}0Oa0efaKmRkOdf^9e@GS_oQbDA#7s;wk!FQEF^x+_xU})A4gF@ zKtMo%P2BJIIgW20iEBP!K>QgmIgUl+c8%j50BTnPW(MTT7I^~Q-?+5E%z%6>d4*gm z_1OX{@&Xx(h`kelq_Q65g)41+w7}9}t{4U9z6p3SoG-N<T4xi?nffH)cfgz%p9EYD z=DOinVN$!=6abniL=otynWMsSuuWXxNvRH?LJ_pGvW@wP@7%o3#I(AKXLaNlS^>Pm zvQ=JrFF<33g{u<6NB~>mBze634;Bzss3j#t=Dh%JS_(xqI``cI5yyI2rro&M4?}99 zJtwcOlDaez!Tt5_kpd8ge1t!I#mg6y?#d06;3~r`f5LC}R;p3_(GQVSG&g0BJ&|{m z;zv_A99&NG3Kt3yJ6UvMab0c`v-osU7iy7NYEC9d=(g!nw9-9VRSFn|?#Kqlhy*=E zh(6&cT&(BRM1HL*7-6h%#=cuhHuhsRKfv4MEhW3iha|*4g4$Y7+=x!65vMJzHubdW zIG(RZ=oc=!P7k69!N-!>z>|uK6JqU5Kx>2Niq>=xd20e1LK3z}G6s3;0$Q~cxfNw( rar#GRP-i55hynrv0s?H|Pk;dcgFnXv#AK$#00000NkvXXu0mjf&u9cd diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_chat.png deleted file mode 100644 index 4d9c098263973cba6f4b267f1e6f5c1ac6b0b561..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GCp=voLn>~)nemYGkb!`kaA9Xz@0!Hx9oD7G^&T)-H83w} zf6~s9?C<qq(ffme7EV9*J=vjL$_Lc>p#Ed3(o&OC=?1I5Kij+CPQ6cGY_7^8$B*Kj z#WQV6f;9O*7XA7z#~X6=d%}aY6|dRMjz*g;5X!&V;8nA>ciNdvH}|;ro|*Q;Gy7WC z`<1=_)-n2W9*tqTb6|U3!pV!1CM@o4+#Bn0b19Q*Na7@6uHMofU0$9xc?%vRo`ePE n%xd+kPdtc`0Xl>sXA_qJ!@3<h8ar5$96<t}u6{1-oD!M<=YMn% diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad.png deleted file mode 100644 index b2340a6d1e6e103b83134d0fe907433e7b718a6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmV-e0jK_nP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy`bk7VRCwC#moW~4KoCV&V`GgitsH<# z&S33DIENRp#WP^V0i?Bsn${t~gl5KFLIb>?OqOJSmi@`@ysUEwp+#%wYfRHLmf@&O zw^dcOfxbwFNbz;z`}pkZ5D@kzbynt{QbnLIle#LtTI%kzsr}NA5CI6V^#CDV$ZBiN z1Ya|Bo6vtDNDPT-qXZxTB(?}!8iai--`09)H6-o<6)V%Fkn=V8E;5|7BP70h@b$1u zv?KIeZ_Yaq8-yL7`ONT*y~!UEdj+745`X|3BJsm|s7&yc28}xiw>lCB5IeV?ltS2o qOH2R)5MY}mo}1VRA>`awfB^uaMpfpWJM|a<0000<MNUMnLSTZ~myJ6B diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad_light.png deleted file mode 100644 index aeb903b34615f03134c80de891fa4022598bbf63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmV-Q0k!^#P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy>`6pHRCwC#m*EM*Fc5_s@vj5u09l}G z)HQSfr?G3;HL`#Mm;oFho|1wHxh7JO*zZ9|A&(>vF89%<K?qeXlWPniSeZ77Wp9kR z75a8EZ4<t`_^vtkS{H;p$!HU6eH<mePR1eOb25%Oms-_cLIfbd(gT!qA+4?XFMK|B zo6@roB!<MaQ34PE5^IDV6vDcX?>=Kc^fx4a0?H<q2O;Mr`t}N8o%mezwF>b3xZj*_ zz$yp6*LF8S;?dhqkT@#<ZIl26;D_e7KQySC5-KRQvj#FLjh;tL00IzTfh3-r*a#u? c(nEj&0L8as3*Aao9RL6T07*qoM6N<$f(ZkE>i_@% diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_call.png deleted file mode 100644 index 2dcfc0de0c340978d21e6d9ec5d9dc53061d7e0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 464 zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUza!Eu%RCwC#RzXg~Fc7ROt~{VTpdZKs z$OGEm%LBp#;7)rd+>;03JLL|&(+}hU@Blv`%t~7+GMm`cc6-T4t4QluJ6Vr+GMS7R z;XvEAH;6Uj`Vz&Lh!4aU;vq#1HBg)iuC4T=QtC4~0TeIrD1;@0Sb>CzMPMqOc~5Zy z>EJnL2c|;q*0CoeQKlr|gFGdHy<<;<C}R=0`lCvvzR}_Xwc1+xLDX2^rPcu9UC7<X zF5XLk3pG}{NHK_pL};J$0!K4H8v%5IbfB&DCblQIu3^pMJAyj!bT$G!a%~gJ(S^-` zhs+U`@32z7t|)vtnbOww1-$#pogy6Az)a92<Xf>7reW0;CKK%nm1fBs@_A4P9Gy7M z4bn@6nDuPeJjl$+1RNxMP=bICG9x~YJL`7%z(_uGk{g0V!zA=Sw!M(g1Zkk>NHQMN z*}!WW#mit3dT3)I5Fz2!QEq|nZ+z#kYA>~Y#E33_1sDLzf{rBmL3J<y0000<MNUMn GLSTa3@yDM4 diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_chat.png deleted file mode 100644 index d3232818eda02d44d994ab3661965db3be828837..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GD?MEtLn>}1B}pV4FnQGw$lha>ut4@e)0v<D|JO^&zWH<J z#EBg;tC<@buJQfgIr5TOlr`aW<G%f-0(=LuEcePZTrSGVWMG@e{4q^P=iv0RyoZ}) z<}=S@G(D?yt<0;4UypqSBkx?#??nupADA|Nbg+7$W59Ju(@;XH=~zlT!vzK}=Z5Kv zOc;)ocrq{E`tZT3zQzPG-ZvHJ3}zh6kdi1pu!5QG4kH628$;J`mD_D^7R?7bn!(f6 K&t;ucLK6T|cVf!` diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad.png deleted file mode 100644 index c8c6ab18ea0881817a0a024424a4396a2f5170c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy{YgYYRCwC#RWT02Fbph+1=e(gwLG8` zeM4FKNZ--dlsB|fA3#<Z$qFkM$w*+_NFb!P;FGLGxkj;UUoVOjJ!8^Eq-naqvSi2C zwr!8#4EBa`4x9tG!hX)U6S#}?&Mc6ef4pF47EvNHM9#Q9qC)Ht3FAt-`+{lTEzkr) zGvKJNk2uqM5Wc^k)k44BC}n79+Mg-_IW^$?l&^UOz*%q`>|@5&UZU@|zz9<FrETc( zT)1N?=|pIcQxyy{fsef4Z+=9bW`yc&B{M>GDsY8lMqZ*iglb0PGNTa4a5BMgns2rs tgjkT8RTcc43`3{|DGpa^iV$uB3;>pmP@?gaL$?3`002ovPDHLkV1gmokr4m@ diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad_light.png deleted file mode 100644 index 97054c21c4b8d9d16df777fcce650d11fc2a0827..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmV-W0k8gvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy@<~KNRCwC#SHTT~FbpJBzYG8abb+iv z*MI>!4Os)$$N~&N24Dbsk=&2#fLc|eX>G{@<rHGscbrlb8V83-0qeS!cwE@>VvL!9 z)p)NM7J$vb;+~RW6R<@(=e$u|{7}!<JhDSJ$d+M_@`khw>uB#&oQ@uW7O=&EKr`iQ z4=y-?A2CK@-XTjF*2H!$wE>tFnC^jjU{^t+W0dHtBd7$a#nujVxFkbQMO$IttSb1* z0^ah1zxfd*%?RCTB^97M4p=XlQIx2XP|YYWGujF=oJKI5;gcgMc8tm<MxZMA5i{B$ iVe(?4cfIW5F2De>)l@KuVhBtC0000<MNUMnLSTZD;fECf diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_call.png deleted file mode 100644 index 2030e3112dae8aa2f4ffbde81aadcfd3118023fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 792 zcmV+z1LypSP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!x=BPqRCwC#TDx(=KoFG}rxbt-paBXn z&ardsT;zrvky{0b0#I&~TP}bGT!1M+1>oJ8)y!D~_XqBddowo*5R&$3zweYJ5fKp) z5fKp)H;UB8MGl9<7!Ffddss!9rj0KI+!-3)hr=A!r1Mkm3jsX?<A-o4j~G88j|eve z$iOA6{)tmC1YRK&euMJ>F#ZV+?;PV3`fV9p2$1ozhK=C-ESM0WnBQpJ;{`(DCj<}B z&FlqL3x5fqq&L*O$AC(u*B)S6)|@SkJ%zVuiY1V6A50^pf&P)E$r}P}W%0eQ1nex_ zYYpY_)8{_mOVIuC$XmJE7OPBy--<E3qqn|G9EOSqU<Ut?IJJgVxo)`DGzcW%_&eg9 z(tzQQiAPW^gKJT#^GOR(CV<>p<l57aJpi$i7=uT_5<umw5}cNW>;Y{qXars`4VD0s zy+xsrk%$tc2OtSG)qLLYle;X2DE9$J`hq?+M?52UK-Mfc4`4!JAyF0bAPHc415s6& zn38~sG^)(DMU~Xng(TW!#1;t4HLjg8rM02yvUZIC%mXN!4{Vaa8N#-Sg^gHik{CV6 zT+ko1;ZQ16hf^CdIGS%vORZH+kTyVO5+q=#l%j{HmYNq<10o^2dI)qLyxln#z2$~P zlgc2kumX&-@^lsg6iH|w{-1h8Z@*N$t#X1q8vz<5v_znqRKtI92U=HKkWP?iC4eCT zv;L*$0;y_q_KguHF<x3Dl-kX@$j%VDBFzKU1qrB}A%G#GkSvon+`o2?0A_Z07L3v+ zz>q7Pr~(oRa-8r#wo(Op)=cG#l&ccJ%n;bg*^tl{szcJ%3Fr(xZw9r0rL+0!3;~@E zFjHuOwT*X@fR0BX5f7Xkfw7*Oe1+yL0Y{SMknsxq(4w{_ibO<2L_|bHMBF6)1Q-Cx WK@0_L8>~_Q0000<MNUMnLSTZs)KK*R diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_chat.png deleted file mode 100644 index 09ef91dc47e2257dbc72fae14a6ee31f758b0ab8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xu6nvShE&{obL}E;lLJpf;<+EMq_#6;KQPgIz{K-F#;Q&4 zfD~WBwDJquRhc>e^&fJ2zR?%m#Rt^Mz@RW=OWC3+Mdc>Xb(faJS#9M0puC<>Uh%-~ zhkMz7SnPSu5PG<pH^6q!afVe7_p%1?zt=pl>|uKK)931z^LpD}?BDTi*H@?9hCna- zD4+bV&m<rEPGHy{)42G~s@f+E%-RAqtWkDs*|JYggfY&tWfSc`{nP%%AufRfX{?*> zG+n!I8O>&~k%>itfsw<3fk^=DBnF21SE>gXu34*g9Pd2y2qfm|>gTe~DWM4f!ya^a diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad.png deleted file mode 100644 index 73f8bc07c45d8efd2a274e1fb130914b61aebcae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XUU<4VhE&{obL${)lY@X;qG{X~w!N1a_TK0y4QOz^$Pm8P zaosvj_AiHauq^ttH^tfG+xbb;bIRBv)-o_e=)9g25IOC4i6zUjd#`rw`(AXs<R)** zttmVEVzp111>gDHc&@QBRLb}LzbS5p6Eb(*xv|wLXWBki4uu8=CJqG#hLUFa(q`8! zj-Iknmruts%~VTWwK3ZgCg0Gol53%7d?@p_1371YrFs}Ykx&6^Y+zv6f0yU!rK?|^ z_xw@&zV>W@-o$0k{+e4ZXJBLzZ~ze>#9ITF9LN-X!N73lkaGhg!<&^(mE4~fD*^q? N;OXk;vd$@?2>|d8e{lc+ diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad_light.png deleted file mode 100644 index b7c772aaa9d5f21535ba97b32255d300542b7fea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xu6nvShE&{obL%2!vw?_PV(_n5Qn3dX$}G5CvOJCPdO?H4 zLH6G%SG2a&u{Ux2+*zcc624Z8fkDsvhLD%$)t{d<X54BO_!XIV<_h;ryYyXqw|ec& z7csZHusR`bw)>pB_MbDvj0#V^T^oAj?JMsF1||*#Ai>~ZzGIbij+gY5I}49SzKfmE zX?gkG+Ej6n99Ti06^HDvRZ<&R{2pJ?cb=tqTY-^9z=460h2h8Bv<&UbJL@|8??3tH sd*D^t2|bWFSki)%iJ>9in8SdfBFU4v{kQurpa&T|UHx3vIVCg!0Lsg96aWAK diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_call.png deleted file mode 100644 index dd00fb1d2f51616a4c1df64bb501ebe45575352a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1152 zcmV-`1b_R9P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$B1uF+RCwC#Tsv|iF%Z>IoB9Cu0oVhu zxj6vd96N{H<J@d+oI?)IcR2vgmkV$J`v7wQZ?~(dqEvW6QcJ^(-m6kgfXAchr~axn z#sB~S0000000000000000E+nd_$X=ol`*4n0jU^MBoKU;E)yDE>!)>56c4!*(1|Sk zAzhXSgwN>H?>EqZID%*MQqmY4`O}KV9cjWF2+$M$6<wabSoMdnB?4|?g7obD!a?|q zF5Nc*0Xo8;(eR0GMs$A<Ca50a@9<9JmdsHF4RE*lp~7ce(s+aka>tW`@Usm~JAtcz z<mhlu!M$h|2sk0uA4Ztdg=iHBID&zq>B%-U4I!W(d2U&Rrru#FS2YvNul1p6=gjBV z`p~q~fI0Tt92JESP$kv`5MW`GXpZmX12!O_9s;&B#_$1$@fvYnY~H54Ptf+w8gBwb zFxv=oTG9AP|NjMv*l}nIiA~y=1V72CBptLLAoZZ%fh7rE@k<i=)?|opLF~~=B@$SG zu0^>@1pkurhJ3IFh!$Ll7C1#WId8<PX2P<9SB|%JbE^5LC`HUY?zx8el?d?E0+=A9 zTa23;xBAc}S`!rskl5WdFBpLUT`&Rfj#@AT0lHc+b=88LBO>(;86sg#m$kz!oJBu^ z09`ygI^<rirYH&l5|+B=2Bq|vf&e8F*de=a+DvmhI~Mhfm^jykajTYQRVRwt6(OeR z+3_~66HP#X9tnRu$`pfKNJ!Ne#JR!t97*8z$2#+nBGrQePSN}lEsEivcs{$HqqRJ% zY9#^k(tYFCdcNYlV&%E8@a^VbE~89R_8}#0O_VIzXYWAO97)o5sPme&VV1HrKB)%m z34nz;s6!JR8VT5EJ;dI#uBACwgt+z8gk@l|R-WjGKF>VI-m|Dh1NK(p%=n!#V_RLi zwz5bdu=IFdGzVQ<d%C>L*i#eORxdpYc%|ob`|`YAYcxPf6Brv=oo|s=zl}LPYu<Pb zP|^e=(ahomZP2POjl>UKwL$|FHDTu)=62%d**ta(yl|dFlf<(jK#_zU5o~T=*);Lz z(oCE)&A|@(tO!uZ6TXV)FHO8N&7XdV2pG4903m_1(Z;l`5CK0L>4g9DLL6y4n6!rh zlcRIyt7;t>A*F)%L6xEjtHj|WfOQ~f3$<vHx=K0wF|tE-#cjyxo=%ep5R-Ig(w$L0 zhH2>0szzymr42)glIqe1l})0?60n!y-kbQJ&N-A@j5VsGjV8eI4W&u*O$pVn{kDPt zD|s76G)tANe6_H+RRrvXtUDskTKKIb!150xrQ9Kk@LNrQMZ_S$G)3K<Z#@AP88<>k z@5ELAqPhE(Jpq<hTniE3t>}r9ytTynl>q<%00000000000000002J^~fB^sssG#Ht S`MnVU0000<MNUMnLSTZXunHsq diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_chat.png deleted file mode 100644 index 7472f809878a20a4d23c911572bc99534aa43672..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7(F~)978H@y}A8x?ZE_zwnWi--UAF`8`!c9CUfc}Ffea$ zxNdOZ`CFz-$By4NyFS<C`T3KbHsZPc8)7uJF6Crk5MW?nVsKz!-~gJ%puoVu!q5O0 zOuN47y#CanzK_Yt>m0ZGUcR%M!KK~eo7r3YI+^h03-)|G|M5*dqr}f243mztPq49T zc=C}^rJrA+vWDU0V`dLId52G6DT6hy9y3c^&_DJ*D)fi+`HF()hCLx(l|H=Jw1M7a zWLU5y>kjMN<rUu_iUM5_@>J@=-|l<oQu<?MUaw@_l3c0%==P(uN1J|pX1_3}DTbMW zqha@g{9DJ4zBZX`yDgaI#Xj?bPcda&OsLME|N3{@9o@d=JD-TCp!y5Vvke!&izP7l X{kBl_`MI_V=pqJBS3j3^P6<r_3SXH@ diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad.png deleted file mode 100644 index 649f86b6545090f4a6cb86fadd864db72eceb860..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7;8LT978H@y}7;7_ppORLm+$LMJLa>JP)|i8Z3<%iYpkN zd8B!0@e4$0ENq=-t(nSm>3nR#qwh;JCaKQPsc*bt8G9LM6@$##HD4NXZ^td&e*3_> z_}csX#bnldKHkeC^Vp`MDnIkg`AOGbZ*sa)vvD5N@2A~YMP>A(`EvUEuD|WyJcIi` z%fIOiOdJgiObQJQ911|@0l}+34Bsj5z1H~m9(Vuu$zSEq@iJJjn?7q<fBAOp6TKDh zf4^<~`03AEr6QfoJy#DH+OhfPPd=tor5^Iw%!Ivy<IVKvQQO(K={G%2UETQh;>WV3 z`L4Ddl|o_+j4Tcei~<e}ECLLS%aXrnr!X9tzCr(?mfL=xQu})8Sx!EV)0yQbJ%6yX z)H%D~mc2s28Ll3r^~YIFo#4Bn7H+3Q7!zKlCEFj^mivCzjZN2WRB!rzG~2Re_Lo`n zU&lAF8zS4p;?VHYqE-H}neW`nL|}L|to$jKz)<qpM>Rxl+Fnoydb;|#taD0e0stXM ByBq)j diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad_light.png deleted file mode 100644 index 934e55df2ad5fd2e54b8c4f142d68f0b7dd646d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7;`;c978H@y}5JH_ppIPL!fkFYJ(92cZ*>Hua$7*;vPrw z7Yqgt>>S^0Up`zPJn5OO=BgGE?PtO!E1xc70a{XEyz^_rVFR0~)2AO;`Fzgjl@BXc z_LR@raZJx*Z?NR&Jzp3~i{>{5_oo*9ZhL%{VZHG6AF^}q)oEp2X|8Ab@6Eu-;=sTt z;K0Bl0AxOBlS`NQyj`aD!=7o6V=u)Unln6*JF`*cXH48ZrE&?&=Z8;JlzJL%X^TGg zT7BI|WsAM*jh>yql<!>rw8Lk^x~+0<b@y10?=IObDZ4%{`7(pt5gShK1_maD1_llV z1}2UMhT9u|$Qm&`@VznngU+*vNo)51xnOp+s3$jg?dkS~sxG%f1ffoWx+-FlX-=@M z+U*d=hHIZL=@&?}eHXd?ZPu}Uo#ouy7p}dUyZ-Lpf2<V(!l>GA^qJO3MeS!P5T6zE i_^b#poEWsfs~=!c-4K32bK05pAOTNTKbLh*2~7Zad9$qm diff --git a/ring-android/app/src/main/res/layout/frag_call.xml b/ring-android/app/src/main/res/layout/frag_call.xml index fae787b81..26a2bb74e 100644 --- a/ring-android/app/src/main/res/layout/frag_call.xml +++ b/ring-android/app/src/main/res/layout/frag_call.xml @@ -134,7 +134,7 @@ android:layout_gravity="left" android:layout_marginLeft="15dp" android:layout_marginRight="10dp" - android:src="@drawable/ic_action_call" /> + android:src="@drawable/ic_call_white_24dp" /> <TextView android:id="@+id/call_status_txt" diff --git a/ring-android/app/src/main/res/layout/frag_dialing.xml b/ring-android/app/src/main/res/layout/frag_dialing.xml index a31bb4021..f0c6b9592 100644 --- a/ring-android/app/src/main/res/layout/frag_dialing.xml +++ b/ring-android/app/src/main/res/layout/frag_dialing.xml @@ -40,7 +40,7 @@ android:layout_weight="30" android:background="@drawable/item_keyboard_choice_selector" android:contentDescription="@string/dial_numeric_pad" - android:drawableLeft="@drawable/ic_action_dial_pad_light" + android:drawableLeft="@drawable/ic_dialpad_white_24dp" android:text="123" android:textColor="@color/white" android:textSize="15sp" /> @@ -71,7 +71,7 @@ android:layout_height="100dp" android:layout_centerHorizontal="true" android:background="@drawable/call_button" - android:src="@drawable/ic_action_call" /> + android:src="@drawable/ic_call_white_24dp" /> </RelativeLayout> </RelativeLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/item_contact.xml b/ring-android/app/src/main/res/layout/item_contact.xml index 4d2647e47..17008dbdf 100644 --- a/ring-android/app/src/main/res/layout/item_contact.xml +++ b/ring-android/app/src/main/res/layout/item_contact.xml @@ -79,7 +79,7 @@ as that of the covered work. android:layout_margin="5dp" android:background="@null" android:contentDescription="@string/contact_quick_call_description" - android:src="@drawable/ic_action_call" /> + android:src="@drawable/ic_call_white_24dp" /> <ImageButton android:id="@+id/quick_message" @@ -88,7 +88,7 @@ as that of the covered work. android:layout_margin="5dp" android:background="@null" android:contentDescription="@string/contact_quick_msg_description" - android:src="@drawable/ic_action_chat" /> + android:src="@drawable/ic_call_white_24dp" /> </LinearLayout> </RelativeLayout> -- GitLab