PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add content description to suggesiton footer

Browse Source 
Change-Id: I90402301f9a294326619d8e353e14c1db9962b86
Fixes: 67633955
Test: manual
This commit is contained in:
Fan Zhang
2017-10-10 12:59:08 -07:00
parent aa410eba1d
commit e84911dcf9
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/suggestion_condition_footer.xml
View File

@@ -20,10 +20,11 @@
style="@style/SuggestionConditionStyle" style="@style/SuggestionConditionStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="44dp" android:layout_height="44dp"
android:paddingTop="10dp" android:contentDescription="@string/dashboard_suggestion_condition_footer_content_description"
android:paddingEnd="10dp" android:gravity="end"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="end"> android:paddingTop="10dp"
android:paddingEnd="10dp">
<ImageView <ImageView
android:id="@+id/collapse_button" android:id="@+id/collapse_button"

3
res/values/strings.xml
View File

@@ -6483,6 +6483,9 @@
<item quantity="other">Show %d hidden items</item> <item quantity="other">Show %d hidden items</item>
</plurals> </plurals>
<!-- Content description for suggestion footer button. Double tapping will cause suggestion list to collapse [CHAR LIMIT=NONE]-->
<string name="dashboard_suggestion_condition_footer_content_description">Collapse</string>
<!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]--> <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
<string name="network_dashboard_title">Network &amp; Internet</string> <string name="network_dashboard_title">Network &amp; Internet</string>
<!-- Summary for Network and Internet settings, explaining it contains mobile network setting [CHAR LIMIT=NONE]--> <!-- Summary for Network and Internet settings, explaining it contains mobile network setting [CHAR LIMIT=NONE]-->

8
src/com/android/settings/dashboard/DashboardAdapter.java
View File

@@ -48,7 +48,6 @@ import com.android.settings.dashboard.conditional.ConditionAdapter;
import com.android.settings.dashboard.suggestions.SuggestionAdapter; import com.android.settings.dashboard.suggestions.SuggestionAdapter;
import com.android.settings.dashboard.suggestions.SuggestionControllerMixin; import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;
import com.android.settings.dashboard.suggestions.SuggestionDismissController; import com.android.settings.dashboard.suggestions.SuggestionDismissController;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.DashboardCategory;
@@ -78,7 +77,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
private final SuggestionControllerMixin mSuggestionControllerMixin; private final SuggestionControllerMixin mSuggestionControllerMixin;
private final MetricsFeatureProvider mMetricsFeatureProvider; private final MetricsFeatureProvider mMetricsFeatureProvider;
private final DashboardFeatureProvider mDashboardFeatureProvider; private final DashboardFeatureProvider mDashboardFeatureProvider;
private final SuggestionFeatureProvider mSuggestionFeatureProvider;
private final ArrayList<String> mSuggestionsShownLogged; private final ArrayList<String> mSuggestionsShownLogged;
private boolean mFirstFrameDrawn; private boolean mFirstFrameDrawn;
private RecyclerView mRecyclerView; private RecyclerView mRecyclerView;
@@ -114,7 +112,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
mSuggestionControllerMixin = suggestionControllerMixin; mSuggestionControllerMixin = suggestionControllerMixin;
mMetricsFeatureProvider = factory.getMetricsFeatureProvider(); mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
mDashboardFeatureProvider = factory.getDashboardFeatureProvider(context); mDashboardFeatureProvider = factory.getDashboardFeatureProvider(context);
mSuggestionFeatureProvider = factory.getSuggestionFeatureProvider(context);
mCache = new IconCache(context); mCache = new IconCache(context);
mSuggestionParser = suggestionParser; mSuggestionParser = suggestionParser;
mCallback = callback; mCallback = callback;
@@ -341,11 +338,12 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
void onBindSuggestionConditionHeader(final SuggestionAndConditionHeaderHolder holder, void onBindSuggestionConditionHeader(final SuggestionAndConditionHeaderHolder holder,
SuggestionConditionHeaderData data) { SuggestionConditionHeaderData data) {
final int curMode = mDashboardData.getSuggestionConditionMode(); final int curMode = mDashboardData.getSuggestionConditionMode();
final int nextMode = data.hiddenSuggestionCount > 0 && data.conditionCount > 0 final int nextMode = data.hiddenSuggestionCount > 0
&& data.conditionCount > 0
&& curMode != DashboardData.HEADER_MODE_SUGGESTION_EXPANDED && curMode != DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
? DashboardData.HEADER_MODE_SUGGESTION_EXPANDED ? DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
: DashboardData.HEADER_MODE_FULLY_EXPANDED; : DashboardData.HEADER_MODE_FULLY_EXPANDED;
final boolean moreSuggestions = data.hiddenSuggestionCount > 0;
final boolean hasConditions = data.conditionCount > 0; final boolean hasConditions = data.conditionCount > 0;
if (data.conditionCount > 0) { if (data.conditionCount > 0) {
holder.icon.setImageIcon(data.conditionIcons.get(0)); holder.icon.setImageIcon(data.conditionIcons.get(0));