AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #102 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ac_settings

Browse Source 
newcode
This commit is contained in:
ashishchauhan009
2017-01-25 19:14:05 +05:30
committed by GitHub
parent 53c628b36d d71e92dc02
commit c0d24675e5
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java
+4 -1
View File
@@ -34,11 +34,13 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
private SharedPreferences.Editor editor = null; private SharedPreferences.Editor editor = null;
Toolbar toolbar;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings); setContentView(R.layout.activity_settings);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -131,6 +133,7 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(R.string.title_activity_settings);
} }
private static boolean updateResources(Context context, String language) { private static boolean updateResources(Context context, String language) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+5 -5
View File
@@ -69,12 +69,15 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
String lat, lon; String lat, lon;
GoogleApiClient mGoogleApiClient; GoogleApiClient mGoogleApiClient;
ArrayList<CoverageBean> coverage_list; ArrayList<CoverageBean> coverage_list;
Toolbar toolbar;
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_storeimage); setContentView(R.layout.activity_storeimage);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -84,10 +87,6 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
btn_save = (Button) findViewById(R.id.btn_save_selfie); btn_save = (Button) findViewById(R.id.btn_save_selfie);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null); store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null); visit_date = preferences.getString(CommonString.KEY_DATE, null);
@@ -353,6 +352,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(R.string.title_activity_store_image);
} }
protected void onStart() { protected void onStart() {