From db4ed191deefeda79af5644634415597c1c70217 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Fri, 11 Dec 2015 16:48:31 -0500 Subject: [PATCH] Add conditionals to Settings Also add Airplane Mode and Hotspot conditionals (more to come soon) Change-Id: I11f206db59f7c715f416fb5852b8f0fcb857a247 --- AndroidManifest.xml | 17 ++ res/drawable/ic_airplane.xml | 57 +++++ res/drawable/ic_expand_less.xml | 5 +- res/drawable/ic_expand_more.xml | 5 +- res/drawable/ic_hotspot.xml | 62 +++++ res/layout/condition_card.xml | 109 +++++++++ res/layout/dashboard.xml | 2 +- res/values/dimens.xml | 2 +- res/values/strings.xml | 16 ++ src/com/android/settings/Utils.java | 9 +- .../settings/dashboard/DashboardAdapter.java | 98 ++++++-- .../settings/dashboard/DashboardSummary.java | 42 +++- .../conditional/AirplaneModeCondition.java | 95 ++++++++ .../dashboard/conditional/Condition.java | 107 +++++++++ .../conditional/ConditionAdapterUtils.java | 93 ++++++++ .../conditional/ConditionManager.java | 220 ++++++++++++++++++ .../conditional/FocusRecyclerView.java | 49 ++++ .../conditional/HotspotCondition.java | 111 +++++++++ 18 files changed, 1059 insertions(+), 40 deletions(-) create mode 100644 res/drawable/ic_airplane.xml create mode 100644 res/drawable/ic_hotspot.xml create mode 100644 res/layout/condition_card.xml create mode 100644 src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java create mode 100644 src/com/android/settings/dashboard/conditional/Condition.java create mode 100644 src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java create mode 100644 src/com/android/settings/dashboard/conditional/ConditionManager.java create mode 100644 src/com/android/settings/dashboard/conditional/FocusRecyclerView.java create mode 100644 src/com/android/settings/dashboard/conditional/HotspotCondition.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3bbc6671ebe..c83002a1ef2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2656,5 +2656,22 @@ + + + + + + + + + + + + + diff --git a/res/drawable/ic_airplane.xml b/res/drawable/ic_airplane.xml new file mode 100644 index 00000000000..b3e0ba0b5e8 --- /dev/null +++ b/res/drawable/ic_airplane.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + diff --git a/res/drawable/ic_expand_less.xml b/res/drawable/ic_expand_less.xml index 3a00faff28b..7ccc0809172 100644 --- a/res/drawable/ic_expand_less.xml +++ b/res/drawable/ic_expand_less.xml @@ -19,10 +19,11 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> diff --git a/res/drawable/ic_expand_more.xml b/res/drawable/ic_expand_more.xml index 64d22421fa4..609cf363a1a 100644 --- a/res/drawable/ic_expand_more.xml +++ b/res/drawable/ic_expand_more.xml @@ -19,10 +19,11 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> diff --git a/res/drawable/ic_hotspot.xml b/res/drawable/ic_hotspot.xml new file mode 100644 index 00000000000..d8528ddc4db --- /dev/null +++ b/res/drawable/ic_hotspot.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + diff --git a/res/layout/condition_card.xml b/res/layout/condition_card.xml new file mode 100644 index 00000000000..482d5b62532 --- /dev/null +++ b/res/layout/condition_card.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + +