diff options
author | Jack Yoo <jyoo@codeaurora.org> | 2016-03-09 12:44:54 -0800 |
---|---|---|
committer | Camera Software Integration <camswint@localhost> | 2016-03-18 15:19:32 +0530 |
commit | 901130273dbfc753ef883941a4e93b50056177e4 (patch) | |
tree | 9c27c4756a68ac61c83d0f6c41059af486c83ea9 /src/com/android/camera/ui | |
parent | 9750c10d6da6afb11a560b217b81369516c34980 (diff) | |
download | android_packages_apps_Snap-901130273dbfc753ef883941a4e93b50056177e4.tar.gz android_packages_apps_Snap-901130273dbfc753ef883941a4e93b50056177e4.tar.bz2 android_packages_apps_Snap-901130273dbfc753ef883941a4e93b50056177e4.zip |
SnapdragonCamera: Move help menu string to ressource
Move string and color to resource so that it can be
translated and also configurable.
Change-Id: I24d544e2a63a27e8215070ef8ca7bafb72521f47
CRs-Fixed: 982114
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r-- | src/com/android/camera/ui/MenuHelp.java | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/com/android/camera/ui/MenuHelp.java b/src/com/android/camera/ui/MenuHelp.java index d753a2680..f7eef72e8 100644 --- a/src/com/android/camera/ui/MenuHelp.java +++ b/src/com/android/camera/ui/MenuHelp.java @@ -276,7 +276,7 @@ public class MenuHelp extends RotatableLayout { linearLayout.setPadding(40, 20, 40, 20); linearLayout.setBackgroundColor(Color.WHITE); TextView text1 = new TextView(mContext); - text1.setText("OK"); + text1.setText(getResources().getString(R.string.help_menu_ok)); text1.setTextColor(Color.BLACK); text1.setTypeface(mTypeface); linearLayout.addView(text1); @@ -287,19 +287,19 @@ public class MenuHelp extends RotatableLayout { mHelp0_0.addView(tableLayout); LinearLayout linearLayout = new LinearLayout(mContext); TextView text1 = new TextView(mContext); - text1.setTextColor(Color.WHITE); - text1.setText("Select a "); + text1.setTextColor(getResources().getColor(R.color.help_menu_scene_mode_1)); + text1.setText(getResources().getString(R.string.help_menu_scene_mode_1)+" "); text1.setTypeface(mTypeface); linearLayout.addView(text1); TextView text2 = new TextView(mContext); - text2.setText("Scene Mode"); + text2.setText(getResources().getString(R.string.help_menu_scene_mode_2)); text2.setTypeface(mTypeface); linearLayout.addView(text2); - text2.setTextColor(Color.GREEN); + text2.setTextColor(getResources().getColor(R.color.help_menu_scene_mode_2)); tableLayout.addView(linearLayout); TextView text3 = new TextView(mContext); - text3.setText("for better pictures"); - text3.setTextColor(Color.WHITE); + text3.setText(getResources().getString(R.string.help_menu_scene_mode_3)); + text3.setTextColor(getResources().getColor(R.color.help_menu_scene_mode_3)); text3.setTypeface(mTypeface); tableLayout.addView(text3); } @@ -309,24 +309,24 @@ public class MenuHelp extends RotatableLayout { mHelp1_0.addView(tableLayout); LinearLayout linearLayout = new LinearLayout(mContext); TextView text1 = new TextView(mContext); - text1.setText("Apply color "); - text1.setTextColor(Color.WHITE); + text1.setText(getResources().getString(R.string.help_menu_color_filter_1)+" "); + text1.setTextColor(getResources().getColor(R.color.help_menu_color_filter_1)); text1.setTypeface(mTypeface); linearLayout.addView(text1); TextView text2 = new TextView(mContext); - text2.setText("filters"); - text2.setTextColor(Color.GREEN); + text2.setText(getResources().getString(R.string.help_menu_color_filter_2)+" "); + text2.setTextColor(getResources().getColor(R.color.help_menu_color_filter_2)); text2.setTypeface(mTypeface); linearLayout.addView(text2); TextView text3 = new TextView(mContext); - text3.setText(" to "); - text3.setTextColor(Color.WHITE); + text3.setText(getResources().getString(R.string.help_menu_color_filter_3)); + text3.setTextColor(getResources().getColor(R.color.help_menu_color_filter_3)); text3.setTypeface(mTypeface); linearLayout.addView(text3); tableLayout.addView(linearLayout); TextView text4 = new TextView(mContext); - text4.setText("improve pictures"); - text4.setTextColor(Color.WHITE); + text4.setText(getResources().getString(R.string.help_menu_color_filter_4)); + text4.setTextColor(getResources().getColor(R.color.help_menu_color_filter_4)); text4.setTypeface(mTypeface); tableLayout.addView(text4); } @@ -336,18 +336,18 @@ public class MenuHelp extends RotatableLayout { mHelp3_0.addView(tableLayout); if(TsMakeupManager.HAS_TS_MAKEUP) { TextView text1 = new TextView(mContext); - text1.setText("Enhance portraits"); - text1.setTextColor(Color.WHITE); + text1.setText(getResources().getString(R.string.help_menu_beautify_1)); + text1.setTextColor(getResources().getColor(R.color.help_menu_beautify_1)); text1.setTypeface(mTypeface); tableLayout.addView(text1); TextView text2 = new TextView(mContext); - text2.setText("with the"); - text2.setTextColor(Color.WHITE); + text2.setText(getResources().getString(R.string.help_menu_beautify_2)); + text2.setTextColor(getResources().getColor(R.color.help_menu_beautify_2)); text2.setTypeface(mTypeface); tableLayout.addView(text2); TextView text3 = new TextView(mContext); - text3.setText("Beautify feature"); - text3.setTextColor(Color.GREEN); + text3.setText(getResources().getString(R.string.help_menu_beautify_3)); + text3.setTextColor(getResources().getColor(R.color.help_menu_beautify_3)); text3.setTypeface(mTypeface); tableLayout.addView(text3); } @@ -358,18 +358,18 @@ public class MenuHelp extends RotatableLayout { mHelp4_6.addView(tableLayout); LinearLayout linearLayout = new LinearLayout(mContext); TextView text1 = new TextView(mContext); - text1.setText("Switch"); + text1.setText(getResources().getString(R.string.help_menu_switcher_1)+" "); text1.setTextColor(Color.GREEN); text1.setTypeface(mTypeface); linearLayout.addView(text1); TextView text2 = new TextView(mContext); - text2.setText(" between "); + text2.setText(getResources().getString(R.string.help_menu_switcher_2)); text2.setTextColor(Color.WHITE); text2.setTypeface(mTypeface); linearLayout.addView(text2); tableLayout.addView(linearLayout); TextView text3 = new TextView(mContext); - text3.setText("camera, video, and panorama"); + text3.setText(getResources().getString(R.string.help_menu_switcher_3)); text3.setTextColor(Color.WHITE); text3.setTypeface(mTypeface); tableLayout.addView(text3); |