Tony ca4e6b4b59 resolve merge conflicts of 26b174659 to ub-launcher3-master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifb24f291b096b979044e5c87ec58c24e9c479728

2017-03-30 18:10:05 -07:00

..

add_item_confirmation_activity.xml

Adding support for showing the widget preview based on the provided RemoteViews

2017-03-17 11:25:29 -07:00

all_apps_button.xml

Simplifying some launcher themes

2017-02-16 15:24:37 -08:00

all_apps_discovery_item.xml

Show recently used instant apps provided by the app discovery service

2017-03-23 15:41:17 -07:00

all_apps_discovery_loading_divider.xml

App discovery integration in All Apps search

2017-03-03 13:05:57 -08:00

all_apps_divider.xml

Cleaning up scrollbar logic to properly calculate stable extents.

2016-07-12 12:16:26 -07:00

all_apps_empty_search.xml

Simplifying some launcher themes

2017-02-16 15:24:37 -08:00

all_apps_icon.xml

Removing custom state definition from FastBitmapDrawable

2017-02-23 16:15:25 -08:00

all_apps_search_divider.xml

Cleaning up scrollbar logic to properly calculate stable extents.

2016-07-12 12:16:26 -07:00

all_apps_search_market.xml

Centered all apps search text

2016-07-19 12:21:10 -07:00

all_apps.xml

Simplifying some launcher themes

2017-02-16 15:24:37 -08:00

app_icon.xml

Simplifying some launcher themes

2017-02-16 15:24:37 -08:00

app_widget_resize_frame.xml

Refactoring AppWidgetResizeFrame

2016-10-07 15:16:29 -07:00

appwidget_error.xml

Updating widget tray theme

2017-02-09 10:16:22 -08:00

appwidget_not_ready.xml

Updating the ui for widget restore flow

2014-08-12 16:00:03 -07:00

deep_shortcut.xml

Add support for system shortcuts in popup container

2017-03-30 16:35:56 -07:00

drop_target_bar_horz.xml

Defining HomeScreenElementTheme for elements which appear on top of

2017-02-17 11:37:30 -08:00

drop_target_bar_vert.xml

Defining HomeScreenElementTheme for elements which appear on top of

2017-02-17 11:37:30 -08:00

folder_application.xml

Simplifying some launcher themes

2017-02-16 15:24:37 -08:00

folder_icon.xml

Simplifying some launcher themes

2017-02-16 15:24:37 -08:00

folder_page.xml

Defining various modes for CellLayout: Workspace, Hotseat & Folder

2016-11-21 15:20:16 +05:30

hotseat.xml

Defining HomeScreenElementTheme for elements which appear on top of

2017-02-17 11:37:30 -08:00

notification_footer.xml

Update notification visuals (part 2)

2017-03-02 11:27:16 -08:00

notification_main.xml

Update notification visuals (part 2)

2017-03-02 11:27:16 -08:00

notification.xml

Update notification visuals (part 2)

2017-03-02 11:27:16 -08:00

overview_panel.xml

Defining HomeScreenElementTheme for elements which appear on top of

2017-02-17 11:37:30 -08:00

page_indicator.xml

Defining HomeScreenElementTheme for elements which appear on top of

2017-02-17 11:37:30 -08:00

popup_container.xml

Refactor DeepShortcutsContainer to PopupContainerWithArrow

2017-01-25 11:21:47 -08:00

qsb_blocker_view.xml

Alienating QSB

2016-10-18 11:44:21 +01:00

qsb_container.xml

Alienating QSB

2016-10-18 11:44:21 +01:00

qsb_default_view.xml

Simplifying some launcher themes

2017-02-16 15:24:37 -08:00

shortcuts_item.xml

Merge deep shortcuts in rounded rect

2017-03-01 10:16:16 -08:00

system_shortcut_icon_only.xml

Add support for system shortcuts in popup container

2017-03-30 16:35:56 -07:00

system_shortcut_icons.xml

Add support for system shortcuts in popup container

2017-03-30 16:35:56 -07:00

system_shortcut.xml

Add support for system shortcuts in popup container

2017-03-30 16:35:56 -07:00

user_folder_icon_normalized.xml

Simplifying some launcher themes

2017-02-16 15:24:37 -08:00

user_folder.xml

Simplifying some launcher themes

2017-02-16 15:24:37 -08:00

widget_cell_content.xml

Adding support for showing the widget preview based on the provided RemoteViews

2017-03-17 11:25:29 -07:00

widget_cell.xml

Adding support for showing the widget preview based on the provided RemoteViews

2017-03-17 11:25:29 -07:00

widget_list_divider.xml

Updating widget tray theme

2017-02-09 10:16:22 -08:00

widgets_and_more.xml

Add WidgetsAndMore bottom sheet

2017-03-30 15:48:53 -07:00

widgets_list_row_view.xml

Add support for system shortcuts in popup container

2017-03-30 16:35:56 -07:00

widgets_scroll_container.xml

Add WidgetsAndMore bottom sheet

2017-03-30 15:48:53 -07:00

widgets_view.xml

Updating widget tray theme

2017-02-09 10:16:22 -08:00

workspace_screen.xml

Defining various modes for CellLayout: Workspace, Hotseat & Folder

2016-11-21 15:20:16 +05:30

zzz_dummy_widget.xml

Moving a few testing classes to a separate package

2015-10-07 11:12:38 -07:00

zzz_weight_watcher.xml

Moving a few testing classes to a separate package

2015-10-07 11:12:38 -07:00