Merge pull request #37 from tvbarthel/tb/activity-title

[MainActivity] remove title for kids flavor.
tvbarthel · May 8, 2017 · 9a02c4b · 9a02c4b
2 parents 9a086ab + 4a280c8
commit 9a02c4b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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/...Picker/app/src/main/java/fr/tvbarthel/apps/cameracolorpicker/activities/MainActivity.java b/...Picker/app/src/main/java/fr/tvbarthel/apps/cameracolorpicker/activities/MainActivity.java
@@ -119,7 +119,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
@@ -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">[email protected]</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>