From dfbc916266db198fb716b58c765256d52b0e7caf Mon Sep 17 00:00:00 2001 From: YadavendraSinghYaduvanshi Date: Thu, 12 Jan 2017 18:51:29 +0530 Subject: [PATCH 1/2] Update DailyDataMenuActivity.java --- .../gsk_dailyentry/DailyDataMenuActivity.java | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index fbdb067..56d5f7d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -282,33 +282,6 @@ public class DailyDataMenuActivity extends AppCompatActivity { } } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } - - private static boolean updateResources(Context context, String language) { String lang ; From b8765256a62057088a54bb337cd52ecadf380af8 Mon Sep 17 00:00:00 2001 From: YadavendraSinghYaduvanshi Date: Thu, 12 Jan 2017 18:54:13 +0530 Subject: [PATCH 2/2] Update string.xml --- GSKMTOrange/src/main/res/values-tr/string.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index ca0490a..d8a2a35 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -55,18 +55,8 @@ Bir sebep seçiniz Günlük Veri Menüsü - Bulunurluk - Raf Payı - Kalıcı Teşhir - Ek Teşhir - Promosyon - Rakip Bilgisi - Competition Promo kapalı - Promosyon - - Kategoriler Kategori Performansı @@ -121,4 +111,4 @@ Planogram - \ No newline at end of file +