From 6455208e1334114881be837cfbc26d3ae06f9ce3 Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Wed, 17 Sep 2014 10:37:05 -0700 Subject: Settings: squash of new profile UI for cm-12.0 Additions for cm-12.0: - removed expanded desktop - added add profile FAB - updated tabs for meterial style - added enabler switch bar Squashed commits: ------------------------------- Settings: refactor Profiles to be more user friendly * Remove the notion of Profile app groups * Rearrange profile setup flow, now we first present the user with ways which will trigger the profile, then allow them to set what happens when the profile is triggered. Change-Id: I2870df894046cd43c21c67991fb5efc9c3fec837 Signed-off-by: Roman Birg Settings: cleanup new profiles UI * cleanup old code * for configuring profiles, add options to modify triggers and remove the profile * remove separate activity * don't hardcode padding pixel sizes Change-Id: I6b1d05c9f918714249411006c7562496e2a7539e Signed-off-by: Roman Birg Profiles: fix expanded desktop settings not applying Change-Id: Ia523145bf47bfc189c29b035ad5ec6e053cf9296 Settings: Fix profiles volume override summary. Change-Id: I499cfb3006a7fc7b5e931ac854a7437f5d141523 Settings: fix Profiles expanded desktop choice mapping Change-Id: Ib96811a0c268ca68a7b9732283c5abc142d143a4 Signed-off-by: Roman Birg Settings: add "Untouched" ring mode option in profiles Change-Id: I4ac2d63119b328533217104a799cb0660ecddfb9 Signed-off-by: Roman Birg Settings: profiles: fix volume streams override behavior Before we would always assume to override the stream, but that is not always the case. Add a checkbox to turn the override on and off. Signed-off-by: Roman Birg Change-Id: Ic1a58d59a9e514d4c2ccf376191ac7989bbead26 --- res/drawable-mdpi/ic_settings_profiles.png | Bin 721 -> 879 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'res/drawable-mdpi') diff --git a/res/drawable-mdpi/ic_settings_profiles.png b/res/drawable-mdpi/ic_settings_profiles.png index cc740bd..0cf65a9 100644 Binary files a/res/drawable-mdpi/ic_settings_profiles.png and b/res/drawable-mdpi/ic_settings_profiles.png differ -- cgit v1.1