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

Settings Visuals

Browse Source 
Update the layouts to be more final, and support tablets better.

Move about to always be last.

Always see everything.

Change-Id: I4b804c9bfcd4d3b7f978a2617d5c2c2b1cdfa6e4
This commit is contained in:
Jason Monk
2016-02-04 14:35:49 -05:00
parent 0eb0d9bfe3
commit 322cfe8be0
10 changed files with 8 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -946,7 +946,7 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter> </intent-filter>
<intent-filter android:priority="1"> <intent-filter android:priority="-1">
<action android:name="com.android.settings.action.SETTINGS" /> <action android:name="com.android.settings.action.SETTINGS" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"

6
res/layout/condition_card.xml
View File

@@ -19,7 +19,7 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingStart="16dp"
android:background="?android:attr/colorAccent" android:background="?android:attr/colorAccent"
android:elevation="3dp" android:elevation="3dp"
android:clickable="true"> android:clickable="true">
@@ -49,9 +49,9 @@
<ImageView <ImageView
android:id="@+id/expand_indicator" android:id="@+id/expand_indicator"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:padding="16dp"
android:tint="?android:attr/textColorPrimaryInverse" android:tint="?android:attr/textColorPrimaryInverse"
android:padding="?android:attr/listPreferredItemPaddingEnd"
android:clickable="true" android:clickable="true"
android:background="?android:attr/selectableItemBackground" /> android:background="?android:attr/selectableItemBackground" />

2
res/layout/dashboard_category.xml
View File

@@ -18,8 +18,6 @@
android:id="@+id/category" android:id="@+id/category"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_category_height" android:layout_height="@dimen/dashboard_category_height"
android:paddingStart="@dimen/dashboard_category_padding_start"
android:paddingEnd="@dimen/dashboard_category_padding_end"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dip" android:paddingBottom="8dip"
android:background="@color/card_background" > android:background="@color/card_background" >

2
res/layout/settings_main_prefs.xml
View File

@@ -39,6 +39,8 @@
android:id="@+id/main_content" android:id="@+id/main_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingStart="@dimen/dashboard_padding_start"
android:paddingEnd="@dimen/dashboard_padding_end"
/> />
</LinearLayout> </LinearLayout>

2
res/layout/suggestion_header.xml
View File

@@ -27,7 +27,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginStart="@dimen/suggestion_arrow_margin" android:paddingStart="16dp"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.TileTitle" android:textAppearance="@style/TextAppearance.TileTitle"
android:textColor="?android:attr/colorAccent" android:textColor="?android:attr/colorAccent"

17
res/values-land/dimens.xml
View File

@@ -28,23 +28,6 @@
<!-- ActionBar height --> <!-- ActionBar height -->
<dimen name="actionbar_size">46dip</dimen> <dimen name="actionbar_size">46dip</dimen>
<!-- Dashboard margins between each tiles within the layout -->
<dimen name="dashboard_cell_gap_x">8dp</dimen>
<dimen name="dashboard_cell_gap_y">0dp</dimen>
<!-- Dashboard category padding start / end -->
<dimen name="dashboard_category_padding_start">4dp</dimen>
<dimen name="dashboard_category_padding_end">4dp</dimen>
<!-- Dashboard category title margin start -->
<dimen name="dashboard_category_title_margin_start">12dp</dimen>
<!-- Dashboard tile minimum height -->
<dimen name="dashboard_tile_minimum_height">64dp</dimen>
<!-- Dashboard tile image margin start / end -->
<dimen name="dashboard_tile_image_margin_start">12dp</dimen>
<!-- Fingerprint --> <!-- Fingerprint -->
<item name="fingerprint_illustration_aspect_ratio" format="float" type="dimen">0.0</item> <item name="fingerprint_illustration_aspect_ratio" format="float" type="dimen">0.0</item>
<dimen name="fingerprint_decor_padding_top">24dp</dimen> <dimen name="fingerprint_decor_padding_top">24dp</dimen>

15
res/values-sw600dp/dimens.xml
View File

@@ -39,21 +39,6 @@
<dimen name="actionbar_contentInsetStart">24dp</dimen> <dimen name="actionbar_contentInsetStart">24dp</dimen>
<dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen> <dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>
<!-- Dashboard margins between each tiles within the layout -->
<dimen name="dashboard_cell_gap_x">16dp</dimen>
<dimen name="dashboard_cell_gap_y">0dp</dimen>
<!-- Dashboard category padding start / end -->
<dimen name="dashboard_category_padding_start">16dp</dimen>
<dimen name="dashboard_category_padding_end">24dp</dimen>
<!-- Dashboard category title margin start -->
<dimen name="dashboard_category_title_margin_start">8dp</dimen>
<!-- Dashboard tile image padding start / end -->
<dimen name="dashboard_tile_image_margin_start">8dp</dimen>
<dimen name="dashboard_tile_image_margin_end">32dp</dimen>
<!-- CryptKeeper top margin for password/pin screen --> <!-- CryptKeeper top margin for password/pin screen -->
<dimen name="crypt_keeper_password_top_margin">256dip</dimen> <dimen name="crypt_keeper_password_top_margin">256dip</dimen>

4
res/values/dimens.xml
View File

@@ -86,10 +86,6 @@
<dimen name="actionbar_contentInsetStart">16dp</dimen> <dimen name="actionbar_contentInsetStart">16dp</dimen>
<dimen name="actionbar_subsettings_contentInsetStart">72dp</dimen> <dimen name="actionbar_subsettings_contentInsetStart">72dp</dimen>
<!-- Dashboard margins between each tiles within the layout -->
<dimen name="dashboard_cell_gap_x">0dp</dimen>
<dimen name="dashboard_cell_gap_y">0dp</dimen>
<!-- Dashboard padding in its container --> <!-- Dashboard padding in its container -->
<dimen name="dashboard_padding_start">0dp</dimen> <dimen name="dashboard_padding_start">0dp</dimen>
<dimen name="dashboard_padding_end">0dp</dimen> <dimen name="dashboard_padding_end">0dp</dimen>

3
src/com/android/settings/SettingsActivity.java
View File

@@ -783,9 +783,6 @@ public class SettingsActivity extends SettingsDrawerActivity
onQueryTextSubmit(mSearchQuery); onQueryTextSubmit(mSearchQuery);
} }
updateTilesList(); updateTilesList();
if (mIsShowingDashboard) {
showMenuIcon();
}
} }
@Override @Override

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

@@ -79,6 +79,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
mSuggestionsChecks = new SuggestionsChecks(mContext); mSuggestionsChecks = new SuggestionsChecks(mContext);
setHasStableIds(true); setHasStableIds(true);
setShowingAll(true);
} }
public void setSuggestions(SuggestionParser suggestionParser) { public void setSuggestions(SuggestionParser suggestionParser) {
@@ -167,7 +168,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
tile.intent.getComponent().getClassName()), NS_ITEMS); tile.intent.getComponent().getClassName()), NS_ITEMS);
} }
} }
countItem(null, R.layout.see_all, true, NS_ITEMS);
notifyDataSetChanged(); notifyDataSetChanged();
} }