diff --git a/Android.mk b/Android.mk index f45713d8d48..ea068af26dc 100644 --- a/Android.mk +++ b/Android.mk @@ -9,7 +9,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v7-preference \ android-support-v7-appcompat \ android-support-v14-preference \ - android-support-v7-cardview \ jsr305 LOCAL_MODULE_TAGS := optional @@ -22,8 +21,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \ frameworks/support/v7/preference/res \ frameworks/support/v14/preference/res \ frameworks/support/v7/appcompat/res \ - frameworks/support/v7/recyclerview/res \ - frameworks/support/v7/cardview/res + frameworks/support/v7/recyclerview/res LOCAL_PACKAGE_NAME := Settings LOCAL_CERTIFICATE := platform @@ -32,7 +30,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_AAPT_FLAGS := --auto-add-overlay \ - --extra-packages android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview:android.support.v7.cardview + --extra-packages android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview ifneq ($(INCREMENTAL_BUILDS),) LOCAL_PROGUARD_ENABLED := disabled diff --git a/res/layout/suggestion_carousel_card_view.xml b/res/layout/suggestion_carousel_card_view.xml deleted file mode 100644 index d407a1946ff..00000000000 --- a/res/layout/suggestion_carousel_card_view.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/src/com/android/settings/dashboard/SuggestionCarouselAdapter.java b/src/com/android/settings/dashboard/SuggestionCarouselAdapter.java deleted file mode 100644 index 340ecdea04f..00000000000 --- a/src/com/android/settings/dashboard/SuggestionCarouselAdapter.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2016 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.dashboard; - -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import com.android.settings.R; - -public final class SuggestionCarouselAdapter - extends RecyclerView.Adapter { - - @Override - public SuggestionCarouselViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - final View itemView = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.suggestion_carousel_card_view, parent, - false /* attachToRoot */); - return new SuggestionCarouselViewHolder(itemView); - } - - @Override - public void onBindViewHolder(SuggestionCarouselViewHolder holder, int position) { - } - - @Override - public int getItemCount() { - return 0; - } - - public final class SuggestionCarouselViewHolder extends RecyclerView.ViewHolder { - - public ImageView mImageView; - public TextView mTextView; - - public SuggestionCarouselViewHolder(View itemView) { - super(itemView); - mImageView = (ImageView) itemView.findViewById(R.id.image); - mTextView = (TextView) itemView.findViewById(R.id.title); - } - } -}