diff options
Diffstat (limited to 'packages/SystemUI')
21 files changed, 43 insertions, 66 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index b8c69d1..6c85a8f 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (C) 2015 The Android Open Source Project + ~ Copyright (C) 2014 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. @@ -32,7 +32,7 @@ android:layout_gravity="bottom|center_horizontal" android:gravity="center_horizontal" android:textStyle="italic" - android:textColor="@color/keyguard_indication_text_color" + android:textColor="#ffffff" android:textAppearance="?android:attr/textAppearanceSmall" android:accessibilityLiveRegion="polite" /> diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml index a337e90..8d33742 100644 --- a/packages/SystemUI/res/layout/keyguard_status_bar.xml +++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (C) 2015 The Android Open Source Project + ~ Copyright (C) 2014 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. @@ -58,7 +58,7 @@ android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/header_battery_margin_keyguard" android:paddingEnd="@dimen/battery_level_padding_end" - android:textColor="@color/status_bar_battery_level_text_color" + android:textColor="#ffffff" android:visibility="gone" android:textSize="@dimen/battery_level_text_size" android:importantForAccessibility="noHideDescendants"/> @@ -73,7 +73,7 @@ android:gravity="center_vertical" android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/keyguard_carrier_text_color" + android:textColor="#ffffff" android:singleLine="true" /> </com.android.systemui.statusbar.phone.KeyguardStatusBarView> diff --git a/packages/SystemUI/res/layout/lockscreen_shortcuts.xml b/packages/SystemUI/res/layout/lockscreen_shortcuts.xml index 63a99a3..1c99d96 100644 --- a/packages/SystemUI/res/layout/lockscreen_shortcuts.xml +++ b/packages/SystemUI/res/layout/lockscreen_shortcuts.xml @@ -45,7 +45,7 @@ android:layout_height="@dimen/keyguard_affordance_height" /> <ImageView android:id="@+id/middle_button" - android:tint="@color/lockscreen_middle_button_tint_color" + android:tint="#666666" android:layout_centerHorizontal="true" android:layout_alignParentBottom="true" android:scaleType="center" diff --git a/packages/SystemUI/res/layout/mland.xml b/packages/SystemUI/res/layout/mland.xml index 5ec0f7f..d1b6d00 100644 --- a/packages/SystemUI/res/layout/mland.xml +++ b/packages/SystemUI/res/layout/mland.xml @@ -48,7 +48,7 @@ android:layout_height="48dp" android:scaleType="fitCenter" android:layout_gravity="center" - android:tint="@color/play_button_image_tint_color" + android:tint="#000000" android:src="@drawable/play" /> <TextView @@ -58,7 +58,7 @@ android:layout_gravity="center" android:alpha="0" android:textSize="40dp" - android:textColor="@color/play_button_text_color" + android:textColor="#000000" /> </FrameLayout> </FrameLayout> diff --git a/packages/SystemUI/res/layout/mland_scorefield.xml b/packages/SystemUI/res/layout/mland_scorefield.xml index 31e4b4b..0ed72e4 100644 --- a/packages/SystemUI/res/layout/mland_scorefield.xml +++ b/packages/SystemUI/res/layout/mland_scorefield.xml @@ -22,7 +22,7 @@ android:textStyle="bold" android:textSize="22sp" android:gravity="center" - android:textColor="@color/mland_scorefield_text_color" + android:textColor="#FFAAAAAA" android:paddingStart="12dp" android:paddingEnd="12dp" android:paddingTop="4dp" diff --git a/packages/SystemUI/res/layout/qs_panel.xml b/packages/SystemUI/res/layout/qs_panel.xml index c6a7d1c..9df4425 100644 --- a/packages/SystemUI/res/layout/qs_panel.xml +++ b/packages/SystemUI/res/layout/qs_panel.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -24,7 +24,7 @@ <com.android.systemui.qs.QSDragPanel android:id="@+id/quick_settings_panel" - android:background="@color/quick_settings_panel_background" + android:background="#0000" android:layout_width="match_parent" android:layout_height="wrap_content" /> </com.android.systemui.qs.QSContainer> diff --git a/packages/SystemUI/res/layout/qs_tile_top b/packages/SystemUI/res/layout/qs_tile_top index 1b0bbd9..6d455ab 100644 --- a/packages/SystemUI/res/layout/qs_tile_top +++ b/packages/SystemUI/res/layout/qs_tile_top @@ -57,7 +57,7 @@ android:layout_height="match_parent" android:gravity="center_vertical" android:layout_weight="1" - android:textColor="@color/qs_tile_edit_header_instruction_text_color" + android:textColor="@android:color/white" android:text="@string/qs_tile_edit_header_instruction" android:contentDescription="@null"/> diff --git a/packages/SystemUI/res/layout/recents_empty.xml b/packages/SystemUI/res/layout/recents_empty.xml index 3b7e886..4b68e77 100644 --- a/packages/SystemUI/res/layout/recents_empty.xml +++ b/packages/SystemUI/res/layout/recents_empty.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -21,8 +21,8 @@ android:layout_gravity="center" android:gravity="center" android:textSize="16sp" - android:textColor="@color/recents_empty_message_text_color" + android:textColor="#ffffffff" android:text="@string/recents_empty_message" android:fontFamily="sans-serif" - android:background="@color/recents_empty_background_color" - android:visibility="gone" /> + android:background="#80000000" + android:visibility="gone" />
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/recents_search_bar.xml b/packages/SystemUI/res/layout/recents_search_bar.xml index ad956f0..915283e 100644 --- a/packages/SystemUI/res/layout/recents_search_bar.xml +++ b/packages/SystemUI/res/layout/recents_search_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:text="@string/recents_search_bar_label" - android:textColor="@color/recents_search_bar_label_text_color" + android:textColor="#99ffffff" android:textSize="18sp" android:textAllCaps="true" /> </FrameLayout> diff --git a/packages/SystemUI/res/layout/recents_task_view_header.xml b/packages/SystemUI/res/layout/recents_task_view_header.xml index f3f9c77..477d9d7 100644 --- a/packages/SystemUI/res/layout/recents_task_view_header.xml +++ b/packages/SystemUI/res/layout/recents_task_view_header.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -36,7 +36,7 @@ android:layout_marginStart="64dp" android:layout_marginEnd="64dp" android:textSize="16sp" - android:textColor="@color/recents_empty_message_text_color" + android:textColor="#ffffffff" android:text="@string/recents_empty_message" android:fontFamily="sans-serif-medium" android:singleLine="true" @@ -63,4 +63,4 @@ android:background="@drawable/recents_button_bg" android:visibility="invisible" android:src="@drawable/recents_dismiss_light" /> -</com.android.systemui.recents.views.TaskViewHeader> +</com.android.systemui.recents.views.TaskViewHeader>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml b/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml index 7dbdb9f..9900b84 100644 --- a/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml +++ b/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- /** - * Copyright (c) 2015, The Android Open Source Project + * Copyright (c) 2014, 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. @@ -59,7 +59,7 @@ android:paddingEnd="8dp" android:paddingStart="8dp" android:text="@string/screen_pinning_positive" - android:textColor="@color/screen_pinning_description_text_color" + android:textColor="@android:color/white" android:textSize="14sp" /> <Button @@ -74,7 +74,7 @@ android:paddingEnd="8dp" android:paddingStart="8dp" android:text="@string/screen_pinning_negative" - android:textColor="@color/screen_pinning_cancel_button_text_color" + android:textColor="@android:color/white" android:textSize="14sp" /> </RelativeLayout> diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index cfec230..291dc65 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -2,7 +2,7 @@ <!-- /* apps/common/assets/default/default/skins/StatusBar.xml ** -** Copyright 2015, The Android Open Source Project +** Copyright 2006, 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. @@ -100,7 +100,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/header_battery_margin_keyguard" - android:textColor="@color/status_bar_battery_level_text_color" + android:textColor="#ffffff" android:textSize="@dimen/battery_level_text_size" /> <com.android.systemui.statusbar.policy.Clock diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 5cf5d18..c4e3fcd 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -2,7 +2,7 @@ <!-- /* apps/common/assets/default/default/skins/StatusBar.xml ** -** Copyright 2015, The Android Open Source Project +** Copyright 2006, 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. @@ -39,7 +39,7 @@ android:singleLine="true" android:visibility="invisible" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/carrier_label_text_color" /> + android:textColor="#999999" /> <include layout="@layout/keyguard_status_view" diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index be5c42a..577ad55 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -** Copyright 2015, The Android Open Source Project +** Copyright 2012, 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. @@ -229,7 +229,7 @@ android:fontFamily="sans-serif-condensed" android:textSize="11dp" android:textStyle="bold" - android:textColor="@color/header_debug_info_text_color" + android:textColor="#00A040" android:padding="2dp" /> diff --git a/packages/SystemUI/res/layout/status_bar_no_notifications.xml b/packages/SystemUI/res/layout/status_bar_no_notifications.xml index 28d4a4d..dd501d4 100644 --- a/packages/SystemUI/res/layout/status_bar_no_notifications.xml +++ b/packages/SystemUI/res/layout/status_bar_no_notifications.xml @@ -1,5 +1,5 @@ <!-- - ~ Copyright (C) 2015 The Android Open Source Project + ~ Copyright (C) 2014 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. @@ -27,7 +27,7 @@ android:layout_height="64dp" android:paddingTop="12dp" android:gravity="top|center_horizontal" - android:textColor="@color/no_notifications_text_color" + android:textColor="#ffffff" android:textSize="20sp" android:text="@string/empty_shade_text"/> </com.android.systemui.statusbar.EmptyShadeView> diff --git a/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml b/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml index e9c806d..1675773 100644 --- a/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml +++ b/packages/SystemUI/res/layout/status_bar_no_recent_apps.xml @@ -2,7 +2,7 @@ <!-- /* apps/common/assets/default/default/skins/StatusBar.xml ** -** Copyright 2015, The Android Open Source Project +** Copyright 2011, 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. @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="20dp" - android:textColor="@color/no_recent_apps_text_color" + android:textColor="@android:color/holo_blue_light" android:text="@string/status_bar_no_recent_apps" android:gravity="center_horizontal" android:layout_gravity="center" diff --git a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml index f253f8f..f699fce 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml @@ -1,5 +1,5 @@ <!-- - ~ Copyright (C) 2015 The Android Open Source Project + ~ Copyright (C) 2014 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. @@ -44,7 +44,7 @@ android:layout_gravity="center_vertical" android:background="@drawable/keyguard_overflow_number_background" android:gravity="center" - android:textColor="@color/keyguard_overflow_number_text_color" + android:textColor="#ff686868" android:textStyle="bold" android:textSize="14dp" /> diff --git a/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml b/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml index cb00dcc..e220a16 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml @@ -1,5 +1,5 @@ <!-- - ~ Copyright (C) 2015 The Android Open Source Project + ~ Copyright (C) 2014 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. @@ -25,6 +25,6 @@ android:id="@+id/speedbump_line" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/speedbump_line_divider" + android:background="#6fdddddd" android:layout_gravity="center_vertical"/> </com.android.systemui.statusbar.SpeedBumpView> diff --git a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml index 6657d6a..062e6cb 100644 --- a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml +++ b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2010 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. @@ -55,7 +55,7 @@ android:layout_centerVertical="true" android:gravity="center" android:paddingTop="26dp" - android:textColor="@color/toggle_slider_text_color" + android:textColor="#666666" android:textSize="12sp" android:visibility="gone" /> diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index eff4fe9..43ab4bb 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2014 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. @@ -53,7 +53,7 @@ android:contentDescription="@string/accessibility_desc_close" android:scaleType="center" android:src="@drawable/ic_close" - android:tint="@color/zen_ic_close_tint_color" /> + android:tint="@android:color/white" /> <TextView android:id="@+id/zen_introduction_message" diff --git a/packages/SystemUI/res/values/cm_colors.xml b/packages/SystemUI/res/values/cm_colors.xml index f127939..abca9bb 100644 --- a/packages/SystemUI/res/values/cm_colors.xml +++ b/packages/SystemUI/res/values/cm_colors.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2014 The CyanogenMod Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -67,27 +67,4 @@ <!-- SystemUI Tuner Icon Tint Color --> <color name="tuner_icon_tint">#4dffffff</color> - - <!-- More exposed hard coded colors --> - <color name="toggle_slider_text_color">#666666</color> - <color name="no_recent_apps_text_color">@android:color/holo_blue_light</color> - <color name="no_notifications_text_color">#ffffff</color> - <color name="keyguard_overflow_number_text_color">#ff686868</color> - <color name="carrier_label_text_color">#999999</color> - <color name="keyguard_carrier_text_color">#ffffff</color> - <color name="screen_pinning_description_text_color">@android:color/white</color> - <color name="screen_pinning_cancel_button_text_color">@android:color/white</color> - <color name="recents_empty_message_text_color">#ffffffff</color> - <color name="recents_search_bar_label_text_color">#99ffffff</color> - <color name="recents_empty_background_color">#80000000</color> - <color name="qs_tile_edit_header_instruction_text_color">@android:color/white</color> - <color name="mland_scorefield_text_color">#FFAAAAAA</color> - <color name="keyguard_indication_text_color">#ffffff</color> - <color name="speedbump_line_divider">#6fdddddd</color> - <color name="quick_settings_panel_background">#0000</color> - <color name="lockscreen_middle_button_tint_color">#666666</color> - <color name="play_button_image_tint_color">#000000</color> - <color name="play_button_text_color">#000000</color> - <color name="zen_ic_close_tint_color">@android:color/white</color> - <color name="header_debug_info_text_color">#00A040</color> </resources> |