summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/dashboard
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-06-09 12:52:24 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2014-06-09 13:01:39 -0700
commita9e77993d1f82a230ff381134d4a22eff4a907cd (patch)
treef60d4c0ccd21ddd8ed63e24e049014a23f5d7a98 /src/com/android/settings/dashboard
parentd407f2a05c8f8a81d5ea7bf9ad34bd491dc2d742 (diff)
downloadpackages_apps_Settings-a9e77993d1f82a230ff381134d4a22eff4a907cd.zip
packages_apps_Settings-a9e77993d1f82a230ff381134d4a22eff4a907cd.tar.gz
packages_apps_Settings-a9e77993d1f82a230ff381134d4a22eff4a907cd.tar.bz2
Fix bug #14499324 Label of the "Language & input " page doesn't get updated
...as per the newly selected language - use also title resource id when possible Change-Id: Ibeb95d605cd79910c18f4529b749645c9ed0fc17
Diffstat (limited to 'src/com/android/settings/dashboard')
-rw-r--r--src/com/android/settings/dashboard/DashboardTileView.java2
-rw-r--r--src/com/android/settings/dashboard/SearchResultsSummary.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/dashboard/DashboardTileView.java b/src/com/android/settings/dashboard/DashboardTileView.java
index a114f70..099459c 100644
--- a/src/com/android/settings/dashboard/DashboardTileView.java
+++ b/src/com/android/settings/dashboard/DashboardTileView.java
@@ -85,7 +85,7 @@ public class DashboardTileView extends FrameLayout implements View.OnClickListen
public void onClick(View v) {
if (mTile.fragment != null) {
Utils.startWithFragment(getContext(), mTile.fragment, mTile.fragmentArguments, null, 0,
- mTile.getTitle(getResources()));
+ mTile.titleRes, mTile.getTitle(getResources()));
} else if (mTile.intent != null) {
getContext().startActivity(mTile.intent);
}
diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index 910d661..c31a893 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java
@@ -181,7 +181,7 @@ public class SearchResultsSummary extends Fragment {
Bundle args = new Bundle();
args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
- Utils.startWithFragment(sa, className, args, null, 0, screenTitle);
+ Utils.startWithFragment(sa, className, args, null, 0, -1, screenTitle);
} else {
final Intent intent = new Intent(action);