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

Delete a bunch of dead code and resources.

Browse Source 
Deleted a bunch of unused colors. Also deleted the FAB
since it's never actually used, The one xml location sets the visibility
to gone and it is never changed.

Change-Id: I9424d581960ef879f6742bf8f06ac8932224c7cc
This commit is contained in:
Andrew Sapperstein
2016-05-20 18:50:14 -07:00
parent cbec5aecb5
commit 4ab0558972
9 changed files with 1 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
res/anim/fab_elevation.xml
View File

@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_pressed="true">
<set>
<objectAnimator
android:duration="@android:integer/config_shortAnimTime"
android:propertyName="translationZ"
android:valueTo="@dimen/fab_press_translation_z"
android:valueType="floatType" />
</set>
</item>
<item>
<set>
<objectAnimator
android:duration="@android:integer/config_shortAnimTime"
android:propertyName="translationZ"
android:valueTo="0"
android:valueType="floatType" />
</set>
</item>
</selector>

23
res/drawable/fab_background.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/fab_ripple">
<item>
<shape>
<solid android:color="@color/fab_shape" />
</shape>
</item>
</ripple>

12
res/layout/preference_list_fragment.xml
View File

@@ -52,18 +52,6 @@
<include layout="@layout/loading_container" /> <include layout="@layout/loading_container" />
<com.android.settings.widget.FloatingActionButton
android:id="@+id/fab"
android:visibility="gone"
android:clickable="true"
android:layout_width="@dimen/fab_size"
android:layout_height="@dimen/fab_size"
android:layout_gravity="bottom|end"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginBottom="@dimen/fab_margin"
android:elevation="@dimen/fab_elevation"
android:background="@drawable/fab_background" />
</FrameLayout> </FrameLayout>
<TextView android:id="@android:id/empty" <TextView android:id="@android:id/empty"

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

@@ -75,5 +75,4 @@
<dimen name="confirm_credentials_security_method_margin">72dp</dimen> <dimen name="confirm_credentials_security_method_margin">72dp</dimen>
<dimen name="confirm_credentials_layout_width">328dp</dimen> <dimen name="confirm_credentials_layout_width">328dp</dimen>
<dimen name="confirm_credentials_top_padding">48dp</dimen> <dimen name="confirm_credentials_top_padding">48dp</dimen>
<dimen name="fab_margin">24dp</dimen>
</resources> </resources>

7
res/values/arrays.xml
View File

@@ -967,13 +967,6 @@
<item>\?</item> <item>\?</item>
</string-array> </string-array>
<array name="ram_colors">
<item>@color/memory_normal</item>
<item>@color/memory_moderate</item>
<item>@color/memory_low</item>
<item>@color/memory_critical</item>
</array>
<!-- Display color space adjustment modes for accessibility --> <!-- Display color space adjustment modes for accessibility -->
<string-array name="daltonizer_type_entries" translatable="false"> <string-array name="daltonizer_type_entries" translatable="false">
<item>@string/daltonizer_mode_deuteranomaly</item> <item>@string/daltonizer_mode_deuteranomaly</item>

22
res/values/colors.xml
View File

@@ -21,16 +21,7 @@
<color name="material_empty_color_light">#FFCED7DB</color> <color name="material_empty_color_light">#FFCED7DB</color>
<color name="memory_used">#F00</color>
<color name="memory_avail">@color/material_empty_color_light</color>
<color name="memory_apps_usage">#00796B</color>
<color name="memory_downloads">#3367D6</color>
<color name="memory_dcim">#0097A7</color>
<color name="memory_music">#689F38</color>
<color name="memory_cache">#283593</color>
<color name="memory_misc">#7B1FA2</color>
<color name="memory_user_light">#479392</color>
<color name="memory_user_dark">#316665</color>
<color name="crypt_keeper_clock_background">#ff9a9a9a</color> <color name="crypt_keeper_clock_background">#ff9a9a9a</color>
<color name="crypt_keeper_clock_foreground">#ff666666</color> <color name="crypt_keeper_clock_foreground">#ff666666</color>
@@ -83,19 +74,8 @@
<color name="warning">#ff5621</color> <color name="warning">#ff5621</color>
<color name="confirm_device_credential_dark_background">#263238</color> <color name="confirm_device_credential_dark_background">#263238</color>
<color name="confirm_device_credential_transparent_black">#60000000</color> <color name="confirm_device_credential_transparent_black">#60000000</color>
<color name="fab_ripple">#1fffffff</color><!-- 12% white -->
<color name="fab_shape">?android:attr/colorAccent</color>
<color name="voice_interaction_highlight">#33b5e5</color> <color name="voice_interaction_highlight">#33b5e5</color>
<drawable name="fp_enrollment_header_landscape">#009688</drawable>
<color name="memory_normal">#ff009587</color>
<color name="memory_moderate">#ffF3B300</color>
<color name="memory_low">#ffff9700</color>
<color name="memory_critical">#ffff5621</color>
<color name="memory_avg_use">#ff384248</color>
<color name="zen_rule_name_warning">@color/system_warning_color</color> <color name="zen_rule_name_warning">@color/system_warning_color</color>
<!-- Accent color that matches the settings launcher icon --> <!-- Accent color that matches the settings launcher icon -->

4
res/values/dimens.xml
View File

@@ -238,10 +238,6 @@
<dimen name="confirm_credentials_security_method_margin">48dp</dimen> <dimen name="confirm_credentials_security_method_margin">48dp</dimen>
<dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen> <dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen>
<dimen name="confirm_credentials_top_padding">0dp</dimen> <dimen name="confirm_credentials_top_padding">0dp</dimen>
<dimen name="fab_size">56dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="fab_elevation">12dp</dimen>
<dimen name="fab_press_translation_z">9dp</dimen>
<!-- Delete managed profile dialog --> <!-- Delete managed profile dialog -->
<dimen name="delete_profile_dialog_padding_top">16dp</dimen> <dimen name="delete_profile_dialog_padding_top">16dp</dimen>

7
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -43,7 +43,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import com.android.settings.applications.LayoutPreference; import com.android.settings.applications.LayoutPreference;
import com.android.settings.widget.FloatingActionButton;
import com.android.settingslib.HelpUtils; import com.android.settingslib.HelpUtils;
import java.util.UUID; import java.util.UUID;
@@ -90,7 +89,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
}; };
private ViewGroup mPinnedHeaderFrameLayout; private ViewGroup mPinnedHeaderFrameLayout;
private FloatingActionButton mFloatingActionButton;
private ViewGroup mButtonBar; private ViewGroup mButtonBar;
private LayoutPreference mHeader; private LayoutPreference mHeader;
@@ -128,7 +126,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
Bundle savedInstanceState) { Bundle savedInstanceState) {
final View root = super.onCreateView(inflater, container, savedInstanceState); final View root = super.onCreateView(inflater, container, savedInstanceState);
mPinnedHeaderFrameLayout = (ViewGroup) root.findViewById(R.id.pinned_header); mPinnedHeaderFrameLayout = (ViewGroup) root.findViewById(R.id.pinned_header);
mFloatingActionButton = (FloatingActionButton) root.findViewById(R.id.fab);
mButtonBar = (ViewGroup) root.findViewById(R.id.button_bar); mButtonBar = (ViewGroup) root.findViewById(R.id.button_bar);
return root; return root;
} }
@@ -156,10 +153,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
} }
} }
public FloatingActionButton getFloatingActionButton() {
return mFloatingActionButton;
}
public ViewGroup getButtonBar() { public ViewGroup getButtonBar() {
return mButtonBar; return mButtonBar;
} }

49
src/com/android/settings/widget/FloatingActionButton.java
View File

@@ -1,49 +0,0 @@
/*
* Copyright (C) 2015 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.widget;
import android.animation.AnimatorInflater;
import android.content.Context;
import android.graphics.Outline;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewOutlineProvider;
import android.widget.ImageView;
import com.android.settings.R;
public class FloatingActionButton extends ImageView {
public FloatingActionButton(Context context, AttributeSet attrs) {
super(context, attrs);
setScaleType(ScaleType.CENTER);
setStateListAnimator(AnimatorInflater.loadStateListAnimator(context, R.anim.fab_elevation));
setOutlineProvider(new ViewOutlineProvider() {
@Override
public void getOutline(View view, Outline outline) {
outline.setOval(0, 0, getWidth(), getHeight());
}
});
setClipToOutline(true);
}
@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
super.onSizeChanged(w, h, oldw, oldh);
invalidateOutline();
}
}