From 4a280c8706c324e123c088856683dfc33d2351f5 Mon Sep 17 00:00:00 2001
From: tbarthel-fr <thomas.barthelemy.utc@gmail.com>
Date: Sat, 6 May 2017 15:17:59 +0200
Subject: [PATCH] [MainActivity] remove title for kids flavor.

---
 CameraColorPicker/app/src/kids/res/values/strings.xml           | 1 +
 .../apps/cameracolorpicker/activities/MainActivity.java         | 2 +-
 CameraColorPicker/app/src/main/res/values/strings.xml           | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CameraColorPicker/app/src/kids/res/values/strings.xml b/CameraColorPicker/app/src/kids/res/values/strings.xml
index 3e71cb2..65e0d63 100644
--- a/CameraColorPicker/app/src/kids/res/values/strings.xml
+++ b/CameraColorPicker/app/src/kids/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Kids Camera Color Picker</string>
+    <string name="main_activity_title"></string>
     <string name="activity_main_error_not_enough_colors"></string>
 
     <!-- Palette creation activity -->
diff --git a/CameraColorPicker/app/src/main/java/fr/tvbarthel/apps/cameracolorpicker/activities/MainActivity.java b/CameraColorPicker/app/src/main/java/fr/tvbarthel/apps/cameracolorpicker/activities/MainActivity.java
index 316d10d..70e5ab8 100644
--- a/CameraColorPicker/app/src/main/java/fr/tvbarthel/apps/cameracolorpicker/activities/MainActivity.java
+++ b/CameraColorPicker/app/src/main/java/fr/tvbarthel/apps/cameracolorpicker/activities/MainActivity.java
@@ -111,7 +111,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         mToolbar = (Toolbar) findViewById(R.id.activity_main_toolbar);
-        mToolbar.setTitle(R.string.app_name);
+        mToolbar.setTitle(R.string.main_activity_title);
         setSupportActionBar(mToolbar);
 
         mCurrentPageId = PAGE_ID_COLOR_ITEM_LIST;
diff --git a/CameraColorPicker/app/src/main/res/values/strings.xml b/CameraColorPicker/app/src/main/res/values/strings.xml
index 7acc24c..f9c4c04 100644
--- a/CameraColorPicker/app/src/main/res/values/strings.xml
+++ b/CameraColorPicker/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
 
     <!-- General -->
     <string name="app_name">Camera Color Picker</string>
+    <string name="main_activity_title">@string/app_name</string>
     <string name="contact_us_email" translatable="false">tvbarthel@gmail.com</string>
     <string name="contact_us_uri" translatable="false">mailto:%1$s?subject=%2$s</string>
     <string name="contact_us_default_subject">[Camera Color Picker] Suggestion</string>