Permalink
Browse files

Updated to vector icons.

General approach is to use vectors wherever possible via VectorDrawableCompat. This cannot be used in
some places, notably:

1. In compound drawables (drawableTop etc).
2. In remote views
3. Icons with blurs/gradients.

In situations where the compat approach cannot be used add a VactorDrawable to res/drawable-anydpi-v21
to be used on newer platforms and delete all densities of raster icons expect xxhdpi. This balances
apk size against fidelity.

Bug: 27919701
Bug: 28210606
Change-Id: I654912b5dd31e40431b8d07bc91d84cfe5953ca9
  • Loading branch information...
nickbutcher committed Apr 14, 2016
1 parent 006fbe0 commit 78c5d25dfbb4bf8193c46c3fb8b73c9871c44ad6
Showing with 1,272 additions and 437 deletions.
  1. +0 −1 android/src/main/AndroidManifest.xml
  2. +1 −2 ...c/main/java/com/google/samples/apps/iosched/debug/actions/ShowSessionNotificationDebugAction.java
  3. +1 −1 android/src/main/java/com/google/samples/apps/iosched/navigation/AccountSpinnerAdapter.java
  4. +4 −3 android/src/main/java/com/google/samples/apps/iosched/navigation/NavigationModel.java
  5. +2 −2 android/src/main/java/com/google/samples/apps/iosched/service/SessionAlarmService.java
  6. +1 −1 android/src/main/java/com/google/samples/apps/iosched/session/SessionDetailActivity.java
  7. +5 −6 android/src/main/java/com/google/samples/apps/iosched/session/SessionDetailFragment.java
  8. +1 −1 android/src/main/java/com/google/samples/apps/iosched/ui/BaseActivity.java
  9. +2 −1 android/src/main/java/com/google/samples/apps/iosched/ui/widget/BezelImageView.java
  10. +1 −3 android/src/main/java/com/google/samples/apps/iosched/util/MapUtils.java
  11. +2 −6 android/src/main/java/com/google/samples/apps/iosched/util/UIUtils.java
  12. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_after_hours.xml
  13. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_badge_pickup.xml
  14. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_codelab.xml
  15. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_food.xml
  16. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_live_now.xml
  17. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_misc.xml
  18. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_navview_schedule.xml
  19. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_play.xml
  20. +13 −14 android/src/main/res/{drawable-v21 → drawable-anydpi-v21}/ic_post_gplus.xml
  21. +12 −14 android/src/main/res/{drawable-v21 → drawable-anydpi-v21}/ic_post_twitter.xml
  22. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_sandbox.xml
  23. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_session.xml
  24. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_stat_alarm.xml
  25. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_stat_map.xml
  26. +35 −0 android/src/main/res/drawable-anydpi-v21/ic_stat_notification.xml
  27. +27 −0 android/src/main/res/drawable-anydpi-v21/ic_submit_feedback.xml
  28. +35 −0 android/src/main/res/drawable-anydpi-v21/ic_widget_logo.xml
  29. +35 −0 android/src/main/res/drawable-anydpi-v21/io_logo.xml
  30. BIN android/src/main/res/drawable-hdpi/hash_io_15.png
  31. BIN android/src/main/res/drawable-hdpi/hash_io_15_flat.png
  32. BIN android/src/main/res/drawable-hdpi/ic_after_hours.png
  33. BIN android/src/main/res/drawable-hdpi/ic_badge_pickup.png
  34. BIN android/src/main/res/drawable-hdpi/ic_browse.png
  35. BIN android/src/main/res/drawable-hdpi/ic_codelab.png
  36. BIN android/src/main/res/drawable-hdpi/ic_food.png
  37. BIN android/src/main/res/drawable-hdpi/ic_info_outline.png
  38. BIN android/src/main/res/drawable-hdpi/ic_map_codelab.png
  39. BIN android/src/main/res/drawable-hdpi/ic_map_misc.png
  40. BIN android/src/main/res/drawable-hdpi/ic_map_officehours.png
  41. BIN android/src/main/res/drawable-hdpi/ic_map_pin.png
  42. BIN android/src/main/res/drawable-hdpi/ic_map_sandbox.png
  43. BIN android/src/main/res/drawable-hdpi/ic_map_session.png
  44. BIN android/src/main/res/drawable-hdpi/ic_map_venue.png
  45. BIN android/src/main/res/drawable-hdpi/ic_misc.png
  46. BIN android/src/main/res/drawable-hdpi/ic_play_circle_fill_white_48dp.png
  47. BIN android/src/main/res/drawable-hdpi/ic_play_shadowed.png
  48. BIN android/src/main/res/drawable-hdpi/ic_post_gplus_white.png
  49. BIN android/src/main/res/drawable-hdpi/ic_post_twitter_white.png
  50. BIN android/src/main/res/drawable-hdpi/ic_sandbox.png
  51. BIN android/src/main/res/drawable-hdpi/ic_session.png
  52. BIN android/src/main/res/drawable-hdpi/ic_stat_notification.png
  53. BIN android/src/main/res/drawable-hdpi/io_logo.png
  54. BIN android/src/main/res/drawable-hdpi/io_mark_social.png
  55. BIN android/src/main/res/drawable-hdpi/message_card_after_hours.png
  56. BIN android/src/main/res/drawable-hdpi/message_card_credentials.png
  57. BIN android/src/main/res/drawable-hdpi/message_card_keynote.png
  58. BIN android/src/main/res/drawable-hdpi/message_card_wifi.png
  59. BIN android/src/main/res/drawable-mdpi/hash_io_15.png
  60. BIN android/src/main/res/drawable-mdpi/hash_io_15_flat.png
  61. BIN android/src/main/res/drawable-mdpi/ic_after_hours.png
  62. BIN android/src/main/res/drawable-mdpi/ic_badge_pickup.png
  63. BIN android/src/main/res/drawable-mdpi/ic_browse.png
  64. BIN android/src/main/res/drawable-mdpi/ic_codelab.png
  65. BIN android/src/main/res/drawable-mdpi/ic_food.png
  66. BIN android/src/main/res/drawable-mdpi/ic_info_outline.png
  67. BIN android/src/main/res/drawable-mdpi/ic_map_codelab.png
  68. BIN android/src/main/res/drawable-mdpi/ic_map_misc.png
  69. BIN android/src/main/res/drawable-mdpi/ic_map_officehours.png
  70. BIN android/src/main/res/drawable-mdpi/ic_map_pin.png
  71. BIN android/src/main/res/drawable-mdpi/ic_map_sandbox.png
  72. BIN android/src/main/res/drawable-mdpi/ic_map_session.png
  73. BIN android/src/main/res/drawable-mdpi/ic_map_venue.png
  74. BIN android/src/main/res/drawable-mdpi/ic_misc.png
  75. BIN android/src/main/res/drawable-mdpi/ic_play_circle_fill_white_48dp.png
  76. BIN android/src/main/res/drawable-mdpi/ic_play_shadowed.png
  77. BIN android/src/main/res/drawable-mdpi/ic_post_gplus_white.png
  78. BIN android/src/main/res/drawable-mdpi/ic_post_twitter_white.png
  79. BIN android/src/main/res/drawable-mdpi/ic_sandbox.png
  80. BIN android/src/main/res/drawable-mdpi/ic_session.png
  81. BIN android/src/main/res/drawable-mdpi/ic_stat_notification.png
  82. BIN android/src/main/res/drawable-mdpi/io_logo.png
  83. BIN android/src/main/res/drawable-mdpi/io_mark_social.png
  84. BIN android/src/main/res/drawable-mdpi/message_card_after_hours.png
  85. BIN android/src/main/res/drawable-mdpi/message_card_credentials.png
  86. BIN android/src/main/res/drawable-mdpi/message_card_keynote.png
  87. BIN android/src/main/res/drawable-mdpi/message_card_wifi.png
  88. BIN android/src/main/res/drawable-nodpi/person_image_empty.png
  89. +0 −27 android/src/main/res/drawable-v21/ic_explore.xml
  90. +0 −27 android/src/main/res/drawable-v21/ic_forum.xml
  91. +0 −25 android/src/main/res/drawable-v21/ic_info_outline.xml
  92. +0 −27 android/src/main/res/drawable-v21/ic_map.xml
  93. +0 −27 android/src/main/res/drawable-v21/ic_play_circle_fill.xml
  94. +0 −32 android/src/main/res/drawable-v21/ic_schedule.xml
  95. +10 −8 android/src/main/res/drawable-v21/ic_settings.xml
  96. +0 −25 android/src/main/res/drawable-v21/ic_submit_feedback.xml
  97. +0 −33 android/src/main/res/drawable-v21/io_logo.xml
  98. +0 −31 android/src/main/res/drawable-v21/lyft_logo.xml
  99. BIN android/src/main/res/drawable-xhdpi/hash_io_15.png
  100. BIN android/src/main/res/drawable-xhdpi/hash_io_15_flat.png
  101. BIN android/src/main/res/drawable-xhdpi/ic_action_captions.png
  102. BIN android/src/main/res/drawable-xhdpi/ic_after_hours.png
  103. BIN android/src/main/res/drawable-xhdpi/ic_badge_pickup.png
  104. BIN android/src/main/res/drawable-xhdpi/ic_browse.png
  105. BIN android/src/main/res/drawable-xhdpi/ic_codelab.png
  106. BIN android/src/main/res/drawable-xhdpi/ic_food.png
  107. BIN android/src/main/res/drawable-xhdpi/ic_info_outline.png
  108. BIN android/src/main/res/drawable-xhdpi/ic_map_codelab.png
  109. BIN android/src/main/res/drawable-xhdpi/ic_map_misc.png
  110. BIN android/src/main/res/drawable-xhdpi/ic_map_officehours.png
  111. BIN android/src/main/res/drawable-xhdpi/ic_map_pin.png
  112. BIN android/src/main/res/drawable-xhdpi/ic_map_sandbox.png
  113. BIN android/src/main/res/drawable-xhdpi/ic_map_session.png
  114. BIN android/src/main/res/drawable-xhdpi/ic_map_venue.png
  115. BIN android/src/main/res/drawable-xhdpi/ic_media_route_off_holo_light.png
  116. BIN android/src/main/res/drawable-xhdpi/ic_misc.png
  117. BIN android/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png
  118. BIN android/src/main/res/drawable-xhdpi/ic_play_shadowed.png
  119. BIN android/src/main/res/drawable-xhdpi/ic_post_gplus_white.png
  120. BIN android/src/main/res/drawable-xhdpi/ic_post_twitter_white.png
  121. BIN android/src/main/res/drawable-xhdpi/ic_sandbox.png
  122. BIN android/src/main/res/drawable-xhdpi/ic_session.png
  123. BIN android/src/main/res/drawable-xhdpi/ic_stat_notification.png
  124. BIN android/src/main/res/drawable-xhdpi/io_logo.png
  125. BIN android/src/main/res/drawable-xhdpi/io_mark_social.png
  126. BIN android/src/main/res/drawable-xhdpi/message_card_after_hours.png
  127. BIN android/src/main/res/drawable-xhdpi/message_card_credentials.png
  128. BIN android/src/main/res/drawable-xhdpi/message_card_keynote.png
  129. BIN android/src/main/res/drawable-xhdpi/message_card_wifi.png
  130. BIN android/src/main/res/drawable-xxhdpi/actionbar_icon.png
  131. BIN android/src/main/res/drawable-xxhdpi/actionbar_logo.png
  132. BIN android/src/main/res/drawable-xxhdpi/ic_ab_close.png
  133. BIN android/src/main/res/drawable-xxhdpi/ic_ab_drawer.png
  134. BIN android/src/main/res/drawable-xxhdpi/ic_ab_up_ltr.png
  135. BIN android/src/main/res/drawable-xxhdpi/ic_action_filter.png
  136. BIN android/src/main/res/drawable-xxhdpi/ic_action_map.png
  137. BIN android/src/main/res/drawable-xxhdpi/ic_action_search.png
  138. BIN android/src/main/res/drawable-xxhdpi/ic_action_share.png
  139. BIN android/src/main/res/drawable-xxhdpi/ic_after_hours.png
  140. BIN android/src/main/res/drawable-xxhdpi/ic_alarm_holo_dark.png
  141. BIN android/src/main/res/drawable-xxhdpi/ic_badge_pickup.png
  142. BIN android/src/main/res/drawable-xxhdpi/ic_bookmark_tick.png
  143. BIN android/src/main/res/drawable-xxhdpi/ic_browse.png
  144. BIN android/src/main/res/drawable-xxhdpi/ic_codelab.png
  145. BIN android/src/main/res/drawable-xxhdpi/ic_description.png
  146. BIN android/src/main/res/drawable-xxhdpi/ic_food.png
  147. BIN android/src/main/res/drawable-xxhdpi/ic_info_outline.png
  148. BIN android/src/main/res/drawable-xxhdpi/ic_live_now.png
  149. BIN android/src/main/res/drawable-xxhdpi/ic_map_codelab.png
  150. BIN android/src/main/res/drawable-xxhdpi/ic_map_holo_dark.png
  151. BIN android/src/main/res/drawable-xxhdpi/ic_map_misc.png
  152. BIN android/src/main/res/drawable-xxhdpi/ic_map_officehours.png
  153. BIN android/src/main/res/drawable-xxhdpi/ic_map_pin.png
  154. BIN android/src/main/res/drawable-xxhdpi/ic_map_sandbox.png
  155. BIN android/src/main/res/drawable-xxhdpi/ic_map_session.png
  156. BIN android/src/main/res/drawable-xxhdpi/ic_map_venue.png
  157. BIN android/src/main/res/drawable-xxhdpi/ic_misc.png
  158. BIN android/src/main/res/drawable-xxhdpi/ic_navview_accounts_collapse.png
  159. BIN android/src/main/res/drawable-xxhdpi/ic_navview_accounts_expand.png
  160. BIN android/src/main/res/drawable-xxhdpi/ic_navview_explore.png
  161. BIN android/src/main/res/drawable-xxhdpi/ic_navview_map.png
  162. BIN android/src/main/res/drawable-xxhdpi/ic_navview_play_circle_fill.png
  163. BIN android/src/main/res/drawable-xxhdpi/{ic_navview_my_schedule.png → ic_navview_schedule.png}
  164. BIN android/src/main/res/drawable-xxhdpi/ic_navview_settings.png
  165. BIN android/src/main/res/drawable-xxhdpi/ic_navview_social.png
  166. BIN android/src/main/res/drawable-xxhdpi/ic_navview_video_library.png
  167. BIN android/src/main/res/drawable-xxhdpi/ic_pane_close.png
  168. BIN android/src/main/res/drawable-xxhdpi/{ic_play_circle_fill_white_48dp.png → ic_play.png}
  169. BIN android/src/main/res/drawable-xxhdpi/ic_sandbox.png
  170. BIN android/src/main/res/drawable-xxhdpi/ic_session.png
  171. BIN android/src/main/res/drawable-xxhdpi/ic_stat_alarm.png
  172. BIN android/src/main/res/drawable-xxhdpi/ic_stat_map.png
  173. BIN android/src/main/res/drawable-xxhdpi/ic_submit_feedback.png
  174. BIN android/src/main/res/drawable-xxhdpi/ic_widget_logo.png
  175. BIN android/src/main/res/drawable-xxhdpi/io_mark_social.png
  176. BIN android/src/main/res/drawable-xxhdpi/message_card_after_hours.png
  177. BIN android/src/main/res/drawable-xxhdpi/message_card_credentials.png
  178. BIN android/src/main/res/drawable-xxhdpi/message_card_keynote.png
  179. BIN android/src/main/res/drawable-xxhdpi/message_card_wifi.png
  180. BIN android/src/main/res/drawable/deprecated_navdrawer_default_cover.jpg
  181. +27 −0 android/src/main/res/drawable/ic_about.xml
  182. +27 −0 android/src/main/res/drawable/ic_action_filter.xml
  183. +27 −0 android/src/main/res/drawable/ic_action_map.xml
  184. +27 −0 android/src/main/res/drawable/ic_action_search.xml
  185. +27 −0 android/src/main/res/drawable/ic_action_share.xml
  186. +27 −0 android/src/main/res/drawable/ic_browse.xml
  187. +27 −0 android/src/main/res/drawable/ic_clear_timeslot_filter.xml
  188. +27 −0 android/src/main/res/drawable/ic_close.xml
  189. +27 −0 android/src/main/res/drawable/ic_default_avatar.xml
  190. +27 −0 android/src/main/res/drawable/ic_fab_in_schedule.xml
  191. +27 −0 android/src/main/res/drawable/ic_hamburger.xml
  192. +2 −2 android/src/main/res/drawable/ic_in_schedule.xml
  193. +27 −0 android/src/main/res/drawable/ic_map_codelab.xml
  194. +27 −0 android/src/main/res/drawable/ic_map_misc.xml
  195. +27 −0 android/src/main/res/drawable/ic_map_officehours.xml
  196. +27 −0 android/src/main/res/drawable/ic_map_pin.xml
  197. +27 −0 android/src/main/res/drawable/ic_map_sandbox.xml
  198. +27 −0 android/src/main/res/drawable/ic_map_session.xml
  199. +27 −0 android/src/main/res/drawable/ic_map_venue.xml
  200. +27 −0 android/src/main/res/drawable/ic_navview_explore.xml
  201. +27 −0 android/src/main/res/drawable/ic_navview_live.xml
  202. +27 −0 android/src/main/res/drawable/ic_navview_map.xml
  203. +27 −0 android/src/main/res/drawable/ic_navview_settings.xml
  204. +27 −0 android/src/main/res/drawable/ic_navview_social.xml
  205. +27 −0 android/src/main/res/drawable/ic_navview_video_library.xml
  206. +1 −1 android/src/main/res/drawable/ic_session_in_schedule.xml
  207. +21 −13 android/src/main/res/drawable/ic_up.xml
  208. BIN android/src/main/res/drawable/io_logo.png
  209. 0 android/src/main/res/{drawable-v21 → drawable}/message_card_after_hours.xml
  210. 0 android/src/main/res/{drawable-v21 → drawable}/message_card_credentials.xml
  211. 0 android/src/main/res/{drawable-v21 → drawable}/message_card_keynote.xml
  212. 0 android/src/main/res/{drawable-v21 → drawable}/message_card_wifi.xml
  213. +1 −1 android/src/main/res/layout/account_spinner_dropdown.xml
  214. +3 −2 android/src/main/res/layout/explore_io_session_list_tile.xml
  215. +3 −3 android/src/main/res/layout/explore_sessions_act_alt_drawer_layout.xml
  216. +3 −2 android/src/main/res/layout/explore_sessions_session_grid_tile.xml
  217. +3 −3 android/src/main/res/layout/list_item_account.xml
  218. +21 −16 android/src/main/res/layout/list_item_session_hero_narrow.xml
  219. +21 −15 android/src/main/res/layout/list_item_session_hero_wide.xml
  220. +2 −1 android/src/main/res/layout/map_item_session.xml
  221. +14 −12 android/src/main/res/layout/my_schedule_item.xml
  222. +1 −1 android/src/main/res/layout/nav_header.xml
  223. +1 −1 android/src/main/res/layout/session_detail_frag.xml
  224. +1 −1 android/src/main/res/layout/speaker_detail.xml
  225. +1 −1 android/src/main/res/layout/widget.xml
  226. +1 −1 android/src/main/res/layout/widget_schedule_item.xml
  227. +8 −4 android/src/main/res/menu/explore_io_menu.xml
  228. +0 −39 android/src/main/res/menu/session_livestream.xml
  229. +5 −1 android/src/main/res/values/colors.xml
@@ -82,7 +82,6 @@
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:logo="@drawable/actionbar_logo"
android:supportsRtl="true"
android:theme="@style/Theme.IOSched">

@@ -28,7 +28,6 @@
import com.google.samples.apps.iosched.map.MapActivity;
import com.google.samples.apps.iosched.provider.ScheduleContract;
import com.google.samples.apps.iosched.debug.DebugAction;
import com.google.samples.apps.iosched.util.UIUtils;

/**
* Show a notification that a session is about to start. Simplified version of the one shown at
@@ -62,7 +61,7 @@ public void run(Context context, Callback callback) {
.setContentIntent(pi)
.setPriority(Notification.PRIORITY_MAX)
.setAutoCancel(true);
notifBuilder.addAction(R.drawable.ic_map_holo_dark,
notifBuilder.addAction(R.drawable.ic_stat_map,
context.getString(R.string.title_map),
piMap);

@@ -82,7 +82,7 @@ public View getDropDownView(int position, View convertView, ViewGroup parent) {
mImageLoader.loadImage(AccountUtils.getPlusImageUrl(getContext(), getItem(position).name),
holder.image);
} else {
holder.image.setImageResource(R.drawable.person_image_empty);
holder.image.setImageResource(R.drawable.ic_default_avatar);
}
String email = getItem(position).name;
holder.email.setText(email);
@@ -128,8 +128,8 @@ public void cleanUp() {
*/
public enum NavigationItemEnum {
MY_SCHEDULE(R.id.myschedule_nav_item, R.string.navdrawer_item_my_schedule,
R.drawable.ic_navview_my_schedule, MyScheduleActivity.class),
IO_LIVE(R.id.iolive_nav_item, R.string.navdrawer_item_io_live, R.drawable.ic_navview_play_circle_fill,
R.drawable.ic_navview_schedule, MyScheduleActivity.class),
IO_LIVE(R.id.iolive_nav_item, R.string.navdrawer_item_io_live, R.drawable.ic_navview_live,
null),
EXPLORE(R.id.explore_nav_item, R.string.navdrawer_item_explore,
R.drawable.ic_navview_explore, ExploreIOActivity.class, true),
@@ -141,7 +141,8 @@ public void cleanUp() {
SIGN_IN(R.id.signin_nav_item, R.string.navdrawer_item_sign_in, 0, null),
SETTINGS(R.id.settings_nav_item, R.string.navdrawer_item_settings, R.drawable.ic_navview_settings,
SettingsActivity.class),
ABOUT(R.id.about_nav_item, R.string.description_about, R.drawable.ic_info_outline, AboutActivity.class),
ABOUT(R.id.about_nav_item, R.string.description_about, R.drawable.ic_about,
AboutActivity.class),
DEBUG(R.id.debug_nav_item, R.string.navdrawer_item_debug, R.drawable.ic_navview_settings,
DebugActivity.class),
INVALID(12, 0, 0, null);
@@ -535,12 +535,12 @@ private void notifySession(final long sessionStart, final long alarmOffset) {
.setPriority(Notification.PRIORITY_MAX)
.setAutoCancel(true);
if (minutesLeft > 5) {
notifBuilder.addAction(R.drawable.ic_alarm_holo_dark,
notifBuilder.addAction(R.drawable.ic_stat_alarm,
String.format(res.getString(R.string.snooze_x_min), 5),
createSnoozeIntent(sessionStart, intervalEnd, 5));
}
if (starredCount == 1 && SettingsUtils.isAttendeeAtVenue(this)) {
notifBuilder.addAction(R.drawable.ic_map_holo_dark,
notifBuilder.addAction(R.drawable.ic_stat_map,
res.getString(R.string.title_map),
createRoomMapIntent(singleSessionRoomId));
}
@@ -60,7 +60,7 @@ protected void onCreate(Bundle savedInstanceState) {

final Toolbar toolbar = getToolbar();
toolbar.setNavigationIcon(shouldBeFloatingWindow
? R.drawable.ic_ab_close : R.drawable.ic_up);
? R.drawable.ic_close : R.drawable.ic_up);
toolbar.setNavigationContentDescription(R.string.close_and_go_back);
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
@@ -147,7 +147,7 @@

private float mFABElevation;

private ImageLoader mSpeakersImageLoader, mNoPlaceholderImageLoader;
private ImageLoader mImageLoader;

private Runnable mTimeHintUpdaterRunnable = null;

@@ -300,8 +300,7 @@ private void initViews() {
mAddScheduleButton = (CheckableFloatingActionButton) getActivity()
.findViewById(R.id.add_schedule_button);

mNoPlaceholderImageLoader = new ImageLoader(getContext());
mSpeakersImageLoader = new ImageLoader(getContext(), R.drawable.person_image_empty);
mImageLoader = new ImageLoader(getContext());
}

private ViewTreeObserver.OnGlobalLayoutListener mGlobalLayoutListener
@@ -491,7 +490,7 @@ private void displaySessionData(final SessionDetailModel data) {

if (data.shouldShowHeaderImage()) {
mHasPhoto = true;
mNoPlaceholderImageLoader.loadImage(data.getPhotoUrl(), mPhotoView,
mImageLoader.loadImage(data.getPhotoUrl(), mPhotoView,
new RequestListener<String, Bitmap>() {
@Override
public boolean onException(Exception e, String model, Target<Bitmap> target,
@@ -738,8 +737,8 @@ private void displaySpeakersData(SessionDetailModel data) {
// icon to its left. If only a single icon is displayed, align it to the right.
determineSocialIconPlacement(plusOneIcon, twitterIcon);

if (!TextUtils.isEmpty(speaker.getImageUrl()) && mSpeakersImageLoader != null) {
mSpeakersImageLoader.loadImage(speaker.getImageUrl(), speakerImageView);
if (!TextUtils.isEmpty(speaker.getImageUrl()) && mImageLoader != null) {
mImageLoader.loadImage(speaker.getImageUrl(), speakerImageView);
}

speakerHeaderView.setText(speakerHeader);
@@ -532,7 +532,7 @@ public Toolbar getToolbar() {

private void setToolbarForNavigation() {
if (mToolbar != null) {
mToolbar.setNavigationIcon(R.drawable.ic_ab_drawer);
mToolbar.setNavigationIcon(R.drawable.ic_hamburger);
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -29,6 +29,7 @@
import android.graphics.RectF;
import android.graphics.drawable.Drawable;
import android.support.v4.view.ViewCompat;
import android.support.v7.widget.AppCompatImageView;
import android.util.AttributeSet;
import android.widget.ImageView;

@@ -39,7 +40,7 @@
* drawable on top. This is useful for applying a beveled look to image contents, but is also
* flexible enough for use with other desired aesthetics.
*/
public class BezelImageView extends ImageView {
public class BezelImageView extends AppCompatImageView {
private Paint mBlackPaint;
private Paint mMaskedPaint;

@@ -80,9 +80,7 @@ public static int detectMarkerType(String markerType) {
/**
* Returns the drawable Id of icon to use for a room type.
*/
public static
@DrawableRes
int getRoomIcon(int markerType) {
public static @DrawableRes int getRoomIcon(int markerType) {
switch (markerType) {
case MarkerModel.TYPE_SESSION:
return R.drawable.ic_map_session;
@@ -462,9 +462,7 @@ public static float getProgress(int value, int min, int max) {
return (value - min) / (float) (max - min);
}

public static
@DrawableRes
int getSessionIcon(int sessionType) {
public static @DrawableRes int getSessionIcon(int sessionType) {
switch (sessionType) {
case ScheduleItem.SESSION_TYPE_SESSION:
return R.drawable.ic_session;
@@ -478,9 +476,7 @@ int getSessionIcon(int sessionType) {
}
}

public static
@DrawableRes
int getBreakIcon(String breakTitle) {
public static @DrawableRes int getBreakIcon(String breakTitle) {
if (!TextUtils.isEmpty(breakTitle)) {
if (breakTitle.contains("After")) {
return R.drawable.ic_after_hours;
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2016 Google Inc.
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.
-->

<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">

<path
android:pathData="M12,2C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22C17.52,22 22,17.52 22,12C22,6.48 17.52,2 12,2ZM13.33,15.3C13.378,16.488 12.486,17.989 10.67,18C8.854,18.011 8,16.564 8,15.33C8,14.096 8.984,12.742 10.639,12.711C12.038,12.685 12.026,13.629 12,13.03C11.999,13.018 12,6.049 12,6.049L15.985,6.052L15.979,8L13.33,8C13.33,8 13.33,15.297 13.33,15.3Z"
android:fillColor="@color/dark_icon" />

</vector>
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2016 Google Inc.
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.
-->

<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">

<path
android:pathData="M21.41,11.58L12.41,2.58C12.05,2.22 11.55,2 11,2L4,2C2.9,2 2,2.9 2,4L2,11C2,11.55 2.22,12.05 2.59,12.42L11.59,21.42C11.95,21.78 12.45,22 13,22C13.55,22 14.05,21.78 14.41,21.41L21.41,14.41C21.78,14.05 22,13.55 22,13C22,12.45 21.77,11.94 21.41,11.58L21.41,11.58ZM5.5,7C4.67,7 4,6.33 4,5.5C4,4.67 4.67,4 5.5,4C6.33,4 7,4.67 7,5.5C7,6.33 6.33,7 5.5,7L5.5,7Z"
android:fillColor="@color/dark_icon" />

</vector>
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2016 Google Inc.
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.
-->

<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">

<path
android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"
android:fillColor="@color/dark_icon" />

</vector>
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2016 Google Inc.
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.
-->

<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">

<path
android:pathData="M8.1,13.34l2.83,-2.83L3.91,3.5c-1.56,1.56 -1.56,4.09 0,5.66l4.19,4.18zM14.88,11.53c1.53,0.71 3.68,0.21 5.27,-1.38 1.91,-1.91 2.28,-4.65 0.81,-6.12 -1.46,-1.46 -4.2,-1.1 -6.12,0.81 -1.59,1.59 -2.09,3.74 -1.38,5.27L3.7,19.87l1.41,1.41L12,14.41l6.88,6.88 1.41,-1.41L13.41,13l1.47,-1.47z"
android:fillColor="@color/dark_icon" />

</vector>
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2016 Google Inc.
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.
-->

<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">

<path
android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"
android:fillColor="@color/dark_icon" />

</vector>
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2016 Google Inc.
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.
-->

<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">

<path
android:pathData="M10,9h4L14,6h3l-5,-5 -5,5h3v3zM9,10L6,10L6,7l-5,5 5,5v-3h3v-4zM23,12l-5,-5v3h-3v4h3v3l5,-5zM14,15h-4v3L7,18l5,5 5,-5h-3v-3z"
android:fillColor="@color/dark_icon" />

</vector>
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2016 Google Inc.
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.
-->

<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">

<path
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"
android:fillColor="@color/navview_icon" />

</vector>
Oops, something went wrong.

0 comments on commit 78c5d25

Please sign in to comment.