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 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIk|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+82@{^IEGZ*dJ}Orx7k4Cnd{!NhB5}R1<WZ8OUf@< z%QoB*es_}L$-R_@C--zFuu3eDZD73geMvf}VooyCHtnC2byVukeE(^?U*0{?!NI|y z!S~Ml@0NY}a-G?B2@ZcG^)35cAD8t$mSxBaXG&vxa$2mC>F)g<TMnFQsL`oxjnVpg zlS%6nlVn%NUg3r%o8+FfYUkE&IdCaqodoOieVi4BbM&{$Mx_g%nfXiQLHU6>;`3Qz zc%SWh7?BvX`<4j9EDaaI7b|8iK2*5DH|BxoO1=e7f?GCi>iyaI{?49rN4D(hN-upP z5yiOY(5BG1N_~gq*4EWRhddafAF5RD`O7aR5Vk^9)#ce<hP)^)S5vF+cbNo_S4A$n zyW<AGbJjvz_4Vr}?J^NO`1k9(iA(}*H7)ivM^B4Ses_v@$^)&#I`xP0zlE&|{Bx0i zVu*=(YQOEo@+ptpgUw}P{62Gua|v2UmLwI%<_T~9Q4%DcH8C>FPtD`SwwFO$F4;zf za!ItlJHd9WgT>aR!|tI*%$ny{T<X?pNhGc*IJPg^%j{dSsr`Z5PjppxpJ-P(V%Kyl z%KuJ>-*Um_x@*k7Zh2`jZ@v2qalKuB{EIjb9-nmcz~rtj;iR`d4%yAmyRMZ8RAw_t zISFm^Fk-8G%@nm&WT$9qO5rc}^ni4gx(+4~$a(1Bz{t>Sf1Kq=%CaL23=9mOu6{1- HoD!M<&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!ia0y~yU@!n-4mJh`hH$2z?F<YIk|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+7*2S)IEGZ*dNbo8=OF_DH{rt0vfed`*E_6Bm+L)X zuxeml(*C5KCE4HW!=m>G11+3>?0d39xs;EAf#E^@$5f@ICa2O3R(*fAcfXx_pT5{! zl|_yp#XE~<+LQ!o@_#J)^<9oP<mmT=2Wu-{vzZ-@Hd`Q+f3v}>W^M1ZGn;Piaqm4d z?T2UfwXXLod;hIt^yNGn!*u7s_Pm6X7bi_v+}pS}*5l?<Ce@I{Ny1#cr9Ha5JZ<t8 uJVrbT3(A?*>Q|q55F^9Dz`&5RiOYat-3}d%9V|(XAOTNTKbLh*2~7a!e{>K4 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 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIk|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+7=C%WIEGZ*dNbXSugO8cH9R@FS9h&UgV(u)x2_iL z;v0_|Cmdy5vbA;AHN}H1X~$xnnD@;0nU+#N?eEEVd)5?lEOgC&p6zqlWZJ_OKHEb> zw>IwcX!H13`snwMH?IW*zNwXlJ)0Ngx<G&OF0Fl0uikB5`S()403*kSuMCQ@C$h57 zvcwyg%)U^s=)u#OxtK+PL1i09v{Xy2_Wf&B8Kx@l7)7-&FP-q&^oO3&oGr>K`>H;C z-Qc}N`Ac;EIcovw7TNhf&wS|Jds1Ggnsq_1Py>Us(#OM9D||joW$U%(*ls1nE?~WV y-V~=BP2N5XOackBRp!mU!J+u%PIv<&!y>oPXLGH;N-!`mFnGH9xvX<aXaWG)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 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIk|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+7~XigIEGZ*dNchY=OF`uR_TxHnO`tOF37%OTEeh= zWA+WxO%2R57-baZO={xUsTMTh#(PH(#eNljz3&&7IdX*RPR{00jF@TGnVR3TQ}kDv zQLga5-9Oe@evcAwu|1g~oLwuUy3g;J;=^L2KFjG*SL2*m6b@Wso>HQ?cI{978oRRD zmo^Kiv>n+J$RxlZl-(jLa%flod%I-&FXk$BOsCYQu`51T{q>D2aqf?pFI%}j{Mm7T zPW}Nc_I=mO%pD(HyzMu^LYpCX3Iof7_GjDeO;*ej($d(vnaxPEcb>Zs1Cu~PqsqM5 iH#ii(Tykz;WH`D#nftC+h%5sG1B0ilpUXO@geCw91AprP 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}k|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+7>hhz978H@y$N&lJ8U4ZMthyj0-FW$Czww#-@132 z`4IC1ziRb6li43wKjqtdng0pn2L^kEGhWe}Mze2RDXTu|vD)Kxgmq+pxzWrXiH8oi zx0!dCKKdnebb1H>5%EWguDqrJbGX*6{jxadm9ZtGi2etS7S-m6#+FXk1g*K1{)J30 zA6TZbFLQc#ZKJw!;4+m5%{Hoydz1Z}HIfB){95d_bl=5C%v*0o{c^k#aewJGhKI2y z?jF~>=iR_<8n(;Bu%pc-WBz9*cVl~L#*)U81#7>kZByT|F7fOm>n5uYC1y-EMY+PK zF1DU+Xg?!3_5FsRed{!8EN5Q2_KkJV?^AP?WNsYrxuEhSdZXyF#H*re!f&~zrk#}j zR2jf7GuPrA?<Mcn8DDd*+nhLal0`<PCZMT-&q&#>&-!)Qj{_cd#gn9)Tn?*zvER0L z!g-d=1<yT<<SySlkS%rebb?@2MzW%S;=`+fd5!P$Yo4#q(%)Kpq(iTcRf6GEQ=iH& T$5I0Z1_lOCS3j3^P6<r_-SNkt 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!ia0y~yU{C;I4mJh`hT^KKFANL}k|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+7*=|^IEGZ*N=lMQIAHRsA&|YtDq(@_fu=J*|NpO- zl6~{%%!v~_WL7gbG+g8R!E@v#vnXrA>BfEgO$GQ4WLfT&X}DaJlgYp~kNIPokj}yB zWqA)b$;@Y-$7p(1=~|gr5x*Y$3P#?!p5KcYI6p9L{ODlyK*xaVlBS`ARMWAPc7_WK zUd|2E7nv{|De+`py!GLOReg;KV!UrE&Kb-&m?0%mdSC@J+Z{#*MmC17-zvA;-YlBW Qz`(%Z>FVdQ&MBb@08)2i%K!iX 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}k|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+82);?IEGZ*dJ}5McgTQ8r-SucNy}E71;Vw?kv~1| zU%WoWd`qyrLzu)#E^YCX9tn3m6qamzFnNv3PPdIY@%mjNw#k=Vmt^ibuqoyE^=-NR z4|u+{74pqt-hQa=+z#O#-Cxe>Oqf%@Cm~%dP|3*U+z#7CPHzM_AA9Zk-IRG>_X3NP z@q-oX`z<b43GCZH|EkmeyBet(8Mo$ZF<6>D_%mgFCF_C60_iu&$F9aLdcW-eN6_b` zxi3D(>`2yp>5|bOEXrfl*uUpNex1wQw3b&ns>V*GS_Q2sZgGpOTC&_88!Z+%QDAhi zU{?M%g_ej3vqDAx%;9lf!K%p@p4BCg$Hc=htv6uN$0^R+85kHCJYD@<);T3K0RSP` Bkr4m@ 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}k|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+7(RKrIEGZ*dJ}$-x7mP4C3HUz19M5^8prDmj8?pn z%-2pZ@i?$0FjP&v)Bn05Ds)k1?n$PnB1t#P=LCsJvA26NzTP#hBId@Yq@I}#S1Z;_ zh&7x&@MzwoMBxptR?qhY#{3C5f6Zo-v)PGhiG82iw(z{pcpp5cPp(mH!_h_u<EPpD zdKQiHhHi=X6ul*{9Vye>$~Z%G#=FMKgmA}2$x~jeR$jrf^5`|bk{v3}{;tu9_t$9s zIK_1DQ`7#Rf~sdZ?q;frF0kf{(4QGNWyPd`vl{xwx44YvxEaiOI9XYvtml-P+XAg0 pg2uNL6F(&_D&PC&k=_A@jaNeqI+8ei7#J8BJYD@<);T3K0RWQWhZO(- 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 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFzxbmaSW-r^(Ja};UNcssS?XY8n_oQav7Z4So|jD zNt?{XXx0v<fV|1kdJSwb4Vn(D5AM#qdM1+jJNvu7YGZRQfl1#o_rIT_A_xWMU005| z^0gn9;0unZj&Pl|tXH4qj-=GR_QNvQmV6F=$IWQV{J6b9qhG>av7f`7<-`HiHUBz; z4Orq7Me3SAGZ_5i<a;mkSol}2WDLiIkDJ<hAN<joA+TV^{fs-0S)CrLv+!Ry`-U}? zyPk8w67ws2jyHHMy)Ks!b#0DruWjr0j4ss)1@b=1OB(-8Ty|2LDJS*g-t{bRbnayH zKK*d{x!nWr3x7YJh~9ZiY_(7G{Vu~ji?{FdmTBu^Phk5$!D4G$=+3+y*GxE69{jL= zH0M&o!~Rb90Nv*7z?GjpxdYT1?nFJgb$Nm<!^TMx&F%+<9G<Qbnlr8S4P&le21}d) z?=*%<dtDb!nAjn-gk6Et^lHt$50iK6v}t^2bpO?4XX<XFT<&m9$AUk>DN!*{^pgT- zLKSmh=!_YY8oEqYo!RC(^~$wYm0KxC#5hiyuA6JPbnC*Go633_&M<4t=FgdQK=RPG z&eq<D>`4-~Ct@zhZ+RG?71ACoZD=to-^Y7xsP6<bhcqFTgcVa3wJ)DGOFWEONpW`- zM~U2?yOv^mpSHP7KBcgJ15?kYPbFeZBAyxY|K?Y@<nIsJv$m+oMw(GdWsA##Ss{n( z3)!Q>qbK-HNLOu8WZe93>2s!)S;gOa1=S4WqLioHI=kz{Ie}eDXPK|Ea;})8*r2#* zg3e^KJNwJ}7}Clr#Ck5N9hjg!X9bfGXVIJw_S=G3tFHMx?Vhq)=)f6)8z*m0xFEL5 z`O;O+7d*E4Y+LJ>ZvOd-hjA{SL2yRn*52|-4Sntkg8Xx28aK|HUDNtZhtYk~(+MBB n{#;nJO|{Df3ht=<W07Du>Bz&HE4>Dk_8B}~{an^LB{Ts5yVOwi 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!ia0y~yU~m9o4mJh`hE<t`_ZS!$BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFkJO?aSW-r_2$||-X;g0hQxC}UP*0d$bMj=_kfA# zfs9p~-T^7Tf@$R!w5u|6{_8*F^n9Z)x{Hqi1Qcd$DO)t9sNCea?$VMttBu?rl-Kjg zD;~K0a4-80i#^X7LJwE-2H5U7&?Ue*Bq_nHTmJxs5D`dr;|UT@or{X4$x`s$S1 z5a?we<&*#QndC#?2@LyV8W-PLRr`d2SzDlnHOh`HTlUF`FveN7Y@+?Af7-t|#3gVb zjdjzVrfc^tquDGrGO;KyFmgCBFbRNM#K6E%|4Q`$!!>Kwj^mwY9)ZL>UHx3vIVCg! E0K*=1cmMzZ 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!ia0y~yU~m9o4mJh`hE<t`_ZS!$BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFud?|aSW-r_2$+=-X;eDw?xypEo^%)G3>q3Q5w+T zdXXV~t>e0Noa|o??O<8-X>W?N$G7v7rstHgMXY6Dh|qaGCm?d#?-EOvW%pj~+V{Qa zc*#xPlv`7F_Qh(SG7G-*x$#_MWvG<z`+rm13@2pnx^rWzQ_i$~tQ-mr3``sf3=AdB z@}<qLTO2)Qqb{G0Wtyp$x@u##B}~4dVI|i>&-hU0Z3lAB{7UsOej=d)*4V(nu>UU4 z(@R&sI`8?T_I>Ty0KJLJp8YkqT+YDABH#cbK8UvlEIE)V`htPs%pvCnMus;lohrFM TFIHk;U|{fc^>bP0l+XkK@D6`* 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!ia0y~yU~m9o4mJh`hE<t`_ZS!$BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFkJO?aSW-r_2$+^&SnD<x5VIIucTrRER<Prxny}7 z<Mo0DiG%FFQ?6)jsbg>A__?!4K_z^x76XHx_YEO0&8t5@Y0S9QD)1{Z@5~kMnRe;B z_HOmsnJ;2)cVTrx+-&zbckMrCh#3{0db>9C$lF)m4Gc^i3JnZQ3=ZZyR!Qf0Nl&@6 z@Mz?_*a@AMm*1^T6$i<I74%tg$o^U-wSmR&@fCgNS&Fw67+C}y7#LX?e!NY~(7wF0 zuCxFClYhPkUZtJT1BrtrEjXDN8uE=f3>YesJek{nyYFIPU|{fc^>bP0l+XkK%FA*T 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 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RWBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztuqb)DIEGZ*dJ|(^q+}>?HDLBHhHs2Fm^bXSWVk0| z-G1lsot(Tm&V1*}Eg8;D=PqFQ%}~sczkT(}MIjZALEeXZ?yU~;Z8*O8<??^4Oph_3 zfvz7verRO=nQFMWka49%u!=y<bUk6I*w@QT14a0E3Sa2d`J)&+jlJdki_7oLFEm&* zrGE~(Bq8(ja@R50%tO)~7li+b#?IRp@wI(}DpOu!)0a1Y4>|tm(YtHT#AtPB{>2ZS zd2S{3{Aw%Y9=`wJ_juZwKvv#@?LQYDN{_iz(ZX4Dd~(x=&Ah(WjjQXQyeRNLxHm(T z!$R?zyxWY+tsrJo<D!=*%}jU|7syxUMYb%vm#7hLDtu=B*M*tS&pf~W>%x}H4VK?- z%ZRoL1gKtP5lBd!oYD9G3A35P0y(B_CdWQ7wtti=jLW&VY>)qiZ)c_QnOqERa}-Bi z{NefkKWpcW!VIoX-&-?S>`$&#k=-J%@O8ocMpe$ZkKRJRuBCM3JHEN-r79HBu+DX- z7t8-ipWA9Suyu&Vbc$KHnp@@{S)F!hQ&V`~_R`{2KbLE`p0Rzmv+c)Jjt^IuW+*I< z?wKvM{nrK6C}B~~2{-PV>Ps{-#2PTZ?~5{EVcZpEP<pj#j<V8MUP+}y-|1Tq>&|ht zZ(@kGv9@{=w{DpR7o*U$UC-E-ewoq4pel4jad+M=pJHokv9CQdEUvc}uAY__s@`== zRB_phn;*^A3Hv%U$Z^)&oDyk{@$k4Req`stZ!(?_z8$yvJVEJdGn3!NKSH`)59e3d z?Vh)ItIg^xRmM-3Y9C*(+V^O0($k$AKD>PvueaDI=$oQyuJ06`o9XWzuF7~`Dqrz= z*4D&nn@sIivc2JKXtiA7EG#3%c_ZES$i2<$mRg3l?D%@6B{gAF*t{3*cIR!5-`l*x zmHAuPqccC|8YV}_?%KA=Lt(?0iZ~PY*y!qAd(PYl7QPXtZ_8D&^m)nePkZ9BO&mOh zC8Q(g=1&aU-)m``eXoKy;1Y}S#WRmsaxbjX?>)jFyVZ$V#5D1_^s}-@&u-e3@$4y> z=REnyW<`gIEwX|+d2u&QK0d$XGspPsLB3yWI08-x@9TQ5@4LtN?EJb84vFn;42q4L zFCN>nR)Eo7>SfFS&rUL#HZ!)gGfrMy{A_iWtc2pyrtgkZ7jdpW@=&><R3U?VYsREq zUY5TNH#wIc%{}pQp5J5+fypK5m*xiAwPn7zxXLZFVJWY3=cHGc*rxg}IwrJX`onv( zf6PB;IVHNsbk*WswF94cmwJBo<-EH7@3tle?Mi7k6Yr^OYPN3J5z6wWb&a*sxu_p& zRStaOS6+HYvFk&$Z-eU*g##w8cjx5WGKxu>JGs3-68eA9&fimQ8K;HCa0}jF`=WF5 mo~=iIPGv;Pzak&}8yFe5RxEhJ`E#!zNYc~Q&t;ucLK6U{unHsq 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!ia0y~yU`POA4mJh`hDS5XEf^RWBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFnV~pIEGZ*dUN~X+JgxaZHc1wyayP>Hn3$IOy<-{ zU|`<haNXd*^S4Zwjvc>kc73kN^YbS=ZNzi?H^gXcUCPP8Ai%)D#Nfcdz`?-4$e_T$ zz{1b~7fidp>b(BcpuUgE$?F`q`d+@Xn!%;r;+xr9`#PEM<qP(FJpb`cJ)^|W9}JU@ zvrn+GYk2aJQKg?>p|XbI<YQ(JIeCXqU@3z&uO2f?T+l!EJ}UHw^!bW{=Y~BYUX?z) z*R&Zx)-G6*b%*us@`~>dMHLtrLY_)p_}hK&TuOhe%<GkmTaqiaAKiYG_Gr_O&+HfG zG{rD8a5U^*kbmpg(bp!EZMOxpyx3=6@F}K@iwV{F^I!i?yQAB;eCHDp6;ywrdA8x= dcd-Npzuy*$K0nu1F)%PNc)I$ztaD0e0ssnMnMwcv 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!ia0y~yU`POA4mJh`hDS5XEf^RWBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFxGgwIEGZ*dUJcD?_mdthCuefi%y<%c^+`3HCP%k z6jv}j^GNg1;unb0SlBwvS~HdB()rkeN8gudOj4bnQ{Q;QGWIe90|SH1*)?Apa&N~i z-G2MPy7=1r`^99|dp_RFBlFm%qAEZ0%=t;zUvF}{QnPU$)9<I<S4Cy?qxo|B`>wz3 z-#ml+Kg+-A3``si3``0Q3>*p!OdJOUul_K6r@Z%C<KKJS{of~ll|RSJV8L$stY!V> z+qF;hR=ofHw(;YqKW~+abTao`Jz!|Z=AS?Lm`;^?$YV1T_6m+S)1OCeXWypZ^f+~O z<J*fL%a-Q5+ICb5i7_y;I502@I54mXFfcAl{-T}2aA5id{fAm^`+Z97>!oKo`8ZBz zmY?+e!Ol|W?0#GJ3IS)hdXUy1XEk+#?}l2qoep74c$JoHe_&hg`&l<OUAIxa>HE=a z%a+++X3c*c-@tB&Y!iz^!%K@+`Nw9yb1M@W7#JE>{uE1KDEaK88X`AsFDL{(UHx3v IIVCg!03k@b8~^|S 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!ia0y~yU`POA4mJh`hDS5XEf^RWBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFy?x?IEGZ*dUNNX?_mRphCu1U)CMC4?iRxYUMu0q z#XXMVFBl9Q*g3x0zI?boc+xXl%~dTT+RubdRz6+E!oa{#V7&8d!(juPsne$)SowU; z=ammDR`!(7*>OzIVsEhI=RIE-N{i+<2KT2H{cd}Fm0`W`^&hfx?$v2!U1_do`tQxa z$l}1jDB!@rBEZ1N@}NyFUE=e0nc5F~rag|m6mMwG@Ida&MwOp2arczUB`lvGK2cHX zX|$y+`q*prbsv>2_O3U2cK%YnbNSN_pAGA_%DL6uV?DmRWVfX3`ncrF401<oIJp}b zm=qcqI20I|I2sskZ~P%^#PGoP#_SI|&mtzR+5hK)+0~+++~BpR+ZU?3+zt_hItA*g zh)Je7!M19*Ll_&beY&JyAkp?+<o35&$M$uWb8la`_G<3>yL<n!RtN~AYP->AS|b&; ppQS*2R?OqGA`A=+4BFq-4=|{12tS}X?aX?RfTydU%Q~loCIEPOv#kIC 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