From f5c3797996daab596463a348efcc088403aa87f0 Mon Sep 17 00:00:00 2001
From: Nishal Kulkarni <kulknishu@gmail.com>
Date: Thu, 6 May 2021 00:35:44 +0530
Subject: [PATCH 1/4] cc-applications-panel: Update to new layout

These changes make applications panel adhere to the new mockups.
Sidebar is removed instead applications can be searched directly in the
main panel.
---
 panels/applications/cc-applications-panel.c   | 170 ++----
 panels/applications/cc-applications-panel.ui  | 553 +++++++++---------
 panels/applications/cc-applications-row.c     |  29 +-
 panels/applications/cc-applications-row.h     |   3 +-
 panels/applications/cc-applications-row.ui    |  28 +-
 .../gnome-applications-panel.desktop.in       |   1 -
 6 files changed, 347 insertions(+), 437 deletions(-)

diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c
index ea002fd81f..11c2a914d0 100644
--- a/panels/applications/cc-applications-panel.c
+++ b/panels/applications/cc-applications-panel.c
@@ -54,9 +54,11 @@ struct _CcApplicationsPanel
 {
   CcPanel          parent;
 
-  AdwNavigationPage *sidebar_box;
-  GtkListBox      *sidebar_listbox;
-  GtkEntry        *sidebar_search_entry;
+  AdwNavigationView *navigation_view;
+  AdwNavigationPage *app_settings_page;
+  GtkListBox      *app_listbox;
+  GtkEntry        *app_search_entry;
+  GtkWidget       *empty_search_placeholder;
   GAppInfoMonitor *monitor;
   gulong           monitor_id;
 #ifdef HAVE_MALCONTENT
@@ -85,9 +87,6 @@ struct _CcApplicationsPanel
   GSettings       *privacy_settings;
   GSettings       *search_settings;
 
-  GtkStack        *stack;
-  GtkWidget       *empty_box;
-  GtkWidget       *settings_box;
   GtkButton       *install_button;
 
   AdwPreferencesGroup *integration_section;
@@ -995,7 +994,7 @@ unset_cb (CcApplicationsPanel *self,
   GtkListBoxRow *selected;
   GAppInfo *info;
 
-  selected = gtk_list_box_get_selected_row (self->sidebar_listbox);
+  selected = gtk_list_box_get_selected_row (self->app_listbox);
   info = cc_applications_row_get_info (CC_APPLICATIONS_ROW (selected));
 
   type = (const gchar *)g_object_get_data (G_OBJECT (button), "type");
@@ -1110,7 +1109,7 @@ handler_reset_cb (CcApplicationsPanel *self)
   const gchar **types;
   gint i;
 
-  selected = gtk_list_box_get_selected_row (self->sidebar_listbox);
+  selected = gtk_list_box_get_selected_row (self->app_listbox);
   info = cc_applications_row_get_info (CC_APPLICATIONS_ROW (selected));
 
   types = g_app_info_get_supported_types (info);
@@ -1408,17 +1407,15 @@ update_panel (CcApplicationsPanel *self,
 
   if (row == NULL)
     {
-      adw_navigation_page_set_title (ADW_NAVIGATION_PAGE (self), _("Apps"));
-      gtk_stack_set_visible_child (self->stack, self->empty_box);
-      gtk_widget_set_visible (GTK_WIDGET (self->view_details_button), FALSE);
+      g_message ("No application selected, try again");
       return;
     }
 
   info = cc_applications_row_get_info (CC_APPLICATIONS_ROW (row));
 
-  adw_navigation_page_set_title (ADW_NAVIGATION_PAGE (self),
+  adw_navigation_page_set_title (self->app_settings_page,
                                  g_app_info_get_display_name (info));
-  gtk_stack_set_visible_child (self->stack, self->settings_box);
+  adw_navigation_view_push_by_tag(self->navigation_view, "settings-box");
   gtk_widget_set_visible (GTK_WIDGET (self->view_details_button), gnome_software_is_installed ());
 
   g_clear_pointer (&self->current_app_id, g_free);
@@ -1440,13 +1437,19 @@ populate_applications (CcApplicationsPanel *self)
   g_autolist(GObject) infos = NULL;
   GList *l;
 
-  listbox_remove_all (self->sidebar_listbox);
+  listbox_remove_all (self->app_listbox);
+  gtk_list_box_set_placeholder (self->app_listbox, self->empty_search_placeholder);
 #ifdef HAVE_MALCONTENT
   g_signal_handler_block (self->manager, self->app_filter_id);
 #endif
 
   infos = g_app_info_get_all ();
 
+  if (!infos)
+    gtk_widget_set_visible (GTK_WIDGET (self->app_search_entry), 0);
+  else
+    gtk_widget_set_visible (GTK_WIDGET (self->app_search_entry), 1);
+
   for (l = infos; l; l = l->next)
     {
       GAppInfo *info = l->data;
@@ -1462,11 +1465,11 @@ populate_applications (CcApplicationsPanel *self)
 #endif
 
       row = GTK_WIDGET (cc_applications_row_new (info));
-      gtk_list_box_insert (self->sidebar_listbox, row, -1);
+      gtk_list_box_insert (self->app_listbox, row, -1);
 
       id = get_app_id (info);
       if (g_strcmp0 (id, self->current_app_id) == 0)
-        gtk_list_box_select_row (self->sidebar_listbox, GTK_LIST_BOX_ROW (row));
+        gtk_list_box_select_row (self->app_listbox, GTK_LIST_BOX_ROW (row));
     }
 #ifdef HAVE_MALCONTENT
   g_signal_handler_unblock (self->manager, self->app_filter_id);
@@ -1485,8 +1488,8 @@ compare_rows (GtkListBoxRow *row1,
 }
 
 static gboolean
-filter_sidebar_rows (GtkListBoxRow *row,
-                     gpointer       data)
+filter_app_rows (GtkListBoxRow *row,
+                 gpointer       data)
 {
   CcApplicationsPanel *self = CC_APPLICATIONS_PANEL (data);
   g_autofree gchar *app_name = NULL;
@@ -1494,7 +1497,7 @@ filter_sidebar_rows (GtkListBoxRow *row,
   const gchar *text;
   GAppInfo *info;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (self->sidebar_search_entry));
+  text = gtk_editable_get_text (GTK_EDITABLE (self->app_search_entry));
 
   /* Only filter after the second character */
   if (g_utf8_strlen (text, -1) < 2)
@@ -1528,7 +1531,6 @@ row_activated_cb (CcApplicationsPanel *self,
                   GtkListBoxRow       *row)
 {
   update_panel (self, row);
-  g_signal_emit_by_name (self, "sidebar-activated");
 }
 
 static void
@@ -1550,8 +1552,6 @@ on_perm_store_ready (GObject      *source_object,
     }
 
   self->perm_store = proxy;
-
-  update_panel (self, gtk_list_box_get_selected_row (self->sidebar_listbox));
 }
 
 static void
@@ -1561,7 +1561,7 @@ select_app (CcApplicationsPanel *self,
 {
   GtkWidget *child;
 
-  for (child = gtk_widget_get_first_child (GTK_WIDGET (self->sidebar_listbox));
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (self->app_listbox));
        child;
        child = gtk_widget_get_next_sibling (child))
     {
@@ -1569,7 +1569,7 @@ select_app (CcApplicationsPanel *self,
       GAppInfo *info = cc_applications_row_get_info (row);
       if (g_str_has_prefix (g_app_info_get_id (info), app_id))
         {
-          gtk_list_box_select_row (self->sidebar_listbox, GTK_LIST_BOX_ROW (row));
+          gtk_list_box_select_row (self->app_listbox, GTK_LIST_BOX_ROW (row));
           if (emit_activate)
             g_signal_emit_by_name (row, "activate");
           break;
@@ -1600,34 +1600,34 @@ on_launch_button_clicked_cb (CcApplicationsPanel *self)
 }
 
 static void
-on_sidebar_search_entry_activated_cb (CcApplicationsPanel *self)
+on_app_search_entry_activated_cb (CcApplicationsPanel *self)
 {
   GtkListBoxRow *row;
 
-  row = gtk_list_box_get_row_at_y (self->sidebar_listbox, 0);
+  row = gtk_list_box_get_row_at_y (self->app_listbox, 0);
 
   if (!row)
     return;
 
   /* Show the app */
-  gtk_list_box_select_row (self->sidebar_listbox, row);
+  gtk_list_box_select_row (self->app_listbox, row);
   g_signal_emit_by_name (row, "activate");
 
   /* Cleanup the entry */
-  gtk_editable_set_text (GTK_EDITABLE (self->sidebar_search_entry), "");
-  gtk_widget_grab_focus (GTK_WIDGET (self->sidebar_search_entry));
+  gtk_editable_set_text (GTK_EDITABLE (self->app_search_entry), "");
+  gtk_widget_grab_focus (GTK_WIDGET (self->app_search_entry));
 }
 
 static void
-on_sidebar_search_entry_search_changed_cb (CcApplicationsPanel *self)
+on_app_search_entry_search_changed_cb (CcApplicationsPanel *self)
 {
-  gtk_list_box_invalidate_filter (self->sidebar_listbox);
+  gtk_list_box_invalidate_filter (self->app_listbox);
 }
 
 static void
-on_sidebar_search_entry_search_stopped_cb (CcApplicationsPanel *self)
+on_app_search_entry_search_stopped_cb (CcApplicationsPanel *self)
 {
-  gtk_editable_set_text (GTK_EDITABLE (self->sidebar_search_entry), "");
+  gtk_editable_set_text (GTK_EDITABLE (self->app_search_entry), "");
 }
 
 static void
@@ -1718,82 +1718,13 @@ static void
 cc_applications_panel_constructed (GObject *object)
 {
   CcApplicationsPanel *self = CC_APPLICATIONS_PANEL (object);
-  GtkListBoxRow *row;
 
   G_OBJECT_CLASS (cc_applications_panel_parent_class)->constructed (object);
-
-  /* Select the first row */
-  row = gtk_list_box_get_row_at_index (self->sidebar_listbox, 0);
-  gtk_list_box_select_row (self->sidebar_listbox, row);
-}
-
-static void
-notify_collapsed_cb (CcApplicationsPanel *self)
-{
-  GtkSelectionMode selection_mode;
-  gboolean collapsed;
-  GtkRoot *root;
-
-  g_assert (CC_IS_APPLICATIONS_PANEL (self));
-
-  root = gtk_widget_get_root (GTK_WIDGET (self));
-  g_object_get (root, "collapsed", &collapsed, NULL);
-
-  selection_mode = collapsed ? GTK_SELECTION_NONE : GTK_SELECTION_SINGLE;
-
-  gtk_list_box_set_selection_mode (self->sidebar_listbox, selection_mode);
-
-  if (!collapsed)
-    {
-      if (self->current_app_id)
-        select_app (self, self->current_app_id, FALSE);
-      else
-        {
-          GtkListBoxRow *row;
-
-          row = gtk_list_box_get_row_at_index (self->sidebar_listbox, 0);
-          row_activated_cb (self, row);
-        }
-    }
-}
-
-static void
-cc_applications_panel_root (GtkWidget *widget)
-{
-  CcApplicationsPanel *self = CC_APPLICATIONS_PANEL (widget);
-  GtkRoot *root;
-
-  GTK_WIDGET_CLASS (cc_applications_panel_parent_class)->root (widget);
-
-  root = gtk_widget_get_root (widget);
-
-  g_signal_connect_swapped (root, "notify::collapsed", G_CALLBACK (notify_collapsed_cb), self);
-
-  notify_collapsed_cb (self);
-}
-
-static void
-cc_applications_panel_unroot (GtkWidget *widget)
-{
-  CcApplicationsPanel *self = CC_APPLICATIONS_PANEL (widget);
-  GtkRoot *root = gtk_widget_get_root (widget);
-
-  g_signal_handlers_disconnect_by_func (root, notify_collapsed_cb, self);
-
-  GTK_WIDGET_CLASS (cc_applications_panel_parent_class)->unroot (widget);
-}
-
-static AdwNavigationPage*
-cc_applications_panel_get_sidebar_widget (CcPanel *panel)
-{
-  CcApplicationsPanel *self = CC_APPLICATIONS_PANEL (panel);
-  return self->sidebar_box;
 }
 
 static void
 cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
 {
-  CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
@@ -1802,18 +1733,16 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
   object_class->constructed = cc_applications_panel_constructed;
   object_class->set_property = cc_applications_panel_set_property;
 
-  widget_class->root = cc_applications_panel_root;
-  widget_class->unroot = cc_applications_panel_unroot;
-
-  panel_class->get_sidebar_widget = cc_applications_panel_get_sidebar_widget;
-
   g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters");
 
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/applications/cc-applications-panel.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, app);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, app_icon_image);
+  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, app_listbox);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, app_name_label);
+  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, app_search_entry);
+  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, app_settings_page);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, builtin);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, builtin_dialog);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, builtin_page);
@@ -1822,7 +1751,7 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, camera);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, clear_cache_button);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, data);
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, empty_box);
+  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, empty_search_placeholder);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_dialog);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_page);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_file_group);
@@ -1834,6 +1763,7 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, launch_button);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, location);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, microphone);
+  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, navigation_view);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, no_camera);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, no_location);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, no_microphone);
@@ -1844,13 +1774,8 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, wallpaper);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, screenshot);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, shortcuts);
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, sidebar_box);
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, sidebar_listbox);
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, sidebar_search_entry);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, search);
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, settings_box);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, sound);
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, stack);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, storage);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, storage_dialog);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, total);
@@ -1874,11 +1799,12 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, on_builtin_row_activated_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_handler_row_activated_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_launch_button_clicked_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_sidebar_search_entry_activated_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_sidebar_search_entry_search_changed_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_sidebar_search_entry_search_stopped_cb);
+  gtk_widget_class_bind_template_callback (widget_class, on_app_search_entry_activated_cb);
+  gtk_widget_class_bind_template_callback (widget_class, on_app_search_entry_search_changed_cb);
+  gtk_widget_class_bind_template_callback (widget_class, on_app_search_entry_search_stopped_cb);
 
-  gtk_widget_class_bind_template_callback (widget_class, on_storage_row_activated_cb);}
+  gtk_widget_class_bind_template_callback (widget_class, on_storage_row_activated_cb);
+}
 
 static void
 cc_applications_panel_init (CcApplicationsPanel *self)
@@ -1896,7 +1822,7 @@ cc_applications_panel_init (CcApplicationsPanel *self)
 
   gtk_widget_set_visible (GTK_WIDGET (self->install_button), gnome_software_is_installed ());
 
-  g_signal_connect_object (self->sidebar_listbox, "row-activated",
+  g_signal_connect_object (self->app_listbox, "row-activated",
                            G_CALLBACK (row_activated_cb), self, G_CONNECT_SWAPPED);
 
   g_signal_connect_object (self->view_details_button,
@@ -1905,14 +1831,16 @@ cc_applications_panel_init (CcApplicationsPanel *self)
                            self,
                            G_CONNECT_SWAPPED);
 
-  gtk_list_box_set_sort_func (self->sidebar_listbox,
+  gtk_list_box_set_sort_func (self->app_listbox,
                               compare_rows,
                               NULL, NULL);
 
-  gtk_list_box_set_filter_func (self->sidebar_listbox,
-                                filter_sidebar_rows,
+  gtk_list_box_set_filter_func (self->app_listbox,
+                                filter_app_rows,
                                 self, NULL);
 
+  gtk_list_box_set_placeholder (self->app_listbox, self->empty_search_placeholder);
+
   self->location_settings = g_settings_new ("org.gnome.system.location");
   self->privacy_settings = g_settings_new ("org.gnome.desktop.privacy");
   self->search_settings = g_settings_new ("org.gnome.desktop.search-providers");
diff --git a/panels/applications/cc-applications-panel.ui b/panels/applications/cc-applications-panel.ui
index 853a1c3fc8..b5a542c496 100644
--- a/panels/applications/cc-applications-panel.ui
+++ b/panels/applications/cc-applications-panel.ui
@@ -2,330 +2,286 @@
 <interface>
   <template class="CcApplicationsPanel" parent="CcPanel">
     <property name="child">
-      <object class="AdwToolbarView">
-        <child type="top">
-          <object class="AdwHeaderBar"/>
-        </child>
+      <object class="AdwNavigationView" id="navigation_view">
 
-        <property name="content">
-          <object class="GtkStack" id="stack">
-
-            <child>
-              <object class="AdwStatusPage" id="empty_box">
-                <property name="icon-name">org.gnome.Software-symbolic</property>
-                <property name="title" translatable="yes">No Apps</property>
-                <child>
-                  <object class="GtkButton" id="install_button">
-                    <property name="label" translatable="yes">_Install Some…</property>
-                    <property name="use-underline">True</property>
-                    <property name="halign">center</property>
-                    <signal name="clicked" handler="open_software_cb" object="CcApplicationsPanel" swapped="yes"/>
-                    <style>
-                      <class name="pill" />
-                    </style>
-                  </object>
+        <!-- App Search Page (Main Ladning Page) -->
+        <child>
+          <object class="AdwNavigationPage">
+            <property name="title" translatable="yes">Apps</property>
+            <property name="child">
+              <object class="AdwToolbarView">
+                <child type="top">
+                  <object class="AdwHeaderBar"/>
                 </child>
-              </object>
-            </child>
-
-            <child>
-              <object class="AdwPreferencesPage" id="settings_box">
-
-                <!-- App icon & buttons -->
-                <child>
-                  <object class="AdwPreferencesGroup">
 
+                <property name="content">
+                  <object class="AdwPreferencesPage">
+                    <!-- Searchbar -->
                     <child>
-                      <object class="GtkBox">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">18</property>
+                      <object class="AdwPreferencesGroup">
                         <child>
-                          <object class="GtkImage" id="app_icon_image">
-                            <property name="icon-name">org.gnome.Software</property>
-                            <property name="pixel-size">96</property>
-                            <style>
-                              <class name="icon-dropshadow" />
-                            </style>
+                          <object class="AdwClamp">
+                            <property name="maximum-size">280</property>
+                            <child>
+                              <object class="GtkSearchEntry" id="app_search_entry">
+                                <property name="placeholder_text" translatable="yes">Search apps</property>
+                                <signal name="activate" handler="on_app_search_entry_activated_cb" object="CcApplicationsPanel" swapped="yes" />
+                                <signal name="search-changed" handler="on_app_search_entry_search_changed_cb" object="CcApplicationsPanel" swapped="yes" />
+                                <signal name="stop-search" handler="on_app_search_entry_search_stopped_cb" object="CcApplicationsPanel" swapped="yes" />
+                              </object>
+                            </child>
                           </object>
                         </child>
+                      </object>
+                    </child>
 
+                    <!-- Apps List -->
+                    <child>
+                      <object class="AdwPreferencesGroup">
                         <child>
-                          <object class="GtkLabel" id="app_name_label">
-                            <property name="wrap">True</property>
+                          <object class="GtkListBox" id="app_listbox">
+                            <property name="selection-mode">none</property>
                             <style>
-                              <class name="title" />
-                              <class name="title-1" />
+                              <class name="boxed-list" />
                             </style>
                           </object>
                         </child>
+                      </object>
+                    </child>
+
+                  </object>
+                </property>
+              </object>
+            </property>
+          </object>
+        </child>
+
+        <!-- App Settings Page -->
+        <child>
+          <object class="AdwNavigationPage" id="app_settings_page">
+            <property name="title" translatable="yes">App Settings</property>
+            <property name="tag">settings-box</property>
+            <property name="child">
+              <object class="AdwToolbarView">
+                <child type="top">
+                  <object class="AdwHeaderBar"/>
+                </child>
+
+                <property name="content">
+                  <object class="AdwPreferencesPage" id="settings_box">
+                    <!-- App icon & buttons -->
+                    <child>
+                      <object class="AdwPreferencesGroup">
 
                         <child>
                           <object class="GtkBox">
-                            <property name="halign">center</property>
-                            <property name="margin-top">12</property>
-                            <property name="margin-bottom">12</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">18</property>
                             <child>
-                              <object class="GtkButton" id="launch_button">
-                                <property name="label" translatable="yes">_Open</property>
-                                <property name="use-underline">True</property>
-                                <property name="can-shrink">True</property>
-                                <signal name="clicked" handler="on_launch_button_clicked_cb" object="CcApplicationsPanel" swapped="yes" />
+                              <object class="GtkImage" id="app_icon_image">
+                                <property name="icon-name">org.gnome.Software</property>
+                                <property name="pixel-size">96</property>
                                 <style>
-                                  <class name="pill" />
-                                  <class name="suggested-action" />
+                                  <class name="icon-dropshadow" />
                                 </style>
                               </object>
                             </child>
+
                             <child>
-                              <object class="GtkButton" id="view_details_button">
-                                <property name="label" translatable="yes">App _Details</property>
-                                <property name="use-underline">True</property>
-                                <property name="can-shrink">True</property>
+                              <object class="GtkLabel" id="app_name_label">
+                                <property name="wrap">True</property>
                                 <style>
-                                  <class name="pill" />
+                                  <class name="title" />
+                                  <class name="title-1" />
                                 </style>
                               </object>
                             </child>
+
+                            <child>
+                              <object class="GtkBox">
+                                <property name="halign">center</property>
+                                <property name="margin-top">12</property>
+                                <property name="margin-bottom">12</property>
+                                <property name="spacing">18</property>
+                                <child>
+                                  <object class="GtkButton" id="launch_button">
+                                    <property name="label" translatable="yes">_Open</property>
+                                    <property name="use-underline">True</property>
+                                    <property name="can-shrink">True</property>
+                                    <signal name="clicked" handler="on_launch_button_clicked_cb" object="CcApplicationsPanel" swapped="yes" />
+                                    <style>
+                                      <class name="pill" />
+                                      <class name="suggested-action" />
+                                    </style>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="view_details_button">
+                                    <property name="label" translatable="yes">App _Details</property>
+                                    <property name="use-underline">True</property>
+                                    <property name="can-shrink">True</property>
+                                    <style>
+                                      <class name="pill" />
+                                    </style>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
-
-                  </object>
-                </child>
 
-                <child>
-                  <object class="AdwPreferencesGroup" id="integration_section">
-                    <child>
-                      <object class="AdwSwitchRow" id="search">
-                        <property name="title" translatable="yes">Search</property>
-                        <property name="subtitle" translatable="yes">Receive system searches and send results</property>
-                        <signal name="notify::active" handler="search_cb" object="CcApplicationsPanel" swapped="yes"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="CcInfoRow" id="no_search">
-                        <property name="title" translatable="yes">Search</property>
-                        <property name="subtitle" translatable="yes">Receive system searches and send results</property>
-                        <property name="info" translatable="yes">Disabled</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwSwitchRow" id="notification">
-                        <property name="title" translatable="yes">Notifications</property>
-                        <property name="subtitle" translatable="yes">Show system notifications</property>
-                        <signal name="notify::active" handler="notification_cb" object="CcApplicationsPanel" swapped="yes"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwSwitchRow" id="background">
-                        <property name="title" translatable="yes">Run in Background</property>
-                        <property name="subtitle" translatable="yes">Allow activity when the app is closed</property>
-                        <signal name="notify::active" handler="background_cb" swapped="yes"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwSwitchRow" id="screenshot">
-                        <property name="title" translatable="yes">Screenshots</property>
-                        <property name="subtitle" translatable="yes">Take pictures of the screen at any time</property>
-                        <signal name="notify::active" handler="screenshot_cb" object="CcApplicationsPanel" swapped="yes"/>
                       </object>
                     </child>
-                    <child>
-                      <object class="AdwSwitchRow" id="wallpaper">
-                        <property name="title" translatable="yes">Change Wallpaper</property>
-                        <property name="subtitle" translatable="yes">Change the desktop wallpaper.</property>
-                        <signal name="notify::active" handler="wallpaper_cb" swapped="yes"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwSwitchRow" id="sound">
-                        <property name="title" translatable="yes">Sounds</property>
-                        <property name="subtitle" translatable="yes">Reproduce sounds.</property>
-                        <signal name="notify::active" handler="sound_cb" object="CcApplicationsPanel" swapped="yes"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="CcInfoRow" id="no_sound">
-                        <property name="title" translatable="yes">Sounds</property>
-                        <property name="subtitle" translatable="yes">Reproduce sounds</property>
-                        <property name="info" translatable="yes">Disabled</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwSwitchRow" id="shortcuts">
-                        <property name="title" translatable="yes">Inhibit Shortcuts</property>
-                        <property name="subtitle" translatable="yes">Block standard keyboard shortcuts</property>
-                        <signal name="notify::active" handler="shortcuts_cb" swapped="yes"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwSwitchRow" id="camera">
-                        <property name="title" translatable="yes">Camera</property>
-                        <property name="subtitle" translatable="yes">Take pictures with the camera</property>
-                        <signal name="notify::active" handler="camera_cb" object="CcApplicationsPanel" swapped="yes"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="CcInfoRow" id="no_camera">
-                        <property name="title" translatable="yes">Camera</property>
-                        <property name="subtitle" translatable="yes">Take pictures with the camera</property>
-                        <property name="info" translatable="yes">Disabled</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwSwitchRow" id="microphone">
-                        <property name="title" translatable="yes">Microphone</property>
-                        <property name="subtitle" translatable="yes">Record audio with the microphone</property>
-                        <signal name="notify::active" handler="microphone_cb" object="CcApplicationsPanel" swapped="yes"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="CcInfoRow" id="no_microphone">
-                        <property name="title" translatable="yes">Microphone</property>
-                        <property name="subtitle" translatable="yes">Record audio with the microphone</property>
-                        <property name="info" translatable="yes">Disabled</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwSwitchRow" id="location">
-                        <property name="title" translatable="yes">Location Services</property>
-                        <property name="subtitle" translatable="yes">Access device location data</property>
-                        <signal name="notify::active" handler="location_cb" object="CcApplicationsPanel" swapped="yes"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="CcInfoRow" id="no_location">
-                        <property name="title" translatable="yes">Location Services</property>
-                        <property name="subtitle" translatable="yes">Access device location data</property>
-                        <property name="info" translatable="yes">Disabled</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
 
-                <child>
-                  <object class="AdwPreferencesGroup" id="usage_section">
-                    <child>
-                      <object class="CcInfoRow" id="builtin">
-                        <property name="title" translatable="yes">Required Access</property>
-                        <property name="subtitle" translatable="yes">System access that is required by the app</property>
-                        <property name="has-expander">True</property>
-                        <property name="is-link">True</property>
-                        <signal name="activated" handler="on_builtin_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
-                      </object>
-                    </child>
                     <child>
-                      <object class="CcInfoRow" id="handler_row">
-                        <property name="title" translatable="yes">File &amp;amp; Link Associations</property>
-                        <property name="has-expander">True</property>
-                        <property name="is-link">True</property>
-                        <signal name="activated" handler="on_handler_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
+                      <object class="AdwPreferencesGroup" id="integration_section">
+                        <child>
+                          <object class="AdwSwitchRow" id="search">
+                            <property name="title" translatable="yes">Search</property>
+                            <property name="subtitle" translatable="yes">Receive system searches and send results</property>
+                            <signal name="notify::active" handler="search_cb" object="CcApplicationsPanel" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="CcInfoRow" id="no_search">
+                            <property name="title" translatable="yes">Search</property>
+                            <property name="subtitle" translatable="yes">Receive system searches and send results</property>
+                            <property name="info" translatable="yes">Disabled</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwSwitchRow" id="notification">
+                            <property name="title" translatable="yes">Notifications</property>
+                            <property name="subtitle" translatable="yes">Show system notifications</property>
+                            <signal name="notify::active" handler="notification_cb" object="CcApplicationsPanel" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwSwitchRow" id="background">
+                            <property name="title" translatable="yes">Run in Background</property>
+                            <property name="subtitle" translatable="yes">Allow activity when the app is closed</property>
+                            <signal name="notify::active" handler="background_cb" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwSwitchRow" id="screenshot">
+                            <property name="title" translatable="yes">Screenshots</property>
+                            <property name="subtitle" translatable="yes">Take pictures of the screen at any time</property>
+                            <signal name="notify::active" handler="screenshot_cb" object="CcApplicationsPanel" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwSwitchRow" id="wallpaper">
+                            <property name="title" translatable="yes">Change Wallpaper</property>
+                            <property name="subtitle" translatable="yes">Change the desktop wallpaper.</property>
+                            <signal name="notify::active" handler="wallpaper_cb" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwSwitchRow" id="sound">
+                            <property name="title" translatable="yes">Sounds</property>
+                            <property name="subtitle" translatable="yes">Reproduce sounds.</property>
+                            <signal name="notify::active" handler="sound_cb" object="CcApplicationsPanel" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="CcInfoRow" id="no_sound">
+                            <property name="title" translatable="yes">Sounds</property>
+                            <property name="subtitle" translatable="yes">Reproduce sounds</property>
+                            <property name="info" translatable="yes">Disabled</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwSwitchRow" id="shortcuts">
+                            <property name="title" translatable="yes">Inhibit Shortcuts</property>
+                            <property name="subtitle" translatable="yes">Block standard keyboard shortcuts</property>
+                            <signal name="notify::active" handler="shortcuts_cb" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwSwitchRow" id="camera">
+                            <property name="title" translatable="yes">Camera</property>
+                            <property name="subtitle" translatable="yes">Take pictures with the camera</property>
+                            <signal name="notify::active" handler="camera_cb" object="CcApplicationsPanel" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="CcInfoRow" id="no_camera">
+                            <property name="title" translatable="yes">Camera</property>
+                            <property name="subtitle" translatable="yes">Take pictures with the camera</property>
+                            <property name="info" translatable="yes">Disabled</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwSwitchRow" id="microphone">
+                            <property name="title" translatable="yes">Microphone</property>
+                            <property name="subtitle" translatable="yes">Record audio with the microphone</property>
+                            <signal name="notify::active" handler="microphone_cb" object="CcApplicationsPanel" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="CcInfoRow" id="no_microphone">
+                            <property name="title" translatable="yes">Microphone</property>
+                            <property name="subtitle" translatable="yes">Record audio with the microphone</property>
+                            <property name="info" translatable="yes">Disabled</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwSwitchRow" id="location">
+                            <property name="title" translatable="yes">Location Services</property>
+                            <property name="subtitle" translatable="yes">Access device location data</property>
+                            <signal name="notify::active" handler="location_cb" object="CcApplicationsPanel" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="CcInfoRow" id="no_location">
+                            <property name="title" translatable="yes">Location Services</property>
+                            <property name="subtitle" translatable="yes">Access device location data</property>
+                            <property name="info" translatable="yes">Disabled</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
+             
                     <child>
-                      <object class="CcInfoRow" id="storage">
-                        <property name="title" translatable="yes">Storage</property>
-                        <property name="has-expander">1</property>
-                        <property name="is-link">1</property>
-                        <signal name="activated" handler="on_storage_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
+                      <object class="AdwPreferencesGroup" id="usage_section">
+                        <child>
+                          <object class="CcInfoRow" id="builtin">
+                            <property name="title" translatable="yes">Required Access</property>
+                            <property name="subtitle" translatable="yes">System access that is required by the app</property>
+                            <property name="has-expander">True</property>
+                            <property name="is-link">True</property>
+                            <signal name="activated" handler="on_builtin_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
+                          </object>
+                        </child>
+                        <child>
+                          <object class="CcInfoRow" id="handler_row">
+                            <property name="title" translatable="yes">File &amp;amp; Link Associations</property>
+                            <property name="has-expander">True</property>
+                            <property name="is-link">True</property>
+                            <signal name="activated" handler="on_handler_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
+                          </object>
+                        </child>
+                        <child>
+                          <object class="CcInfoRow" id="storage">
+                            <property name="title" translatable="yes">Storage</property>
+                            <property name="has-expander">1</property>
+                            <property name="is-link">1</property>
+                            <signal name="activated" handler="on_storage_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </property>
-      </object>
-    </property>
-  </template>
-
-  <!-- Sidebar -->
-  <object class="AdwNavigationPage" id="sidebar_box">
-    <property name="title" translatable="yes">Apps</property>
-    <property name="child">
-      <object class="AdwToolbarView">
-        <child type="top">
-          <object class="AdwHeaderBar"/>
-        </child>
-        <child type="top">
-          <object class="AdwBin">
-            <style>
-              <class name="toolbar"/>
-            </style>
-            <property name="child">
-              <object class="GtkSearchEntry" id="sidebar_search_entry">
-                <property name="placeholder_text" translatable="yes">Search apps</property>
-                <signal name="activate" handler="on_sidebar_search_entry_activated_cb" object="CcApplicationsPanel" swapped="yes" />
-                <signal name="search-changed" handler="on_sidebar_search_entry_search_changed_cb" object="CcApplicationsPanel" swapped="yes" />
-                <signal name="stop-search" handler="on_sidebar_search_entry_search_stopped_cb" object="CcApplicationsPanel" swapped="yes" />
+                </property>
               </object>
             </property>
           </object>
         </child>
-        <property name="content">
-          <object class="GtkScrolledWindow">
-            <property name="hscrollbar-policy">never</property>
-            <property name="child">
-              <object class="GtkListBox" id="sidebar_listbox">
-                <property name="selection-mode">browse</property>
-                <style>
-                  <class name="navigation-sidebar" />
-                </style>
 
-                <child type="placeholder">
-                  <object class="GtkBox" id="empty_search_placeholder">
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <property name="margin-top">18</property>
-                    <property name="margin-bottom">18</property>
-                    <property name="margin-start">18</property>
-                    <property name="margin-end">18</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="can_focus">False</property>
-                        <property name="pixel_size">64</property>
-                        <property name="icon_name">edit-find-symbolic</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">No results found</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                          <attribute name="scale" value="1.44"/>
-                        </attributes>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Try a different search</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </property>
-          </object>
-        </property>
       </object>
     </property>
-  </object>
+  </template>
 
   <!-- Built-in Permissions dialog -->
   <object class="AdwWindow" id="builtin_dialog">
@@ -508,6 +464,49 @@
     </property>
   </object>
 
+  <!-- Empty search results placeholder -->
+  <object class="GtkBox" id="empty_search_placeholder">
+    <property name="halign">center</property>
+    <property name="valign">center</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="margin-top">32</property>
+    <property name="margin-bottom">32</property>
+    <property name="margin-start">32</property>
+    <property name="margin-end">32</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">18</property>
+    <child>
+      <object class="GtkImage">
+        <property name="pixel_size">96</property>
+        <property name="icon_name">org.gnome.Software-symbolic</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel">
+        <property name="label" translatable="yes">No Apps Found</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+          <attribute name="scale" value="1.44"/>
+        </attributes>
+      </object>
+    </child>
+    <child>
+      <object class="GtkButton" id="install_button">
+        <property name="label" translatable="yes">_Install Some…</property>
+        <property name="use_underline">True</property>
+        <property name="halign">center</property>
+        <signal name="clicked" handler="open_software_cb" object="CcApplicationsPanel" swapped="yes"/>
+        <style>
+          <class name="pill" />
+        </style>
+      </object>
+    </child>
+  </object>
+
   <object class="GtkSizeGroup">
     <property name="mode">horizontal</property>
     <widgets>
diff --git a/panels/applications/cc-applications-row.c b/panels/applications/cc-applications-row.c
index db1d4b557a..98e42ccbef 100644
--- a/panels/applications/cc-applications-row.c
+++ b/panels/applications/cc-applications-row.c
@@ -26,17 +26,13 @@
 
 struct _CcApplicationsRow
 {
-  GtkListBoxRow parent;
+  AdwActionRow  parent;
 
   GAppInfo     *info;
   gchar        *sortkey;
-
-  GtkWidget    *box;
-  GtkWidget    *image;
-  GtkWidget    *label;
 };
 
-G_DEFINE_TYPE (CcApplicationsRow, cc_applications_row, GTK_TYPE_LIST_BOX_ROW)
+G_DEFINE_TYPE (CcApplicationsRow, cc_applications_row, ADW_TYPE_ACTION_ROW)
 
 static void
 cc_applications_row_finalize (GObject *object)
@@ -58,10 +54,6 @@ cc_applications_row_class_init (CcApplicationsRowClass *klass)
   object_class->finalize = cc_applications_row_finalize;
 
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/applications/cc-applications-row.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsRow, box);
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsRow, image);
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsRow, label);
 }
 
 static void
@@ -75,7 +67,8 @@ cc_applications_row_new (GAppInfo *info)
 {
   CcApplicationsRow *self;
   g_autofree gchar *key = NULL;
-  GIcon *icon;
+  g_autoptr(GIcon) icon = NULL;
+  GtkWidget *w;
 
   self = g_object_new (CC_TYPE_APPLICATIONS_ROW, NULL);
 
@@ -84,13 +77,19 @@ cc_applications_row_new (GAppInfo *info)
   key = g_utf8_casefold (g_app_info_get_display_name (info), -1);
   self->sortkey = g_utf8_collate_key (key, -1);
 
+  gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (self), TRUE);
+  adw_preferences_row_set_title (ADW_PREFERENCES_ROW (self),
+                                 g_markup_escape_text (g_app_info_get_display_name (info), -1));
+
   icon = g_app_info_get_icon (info);
   if (icon != NULL)
-    gtk_image_set_from_gicon (GTK_IMAGE (self->image), g_app_info_get_icon (info));
+    g_object_ref (icon);
   else
-    gtk_image_set_from_icon_name (GTK_IMAGE (self->image), "application-x-executable");
-
-  gtk_label_set_label (GTK_LABEL (self->label), g_app_info_get_display_name (info));
+    icon = g_themed_icon_new ("application-x-executable");
+  w = gtk_image_new_from_gicon (icon);
+  gtk_style_context_add_class (gtk_widget_get_style_context (w), "lowres-icon");
+  gtk_image_set_icon_size (GTK_IMAGE (w), GTK_ICON_SIZE_LARGE);
+  adw_action_row_add_prefix (ADW_ACTION_ROW (self), w);
 
   return self;
 }
diff --git a/panels/applications/cc-applications-row.h b/panels/applications/cc-applications-row.h
index 7ca44e1acf..3b2a0ba639 100644
--- a/panels/applications/cc-applications-row.h
+++ b/panels/applications/cc-applications-row.h
@@ -21,11 +21,12 @@
 #pragma once
 
 #include <gtk/gtk.h>
+#include <adwaita.h>
 
 G_BEGIN_DECLS
 
 #define CC_TYPE_APPLICATIONS_ROW (cc_applications_row_get_type())
-G_DECLARE_FINAL_TYPE (CcApplicationsRow, cc_applications_row, CC, APPLICATIONS_ROW, GtkListBoxRow)
+G_DECLARE_FINAL_TYPE (CcApplicationsRow, cc_applications_row, CC, APPLICATIONS_ROW, AdwActionRow)
 
 CcApplicationsRow* cc_applications_row_new          (GAppInfo          *info);
 
diff --git a/panels/applications/cc-applications-row.ui b/panels/applications/cc-applications-row.ui
index 5bd6e09319..856f673f54 100644
--- a/panels/applications/cc-applications-row.ui
+++ b/panels/applications/cc-applications-row.ui
@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="CcApplicationsRow" parent="GtkListBoxRow">
-    <child>
-      <object class="GtkBox" id="box">
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">6</property>
-        <property name="margin-start">6</property>
-        <property name="margin-end">6</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkImage" id="image">
-            <property name="pixel-size">32</property>
-            <style>
-              <class name="lowres-icon"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label">
-            <property name="xalign">0</property>
-            <property name="ellipsize">end</property>
-          </object>
-        </child>
+  <template class="CcApplicationsRow" parent="AdwActionRow">
+
+    <child type="suffix">
+      <object class="GtkImage">
+        <property name="icon-name">go-next-symbolic</property>
       </object>
     </child>
+
   </template>
 </interface>
diff --git a/panels/applications/gnome-applications-panel.desktop.in b/panels/applications/gnome-applications-panel.desktop.in
index bf817e8d0e..ca5bc5c4e9 100644
--- a/panels/applications/gnome-applications-panel.desktop.in
+++ b/panels/applications/gnome-applications-panel.desktop.in
@@ -13,4 +13,3 @@ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-Acc
 OnlyShowIn=GNOME;Unity;
 # Translators: Search terms to find the Apps panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=application;flatpak;permission;setting;
-X-GNOME-ControlCenter-HasSidebar=true
-- 
GitLab


From b592bd9d4e2b1d9c65a42bc79873c7cfa4d68a87 Mon Sep 17 00:00:00 2001
From: Nishal Kulkarni <kulknishu@gmail.com>
Date: Thu, 6 May 2021 00:45:15 +0530
Subject: [PATCH 2/4] cc-removable-media-panel: Add convenience function

As a part of moving removable media panel under applications, we create
a function `cc_removable_media_panel_new` which return a GtkWidget
that can be added to GtkStack inside applications panel.
---
 panels/removable-media/cc-removable-media-panel.c | 7 +++++++
 panels/removable-media/cc-removable-media-panel.h | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/panels/removable-media/cc-removable-media-panel.c b/panels/removable-media/cc-removable-media-panel.c
index 460cdc53ad..835d261a0d 100644
--- a/panels/removable-media/cc-removable-media-panel.c
+++ b/panels/removable-media/cc-removable-media-panel.c
@@ -538,3 +538,10 @@ cc_removable_media_panel_init (CcRemovableMediaPanel *self)
 
   info_panel_setup_media (self);
 }
+
+GtkWidget *
+cc_removable_media_panel_new (void)
+{
+  return g_object_new (CC_TYPE_REMOVABLE_MEDIA_PANEL,
+                       NULL);
+}
\ No newline at end of file
diff --git a/panels/removable-media/cc-removable-media-panel.h b/panels/removable-media/cc-removable-media-panel.h
index f6d4b53ae3..ca750728ea 100644
--- a/panels/removable-media/cc-removable-media-panel.h
+++ b/panels/removable-media/cc-removable-media-panel.h
@@ -26,4 +26,6 @@ G_BEGIN_DECLS
 #define CC_TYPE_REMOVABLE_MEDIA_PANEL (cc_removable_media_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcRemovableMediaPanel, cc_removable_media_panel, CC, REMOVABLE_MEDIA_PANEL, CcPanel)
 
+GtkWidget *cc_removable_media_panel_new (void);
+
 G_END_DECLS
-- 
GitLab


From 20eda27bb96cba727c911c375c0936743a88b79d Mon Sep 17 00:00:00 2001
From: Nishal Kulkarni <kulknishu@gmail.com>
Date: Thu, 6 May 2021 00:51:58 +0530
Subject: [PATCH 3/4] applications: Move default app and removable media

Currently setting's panel list is over-populated. We can fix this by
moving some of the settings inside other panels as sub-panels.

Created a new row in applications panel for removable media and
default apps. On selecting the row we show the respective settings
which is same as before.

Removed default app and removable media from sidebar

Closes: #1092 #1096
Related to: #1090
---
 .../applications/applications.gresource.xml   |   2 +
 panels/applications/cc-applications-panel.c   |  13 +-
 panels/applications/cc-applications-panel.ui  |  44 +++
 .../cc-default-apps-page.c}                   |  43 +--
 .../cc-default-apps-page.h}                   |   8 +-
 panels/applications/cc-default-apps-page.ui   |  69 ++++
 .../cc-default-apps-row.c                     |   4 +-
 .../cc-default-apps-row.h                     |   0
 .../cc-removable-media-settings.c}            | 133 +++----
 .../cc-removable-media-settings.h}            |   8 +-
 .../cc-removable-media-settings.ui            | 311 +++++++++++++++++
 .../gnome-applications-panel.desktop.in       |   2 +-
 panels/applications/icons/meson.build         |  10 +
 ...g.gnome.Settings-default-apps-symbolic.svg |   0
 ...nome.Settings-removable-media-symbolic.svg |   0
 panels/applications/meson.build               |  14 +
 panels/default-apps/cc-default-apps-panel.ui  |  85 -----
 .../default-apps/default-apps.gresource.xml   |   6 -
 .../gnome-default-apps-panel.desktop.in       |  14 -
 panels/default-apps/icons/meson.build         |   4 -
 panels/default-apps/meson.build               |  38 --
 panels/meson.build                            |   2 -
 .../cc-removable-media-panel.ui               | 329 ------------------
 .../gnome-removable-media-panel.desktop.in    |  14 -
 panels/removable-media/icons/meson.build      |   4 -
 panels/removable-media/meson.build            |  36 --
 .../removable-media.gresource.xml             |   6 -
 shell/cc-panel-list.c                         |   2 -
 shell/cc-panel-loader.c                       |   4 -
 29 files changed, 558 insertions(+), 647 deletions(-)
 rename panels/{default-apps/cc-default-apps-panel.c => applications/cc-default-apps-page.c} (80%)
 rename panels/{default-apps/cc-default-apps-panel.h => applications/cc-default-apps-page.h} (76%)
 create mode 100644 panels/applications/cc-default-apps-page.ui
 rename panels/{default-apps => applications}/cc-default-apps-row.c (97%)
 rename panels/{default-apps => applications}/cc-default-apps-row.h (100%)
 rename panels/{removable-media/cc-removable-media-panel.c => applications/cc-removable-media-settings.c} (83%)
 rename panels/{removable-media/cc-removable-media-panel.h => applications/cc-removable-media-settings.h} (73%)
 create mode 100644 panels/applications/cc-removable-media-settings.ui
 rename panels/{default-apps => applications}/icons/scalable/org.gnome.Settings-default-apps-symbolic.svg (100%)
 rename panels/{removable-media => applications}/icons/scalable/org.gnome.Settings-removable-media-symbolic.svg (100%)
 delete mode 100644 panels/default-apps/cc-default-apps-panel.ui
 delete mode 100644 panels/default-apps/default-apps.gresource.xml
 delete mode 100644 panels/default-apps/gnome-default-apps-panel.desktop.in
 delete mode 100644 panels/default-apps/icons/meson.build
 delete mode 100644 panels/default-apps/meson.build
 delete mode 100644 panels/removable-media/cc-removable-media-panel.ui
 delete mode 100644 panels/removable-media/gnome-removable-media-panel.desktop.in
 delete mode 100644 panels/removable-media/icons/meson.build
 delete mode 100644 panels/removable-media/meson.build
 delete mode 100644 panels/removable-media/removable-media.gresource.xml

diff --git a/panels/applications/applications.gresource.xml b/panels/applications/applications.gresource.xml
index f48d98f0d6..7a869ee8b9 100644
--- a/panels/applications/applications.gresource.xml
+++ b/panels/applications/applications.gresource.xml
@@ -2,6 +2,8 @@
 <gresources>
   <gresource prefix="/org/gnome/control-center/applications">
     <file preprocess="xml-stripblanks">cc-applications-panel.ui</file>
+    <file preprocess="xml-stripblanks">cc-default-apps-page.ui</file>
+    <file preprocess="xml-stripblanks">cc-removable-media-settings.ui</file>
     <file preprocess="xml-stripblanks">cc-applications-row.ui</file>
     <file preprocess="xml-stripblanks">cc-info-row.ui</file>
     <file preprocess="xml-stripblanks">cc-snap-row.ui</file>
diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c
index 11c2a914d0..da0b34b2c6 100644
--- a/panels/applications/cc-applications-panel.c
+++ b/panels/applications/cc-applications-panel.c
@@ -35,6 +35,8 @@
 #include "cc-applications-panel.h"
 #include "cc-applications-row.h"
 #include "cc-info-row.h"
+#include "cc-default-apps-page.h"
+#include "cc-removable-media-settings.h"
 #include "cc-applications-resources.h"
 #include "cc-util.h"
 #ifdef HAVE_SNAP
@@ -53,6 +55,8 @@
 struct _CcApplicationsPanel
 {
   CcPanel          parent;
+  CcDefaultAppsPage *default_apps_page;
+  CcRemovableMediaSettings *removable_media_settings;
 
   AdwNavigationView *navigation_view;
   AdwNavigationPage *app_settings_page;
@@ -1407,7 +1411,7 @@ update_panel (CcApplicationsPanel *self,
 
   if (row == NULL)
     {
-      g_message ("No application selected, try again");
+      g_message ("No app selected, try again");
       return;
     }
 
@@ -1596,7 +1600,7 @@ on_launch_button_clicked_cb (CcApplicationsPanel *self)
                      &error);
 
   if (error)
-    g_warning ("Error launching application: %s", error->message);
+    g_warning ("Error launching app: %s", error->message);
 }
 
 static void
@@ -1728,6 +1732,9 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
+  g_type_ensure (CC_TYPE_DEFAULT_APPS_PAGE);
+  g_type_ensure (CC_TYPE_REMOVABLE_MEDIA_SETTINGS);
+
   object_class->dispose = cc_applications_panel_dispose;
   object_class->finalize = cc_applications_panel_finalize;
   object_class->constructed = cc_applications_panel_constructed;
@@ -1751,6 +1758,7 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, camera);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, clear_cache_button);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, data);
+  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, default_apps_page);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, empty_search_placeholder);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_dialog);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_page);
@@ -1772,6 +1780,7 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, notification);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, background);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, wallpaper);
+  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, removable_media_settings);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, screenshot);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, shortcuts);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, search);
diff --git a/panels/applications/cc-applications-panel.ui b/panels/applications/cc-applications-panel.ui
index b5a542c496..66ed85db16 100644
--- a/panels/applications/cc-applications-panel.ui
+++ b/panels/applications/cc-applications-panel.ui
@@ -35,6 +35,21 @@
                       </object>
                     </child>
 
+                    <!-- Default Apps Row -->
+                    <child>
+                      <object class="AdwPreferencesGroup">
+                        <child>
+                          <object class="CcListRow">
+                            <property name="activatable">True</property>
+                            <property name="title" translatable="yes">Default Apps</property>
+                            <property name="show-arrow">True</property>
+                            <property name="action-name">navigation.push</property>
+                            <property name="action-target">'default-apps'</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+
                     <!-- Apps List -->
                     <child>
                       <object class="AdwPreferencesGroup">
@@ -56,6 +71,35 @@
           </object>
         </child>
 
+        <!-- Default Apps Page -->
+        <child>
+          <object class="AdwNavigationPage">
+            <property name="title" translatable="yes">Default Apps</property>
+            <property name="tag">default-apps</property>
+            <property name="child">
+              <object class="AdwToolbarView">
+                <child type="top">
+                  <object class="AdwHeaderBar"/>
+                </child>
+
+                <property name="content">
+                  <object class="AdwPreferencesPage">
+                    <!-- Default Apps Settings -->
+                    <child>
+                      <object class="CcDefaultAppsPage" id="default_apps_page" />
+                    </child>
+
+                    <!-- Removable Media Settings -->
+                    <child>
+                      <object class="CcRemovableMediaSettings" id="removable_media_settings" />
+                    </child>
+                  </object>
+                </property>
+              </object>
+            </property>
+          </object>
+        </child>
+
         <!-- App Settings Page -->
         <child>
           <object class="AdwNavigationPage" id="app_settings_page">
diff --git a/panels/default-apps/cc-default-apps-panel.c b/panels/applications/cc-default-apps-page.c
similarity index 80%
rename from panels/default-apps/cc-default-apps-panel.c
rename to panels/applications/cc-default-apps-page.c
index 35a011671c..51c507abfe 100644
--- a/panels/default-apps/cc-default-apps-panel.c
+++ b/panels/applications/cc-default-apps-page.c
@@ -24,9 +24,8 @@
 #include <libmm-glib.h>
 #endif
 
-#include "cc-default-apps-panel.h"
+#include "cc-default-apps-page.h"
 #include "cc-default-apps-row.h"
-#include "cc-default-apps-resources.h"
 
 #include "shell/cc-object-storage.h"
 
@@ -39,11 +38,9 @@ typedef struct
   const char *extra_type_filter;
 } DefaultAppData;
 
-struct _CcDefaultAppsPanel
+struct _CcDefaultAppsPage
 {
-  CcPanel    parent_instance;
-
-  GtkWidget *default_apps_grid;
+  AdwPreferencesGroup  parent;
 
   GtkWidget *web_row;
   GtkWidget *mail_row;
@@ -60,11 +57,11 @@ struct _CcDefaultAppsPanel
 };
 
 
-G_DEFINE_TYPE (CcDefaultAppsPanel, cc_default_apps_panel, CC_TYPE_PANEL)
+G_DEFINE_TYPE (CcDefaultAppsPage, cc_default_apps_page, ADW_TYPE_PREFERENCES_GROUP)
 
 #ifdef BUILD_WWAN
 static void
-update_modem_apps_visibility (CcDefaultAppsPanel *self)
+update_modem_apps_visibility (CcDefaultAppsPage *self)
 {
   GList *devices;
   gboolean has_mm_objects;
@@ -80,26 +77,24 @@ update_modem_apps_visibility (CcDefaultAppsPanel *self)
 #endif
 
 static void
-cc_default_apps_panel_class_init (CcDefaultAppsPanelClass *klass)
+cc_default_apps_page_class_init (CcDefaultAppsPageClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/default-apps/cc-default-apps-panel.ui");
-  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPanel, web_row);
-  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPanel, mail_row);
-  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPanel, calendar_row);
-  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPanel, music_row);
-  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPanel, video_row);
-  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPanel, photos_row);
-  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPanel, calls_row);
-  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPanel, sms_row);
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/applications/cc-default-apps-page.ui");
+  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPage, web_row);
+  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPage, mail_row);
+  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPage, calendar_row);
+  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPage, music_row);
+  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPage, video_row);
+  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPage, photos_row);
+  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPage, calls_row);
+  gtk_widget_class_bind_template_child (widget_class, CcDefaultAppsPage, sms_row);
 }
 
 static void
-cc_default_apps_panel_init (CcDefaultAppsPanel *self)
+cc_default_apps_page_init (CcDefaultAppsPage *self)
 {
-  g_resources_register (cc_default_apps_get_resource ());
-
   g_type_ensure (CC_TYPE_DEFAULT_APPS_ROW);
 
   gtk_widget_init_template (GTK_WIDGET (self));
@@ -119,9 +114,9 @@ cc_default_apps_panel_init (CcDefaultAppsPanel *self)
 #endif
 }
 
-GtkWidget *
-cc_default_apps_panel_new (void)
+CcDefaultAppsPage *
+cc_default_apps_page_new (void)
 {
-  return g_object_new (CC_TYPE_DEFAULT_APPS_PANEL,
+  return g_object_new (CC_TYPE_DEFAULT_APPS_PAGE,
                        NULL);
 }
diff --git a/panels/default-apps/cc-default-apps-panel.h b/panels/applications/cc-default-apps-page.h
similarity index 76%
rename from panels/default-apps/cc-default-apps-panel.h
rename to panels/applications/cc-default-apps-page.h
index 4aca17bfde..daf05c0675 100644
--- a/panels/default-apps/cc-default-apps-panel.h
+++ b/panels/applications/cc-default-apps-page.h
@@ -19,13 +19,13 @@
 
 #pragma once
 
-#include <shell/cc-panel.h>
+#include <adwaita.h>
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_DEFAULT_APPS_PANEL (cc_default_apps_panel_get_type ())
-G_DECLARE_FINAL_TYPE (CcDefaultAppsPanel, cc_default_apps_panel, CC, DEFAULT_APPS_PANEL, CcPanel)
+#define CC_TYPE_DEFAULT_APPS_PAGE (cc_default_apps_page_get_type ())
+G_DECLARE_FINAL_TYPE (CcDefaultAppsPage, cc_default_apps_page, CC, DEFAULT_APPS_PAGE, AdwPreferencesGroup)
 
-GtkWidget *cc_default_apps_panel_new (void);
+CcDefaultAppsPage *cc_default_apps_page_new (void);
 
 G_END_DECLS
diff --git a/panels/applications/cc-default-apps-page.ui b/panels/applications/cc-default-apps-page.ui
new file mode 100644
index 0000000000..d23a9777d3
--- /dev/null
+++ b/panels/applications/cc-default-apps-page.ui
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="CcDefaultAppsPage" parent="AdwPreferencesGroup">   
+    <property name="title" translatable="yes">Links &amp;amp; Files</property>
+    <property name="description" translatable="yes">Apps which are used to open common links and files</property>
+    <child>
+      <object class="CcDefaultAppsRow" id="web_row">
+        <property name="title" translatable="yes">_Web</property>
+        <property name="use-underline">True</property>
+        <property name="content-type">x-scheme-handler/http</property>
+        <property name="filters">text/html;application/xhtml+xml;x-scheme-handler/https</property>
+      </object>
+    </child>
+    <child>
+      <object class="CcDefaultAppsRow" id="mail_row">
+        <property name="title" translatable="yes">_Mail</property>
+        <property name="use_underline">True</property>
+        <property name="content-type">x-scheme-handler/mailto</property>
+      </object>
+    </child>
+    <child>
+      <object class="CcDefaultAppsRow" id="calendar_row">
+        <property name="title" translatable="yes">_Calendar</property>
+        <property name="use-underline">True</property>
+        <property name="content-type">text/calendar</property>
+      </object>
+    </child>
+    <child>
+      <object class="CcDefaultAppsRow" id="music_row">
+        <property name="title" translatable="yes">M_usic</property>
+        <property name="use-underline">True</property>
+        <property name="content-type">audio/x-vorbis+ogg</property>
+        <property name="filters">audio/*</property>
+      </object>
+    </child>
+    <child>
+      <object class="CcDefaultAppsRow" id="video_row">
+        <property name="title" translatable="yes">_Video</property>
+        <property name="use-underline">True</property>
+        <property name="content-type">video/x-ogm+ogg</property>
+        <property name="filters">video/*</property>
+      </object>
+    </child>
+    <child>
+      <object class="CcDefaultAppsRow" id="photos_row">
+        <property name="title" translatable="yes">_Photos</property>
+        <property name="use-underline">True</property>
+        <property name="content-type">image/jpeg</property>
+        <property name="filters">image/*</property>
+      </object>
+    </child>
+    <child>
+      <object class="CcDefaultAppsRow" id="calls_row">
+        <property name="visible">False</property>
+        <property name="title" translatable="yes" comments="Translators: This is a telephone call">_Calls</property>
+        <property name="use-underline">True</property>
+        <property name="content-type">x-scheme-handler/tel</property>
+      </object>
+    </child>
+    <child>
+      <object class="CcDefaultAppsRow" id="sms_row">
+        <property name="visible">False</property>
+        <property name="title" translatable="yes">_SMS</property>
+        <property name="use-underline">True</property>
+        <property name="content-type">x-scheme-handler/sms</property>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/panels/default-apps/cc-default-apps-row.c b/panels/applications/cc-default-apps-row.c
similarity index 97%
rename from panels/default-apps/cc-default-apps-row.c
rename to panels/applications/cc-default-apps-row.c
index 64464b1123..10845b5bbe 100644
--- a/panels/default-apps/cc-default-apps-row.c
+++ b/panels/applications/cc-default-apps-row.c
@@ -55,7 +55,7 @@ notify_selected_item_cb (CcDefaultAppsRow *self)
 
   if (g_app_info_set_as_default_for_type (info, self->content_type, &error) == FALSE)
     {
-      g_warning ("Failed to set '%s' as the default application for '%s': %s",
+      g_warning ("Failed to set '%s' as the default app for '%s': %s",
                  g_app_info_get_name (info), self->content_type, error->message);
     }
   else
@@ -96,7 +96,7 @@ notify_selected_item_cb (CcDefaultAppsRow *self)
 
           if (g_app_info_set_as_default_for_type (info, mime_types[i], &local_error) == FALSE)
             {
-              g_warning ("Failed to set '%s' as the default application for secondary "
+              g_warning ("Failed to set '%s' as the default app for secondary "
                          "content type '%s': %s",
                          g_app_info_get_name (info), mime_types[i], local_error->message);
             }
diff --git a/panels/default-apps/cc-default-apps-row.h b/panels/applications/cc-default-apps-row.h
similarity index 100%
rename from panels/default-apps/cc-default-apps-row.h
rename to panels/applications/cc-default-apps-row.h
diff --git a/panels/removable-media/cc-removable-media-panel.c b/panels/applications/cc-removable-media-settings.c
similarity index 83%
rename from panels/removable-media/cc-removable-media-panel.c
rename to panels/applications/cc-removable-media-settings.c
index 835d261a0d..2df61a3342 100644
--- a/panels/removable-media/cc-removable-media-panel.c
+++ b/panels/applications/cc-removable-media-settings.c
@@ -24,8 +24,10 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include "cc-removable-media-panel.h"
-#include "cc-removable-media-resources.h"
+#include <shell/cc-panel.h>
+
+#include "cc-applications-panel.h"
+#include "cc-removable-media-settings.h"
 
 /* Autorun options */
 #define PREF_MEDIA_AUTORUN_NEVER                "autorun-never"
@@ -39,9 +41,9 @@
 
 #define MEDIA_HANDLING_SCHEMA "org.gnome.desktop.media-handling"
 
-struct _CcRemovableMediaPanel
+struct _CcRemovableMediaSettings
 {
-  CcPanel              parent_instance;
+  AdwPreferencesGroup  parent;
 
   GtkAppChooserButton *audio_cdda_chooser;
   GtkCheckButton      *autorun_never_checkbutton;
@@ -62,7 +64,7 @@ struct _CcRemovableMediaPanel
 };
 
 
-G_DEFINE_TYPE (CcRemovableMediaPanel, cc_removable_media_panel, CC_TYPE_PANEL)
+G_DEFINE_TYPE (CcRemovableMediaSettings, cc_removable_media_settings, ADW_TYPE_PREFERENCES_GROUP)
 
 static char **
 remove_elem_from_str_array (char       **v,
@@ -110,11 +112,11 @@ add_elem_to_str_array (char       **v,
 }
 
 static void
-autorun_get_preferences (CcRemovableMediaPanel *self,
-                         const char            *x_content_type,
-                         gboolean              *pref_start_app,
-                         gboolean              *pref_ignore,
-                         gboolean              *pref_open_folder)
+autorun_get_preferences (CcRemovableMediaSettings *self,
+                         const char               *x_content_type,
+                         gboolean                 *pref_start_app,
+                         gboolean                 *pref_ignore,
+                         gboolean                 *pref_open_folder)
 {
   g_auto(GStrv) x_content_start_app = NULL;
   g_auto(GStrv) x_content_ignore = NULL;
@@ -145,11 +147,11 @@ autorun_get_preferences (CcRemovableMediaPanel *self,
 }
 
 static void
-autorun_set_preferences (CcRemovableMediaPanel *self,
-                         const char            *x_content_type,
-                         gboolean               pref_start_app,
-                         gboolean               pref_ignore,
-                         gboolean               pref_open_folder)
+autorun_set_preferences (CcRemovableMediaSettings *self,
+                         const char               *x_content_type,
+                         gboolean                  pref_start_app,
+                         gboolean                  pref_ignore,
+                         gboolean                  pref_open_folder)
 {
   g_auto(GStrv) x_content_start_app = NULL;
   g_auto(GStrv) x_content_ignore = NULL;
@@ -188,9 +190,9 @@ autorun_set_preferences (CcRemovableMediaPanel *self,
 }
 
 static void
-on_custom_item_activated_cb (CcRemovableMediaPanel *self,
-                             const gchar           *item,
-                             GtkAppChooser         *app_chooser)
+on_custom_item_activated_cb (CcRemovableMediaSettings *self,
+                             const gchar              *item,
+                             GtkAppChooser            *app_chooser)
 {
   g_autofree gchar *content_type = NULL;
 
@@ -209,8 +211,8 @@ on_custom_item_activated_cb (CcRemovableMediaPanel *self,
 }
 
 static void
-on_chooser_changed_cb (CcRemovableMediaPanel *self,
-                       GtkAppChooser         *chooser)
+on_chooser_changed_cb (CcRemovableMediaSettings *self,
+                       GtkAppChooser            *chooser)
 {
   g_autoptr(GAppInfo) info = NULL;
   g_autofree gchar *content_type = NULL;
@@ -252,9 +254,9 @@ ellipsize_app_chooser (GtkAppChooserButton *button)
 }
 
 static void
-prepare_chooser (CcRemovableMediaPanel *self,
-                 GtkAppChooserButton   *button,
-                 const gchar           *heading)
+prepare_chooser (CcRemovableMediaSettings *self,
+                 GtkAppChooserButton      *button,
+                 const gchar              *heading)
 {
   gboolean pref_ask;
   gboolean pref_start_app;
@@ -311,7 +313,7 @@ prepare_chooser (CcRemovableMediaPanel *self,
 }
 
 static void
-on_other_type_combo_box_changed (CcRemovableMediaPanel *self)
+on_other_type_combo_box_changed (CcRemovableMediaSettings *self)
 {
   GtkTreeIter iter;
   g_autofree gchar *x_content_type = NULL;
@@ -337,7 +339,7 @@ on_other_type_combo_box_changed (CcRemovableMediaPanel *self)
 }
 
 static gboolean
-on_extra_options_dialog_close_request (CcRemovableMediaPanel *self)
+on_extra_options_dialog_close_request (CcRemovableMediaSettings *self)
 {
   gtk_widget_set_visible (GTK_WIDGET (self->other_type_dialog), FALSE);
 
@@ -350,9 +352,10 @@ on_extra_options_dialog_close_request (CcRemovableMediaPanel *self)
 }
 
 static void
-on_extra_options_button_clicked (CcRemovableMediaPanel *self)
+on_extra_options_button_clicked (CcRemovableMediaSettings *self)
 {
-  CcShell *shell = cc_panel_get_shell (CC_PANEL (self));
+  GtkWidget *app_panel = gtk_widget_get_ancestor(GTK_WIDGET (self), CC_TYPE_APPLICATIONS_PANEL);
+  CcShell *shell = cc_panel_get_shell (CC_PANEL (app_panel));
   GtkWidget *toplevel = cc_shell_get_toplevel (shell);
 
   gtk_window_set_transient_for (GTK_WINDOW (self->other_type_dialog), GTK_WINDOW (toplevel));
@@ -363,11 +366,11 @@ on_extra_options_button_clicked (CcRemovableMediaPanel *self)
   gtk_window_present (GTK_WINDOW (self->other_type_dialog));
 }
 
-#define OFFSET(x)             (G_STRUCT_OFFSET (CcRemovableMediaPanel, x))
+#define OFFSET(x)             (G_STRUCT_OFFSET (CcRemovableMediaSettings, x))
 #define WIDGET_FROM_OFFSET(x) (G_STRUCT_MEMBER (GtkWidget*, self, x))
 
 static void
-info_panel_setup_media (CcRemovableMediaPanel *self)
+info_panel_setup_media (CcRemovableMediaSettings *self)
 {
   guint n;
   GList *l, *content_types;
@@ -378,11 +381,11 @@ info_panel_setup_media (CcRemovableMediaPanel *self)
     const gchar *content_type;
     const gchar *heading;
   } const defs[] = {
-    { OFFSET (audio_cdda_chooser), "x-content/audio-cdda", N_("Select an application for audio CDs") },
-    { OFFSET (video_dvd_chooser), "x-content/video-dvd", N_("Select an application for video DVDs") },
-    { OFFSET (music_player_chooser), "x-content/audio-player", N_("Select an application to run when a music player is connected") },
-    { OFFSET (dcf_chooser), "x-content/image-dcf", N_("Select an application to run when a camera is connected") },
-    { OFFSET (software_chooser), "x-content/unix-software", N_("Select an application for software CDs") },
+    { OFFSET (audio_cdda_chooser), "x-content/audio-cdda", N_("Select an app for audio CDs") },
+    { OFFSET (video_dvd_chooser), "x-content/video-dvd", N_("Select an app for video DVDs") },
+    { OFFSET (music_player_chooser), "x-content/audio-player", N_("Select an app to run when a music player is connected") },
+    { OFFSET (dcf_chooser), "x-content/image-dcf", N_("Select an app to run when a camera is connected") },
+    { OFFSET (software_chooser), "x-content/unix-software", N_("Select an app for software CDs") },
   };
 
   struct {
@@ -479,49 +482,49 @@ info_panel_setup_media (CcRemovableMediaPanel *self)
 
 
 static void
-cc_removable_media_panel_finalize (GObject *object)
+cc_removable_media_settings_finalize (GObject *object)
 {
-  CcRemovableMediaPanel *self = CC_REMOVABLE_MEDIA_PANEL (object);
+  CcRemovableMediaSettings *self = CC_REMOVABLE_MEDIA_SETTINGS (object);
 
   g_clear_object (&self->settings);
 
-  G_OBJECT_CLASS (cc_removable_media_panel_parent_class)->finalize (object);
+  G_OBJECT_CLASS (cc_removable_media_settings_parent_class)->finalize (object);
 }
 
 static void
-cc_removable_media_panel_dispose (GObject *object)
+cc_removable_media_settings_dispose (GObject *object)
 {
-  CcRemovableMediaPanel *self = CC_REMOVABLE_MEDIA_PANEL (object);
+  CcRemovableMediaSettings *self = CC_REMOVABLE_MEDIA_SETTINGS (object);
 
   g_clear_pointer ((GtkWindow **) &self->other_type_dialog, gtk_window_destroy);
 
-  G_OBJECT_CLASS (cc_removable_media_panel_parent_class)->dispose (object);
+  G_OBJECT_CLASS (cc_removable_media_settings_parent_class)->dispose (object);
 }
 
 static void
-cc_removable_media_panel_class_init (CcRemovableMediaPanelClass *klass)
+cc_removable_media_settings_class_init (CcRemovableMediaSettingsClass *klass)
 {
   GObjectClass   *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  object_class->finalize = cc_removable_media_panel_finalize;
-  object_class->dispose = cc_removable_media_panel_dispose;
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/removable-media/cc-removable-media-panel.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, audio_cdda_chooser);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, autorun_never_checkbutton);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, dcf_chooser);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, extra_options_button);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, handlers_box);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, music_player_chooser);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, other_type_dialog);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, other_action_box);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, other_action_label);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, other_type_combo_box);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, other_type_list_store);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, software_chooser);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, video_dvd_chooser);
+  object_class->finalize = cc_removable_media_settings_finalize;
+  object_class->dispose = cc_removable_media_settings_dispose;
+
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/applications/cc-removable-media-settings.ui");
+
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, audio_cdda_chooser);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, autorun_never_checkbutton);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, dcf_chooser);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, extra_options_button);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, handlers_box);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, music_player_chooser);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, other_type_dialog);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, other_action_box);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, other_action_label);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, other_type_combo_box);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, other_type_list_store);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, software_chooser);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, video_dvd_chooser);
 
   gtk_widget_class_bind_template_callback (widget_class, on_extra_options_dialog_close_request);
   gtk_widget_class_bind_template_callback (widget_class, on_extra_options_button_clicked);
@@ -529,19 +532,17 @@ cc_removable_media_panel_class_init (CcRemovableMediaPanelClass *klass)
 }
 
 static void
-cc_removable_media_panel_init (CcRemovableMediaPanel *self)
+cc_removable_media_settings_init (CcRemovableMediaSettings *self)
 {
-  g_resources_register (cc_removable_media_get_resource ());
-
   gtk_widget_init_template (GTK_WIDGET (self));
   self->settings = g_settings_new (MEDIA_HANDLING_SCHEMA);
 
   info_panel_setup_media (self);
 }
 
-GtkWidget *
-cc_removable_media_panel_new (void)
+CcRemovableMediaSettings *
+cc_removable_media_settings_new (void)
 {
-  return g_object_new (CC_TYPE_REMOVABLE_MEDIA_PANEL,
+  return g_object_new (CC_TYPE_REMOVABLE_MEDIA_SETTINGS,
                        NULL);
-}
\ No newline at end of file
+}
diff --git a/panels/removable-media/cc-removable-media-panel.h b/panels/applications/cc-removable-media-settings.h
similarity index 73%
rename from panels/removable-media/cc-removable-media-panel.h
rename to panels/applications/cc-removable-media-settings.h
index ca750728ea..17e9e0725f 100644
--- a/panels/removable-media/cc-removable-media-panel.h
+++ b/panels/applications/cc-removable-media-settings.h
@@ -19,13 +19,13 @@
 
 #pragma once
 
-#include <shell/cc-panel.h>
+#include <adwaita.h>
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_REMOVABLE_MEDIA_PANEL (cc_removable_media_panel_get_type ())
-G_DECLARE_FINAL_TYPE (CcRemovableMediaPanel, cc_removable_media_panel, CC, REMOVABLE_MEDIA_PANEL, CcPanel)
+#define CC_TYPE_REMOVABLE_MEDIA_SETTINGS (cc_removable_media_settings_get_type ())
+G_DECLARE_FINAL_TYPE (CcRemovableMediaSettings, cc_removable_media_settings, CC, REMOVABLE_MEDIA_SETTINGS, AdwPreferencesGroup)
 
-GtkWidget *cc_removable_media_panel_new (void);
+CcRemovableMediaSettings* cc_removable_media_settings_new (void);
 
 G_END_DECLS
diff --git a/panels/applications/cc-removable-media-settings.ui b/panels/applications/cc-removable-media-settings.ui
new file mode 100644
index 0000000000..4f614aca1a
--- /dev/null
+++ b/panels/applications/cc-removable-media-settings.ui
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <template class="CcRemovableMediaSettings" parent="AdwPreferencesGroup">
+    <property name="title" translatable="yes">Removable Media</property>
+    <property name="description" translatable="yes">Apps which are launched when media or drives are connected</property>
+    <child type="content">
+      <object class="AdwClamp">
+        <child>
+          <object class="GtkBox">
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="margin_top">32</property>
+            <property name="margin_bottom">32</property>
+            <property name="margin_start">24</property>
+            <property name="margin_end">24</property>
+            <property name="spacing">18</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox" id="handlers_box">
+                <property name="spacing">10</property>
+                <property name="valign">start</property>
+                <property name="vexpand">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="spacing">10</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="spacing">18</property>
+                        <property name="margin-start">12</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkGrid">
+                            <property name="hexpand">True</property>
+                            <property name="column-spacing">6</property>
+                            <property name="row-spacing">12</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">CD _audio</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">audio_cdda_chooser</property>
+                                <layout>
+                                  <property name="row">0</property>
+                                  <property name="column">0</property>
+                                </layout>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">_DVD video</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">video_dvd_chooser</property>
+                                <layout>
+                                  <property name="row">1</property>
+                                  <property name="column">0</property>
+                                </layout>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkAppChooserButton" id="audio_cdda_chooser">
+                                <property name="hexpand">True</property>
+                                <property name="content_type">x-content/audio-cdda</property>
+                                <layout>
+                                  <property name="row">0</property>
+                                  <property name="column">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkAppChooserButton" id="video_dvd_chooser">
+                                <property name="hexpand">True</property>
+                                <property name="content_type">x-content/video-dvd</property>
+                                <layout>
+                                  <property name="row">1</property>
+                                  <property name="column">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">_Music player</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">music_player_chooser</property>
+                                <layout>
+                                  <property name="row">2</property>
+                                  <property name="column">0</property>
+                                </layout>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkAppChooserButton" id="music_player_chooser">
+                                <property name="hexpand">True</property>
+                                <property name="content_type">x-content/audio-player</property>
+                                <layout>
+                                  <property name="row">2</property>
+                                  <property name="column">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">_Photos</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">dcf_chooser</property>
+                                <layout>
+                                  <property name="row">3</property>
+                                  <property name="column">0</property>
+                                </layout>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkAppChooserButton" id="dcf_chooser">
+                                <property name="hexpand">True</property>
+                                <property name="content_type">x-content/image-dcf</property>
+                                <layout>
+                                  <property name="row">3</property>
+                                  <property name="column">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">_Software</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">software_chooser</property>
+                                <layout>
+                                  <property name="row">4</property>
+                                  <property name="column">0</property>
+                                </layout>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkAppChooserButton" id="software_chooser">
+                                <property name="hexpand">True</property>
+                                <property name="content_type">x-content/unix-software</property>
+                                <layout>
+                                  <property name="row">4</property>
+                                  <property name="column">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="extra_options_button">
+                            <property name="label" translatable="yes">_Other Media…</property>
+                            <property name="halign">end</property>
+                            <property name="use_underline">True</property>
+                            <signal name="clicked" handler="on_extra_options_button_clicked" object="CcRemovableMediaSettings" swapped="yes"/>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="autorun_never_checkbutton">
+                <property name="valign">end</property>
+                <property name="vexpand">False</property>
+                <property name="child">
+                  <object class="GtkLabel">
+                    <property name="use_underline">True</property>
+                    <property name="label" translatable="yes">_Never prompt or start apps on media insertion</property>
+                    <property name="wrap">True</property>
+                  </object>
+                </property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+
+  <object class="AdwWindow" id="other_type_dialog">
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="hide-on-close">True</property>
+    <signal name="close-request" handler="on_extra_options_dialog_close_request" object="CcRemovableMediaSettings" swapped="yes"/>
+    <child>
+      <object class="GtkShortcutController">
+        <property name="scope">managed</property>
+        <child>
+          <object class="GtkShortcut">
+            <property name="trigger">Escape</property>
+            <property name="action">action(window.close)</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <property name="content">
+      <object class="AdwToolbarView">
+        <child type="top">
+          <object class="AdwHeaderBar"/>
+        </child>
+        <property name="content">
+          <object class="GtkBox">
+            <property name="margin-top">18</property>
+            <property name="margin-bottom">18</property>
+            <property name="margin-start">18</property>
+            <property name="margin-end">18</property>
+            <property name="spacing">10</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Select how other media should be handled</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="spacing">6</property>
+                <property name="margin-start">12</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkGrid">
+                    <property name="column_spacing">6</property>
+                    <property name="row_spacing">10</property>
+                    <child>
+                      <object class="GtkComboBox" id="other_type_combo_box">
+                        <property name="model">other_type_list_store</property>
+                        <signal name="changed" handler="on_other_type_combo_box_changed" object="CcRemovableMediaSettings" swapped="yes"/>
+                        <layout>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
+                        </layout>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="other_action_label">
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Action:</property>
+                        <property name="use_underline">True</property>
+                        <layout>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
+                        </layout>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="other_action_box">
+                        <layout>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
+                        </layout>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Type:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">other_type_combo_box</property>
+                        <layout>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
+                        </layout>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </property>
+      </object>
+    </property>
+  </object>
+  <object class="GtkListStore" id="other_type_list_store">
+    <columns>
+      <!-- column-name description -->
+      <column type="gchararray"/>
+      <!-- column-name content-type -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+</interface>
diff --git a/panels/applications/gnome-applications-panel.desktop.in b/panels/applications/gnome-applications-panel.desktop.in
index ca5bc5c4e9..f5e069b61d 100644
--- a/panels/applications/gnome-applications-panel.desktop.in
+++ b/panels/applications/gnome-applications-panel.desktop.in
@@ -12,4 +12,4 @@ StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-AccountSettings;
 OnlyShowIn=GNOME;Unity;
 # Translators: Search terms to find the Apps panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-Keywords=application;flatpak;permission;setting;
+Keywords=application;flatpak;permission;setting;default;preferred;media;autorun;cd;dvd;usb;audio;video;disc;removable;device;system;
diff --git a/panels/applications/icons/meson.build b/panels/applications/icons/meson.build
index 60ee78c79a..8d0be83ec7 100644
--- a/panels/applications/icons/meson.build
+++ b/panels/applications/icons/meson.build
@@ -2,3 +2,13 @@ install_data(
   'scalable/org.gnome.Settings-applications-symbolic.svg',
   install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'apps')
 )
+
+install_data(
+  'scalable/org.gnome.Settings-default-apps-symbolic.svg',
+  install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'apps')
+)
+
+install_data(
+  'scalable/org.gnome.Settings-removable-media-symbolic.svg',
+  install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'apps')
+)
diff --git a/panels/default-apps/icons/scalable/org.gnome.Settings-default-apps-symbolic.svg b/panels/applications/icons/scalable/org.gnome.Settings-default-apps-symbolic.svg
similarity index 100%
rename from panels/default-apps/icons/scalable/org.gnome.Settings-default-apps-symbolic.svg
rename to panels/applications/icons/scalable/org.gnome.Settings-default-apps-symbolic.svg
diff --git a/panels/removable-media/icons/scalable/org.gnome.Settings-removable-media-symbolic.svg b/panels/applications/icons/scalable/org.gnome.Settings-removable-media-symbolic.svg
similarity index 100%
rename from panels/removable-media/icons/scalable/org.gnome.Settings-removable-media-symbolic.svg
rename to panels/applications/icons/scalable/org.gnome.Settings-removable-media-symbolic.svg
diff --git a/panels/applications/meson.build b/panels/applications/meson.build
index 91f74e6495..3b196afd19 100644
--- a/panels/applications/meson.build
+++ b/panels/applications/meson.build
@@ -14,20 +14,34 @@ sources = files(
   'cc-applications-panel.c',
   'cc-applications-row.c',
   'cc-info-row.c',
+  'cc-default-apps-page.c',
+  'cc-default-apps-row.c',
+  'cc-removable-media-settings.c',
   'globs.c',
   'search.c',
   'utils.c',
 )
 
+resource_data = files(
+  'cc-applications-panel.ui',
+  'cc-default-apps-page.ui',
+  'cc-removable-media-settings.ui',
+)
+
 sources += gnome.compile_resources(
   'cc-' + cappletname + '-resources',
   cappletname + '.gresource.xml',
   c_name : 'cc_' + cappletname,
+  dependencies: resource_data,
   export : true
 )
 
 deps = common_deps
 
+if host_is_linux
+  deps += mm_dep
+endif
+
 if enable_snap
   deps += snapd_glib_deps
   sources += files('cc-snap-row.c')
diff --git a/panels/default-apps/cc-default-apps-panel.ui b/panels/default-apps/cc-default-apps-panel.ui
deleted file mode 100644
index ba0e7d4d65..0000000000
--- a/panels/default-apps/cc-default-apps-panel.ui
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="CcDefaultAppsPanel" parent="CcPanel">
-    <property name="child">
-      <object class="AdwToolbarView">
-        <child type="top">
-          <object class="AdwHeaderBar"/>
-        </child>
-
-        <property name="content">
-          <object class="AdwPreferencesPage">
-            <child>
-              <object class="AdwPreferencesGroup">
-                <property name="title" translatable="yes">Links &amp;amp; Files</property>
-                <property name="description" translatable="yes">Applications which are used to open common links and files.</property>
-                <child>
-                  <object class="CcDefaultAppsRow" id="web_row">
-                    <property name="title" translatable="yes">_Web</property>
-                    <property name="use-underline">True</property>
-                    <property name="content-type">x-scheme-handler/http</property>
-                    <property name="filters">text/html;application/xhtml+xml;x-scheme-handler/https</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcDefaultAppsRow" id="mail_row">
-                    <property name="title" translatable="yes">_Mail</property>
-                    <property name="use_underline">True</property>
-                    <property name="content-type">x-scheme-handler/mailto</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcDefaultAppsRow" id="calendar_row">
-                    <property name="title" translatable="yes">_Calendar</property>
-                    <property name="use-underline">True</property>
-                    <property name="content-type">text/calendar</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcDefaultAppsRow" id="music_row">
-                    <property name="title" translatable="yes">M_usic</property>
-                    <property name="use-underline">True</property>
-                    <property name="content-type">audio/x-vorbis+ogg</property>
-                    <property name="filters">audio/*</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcDefaultAppsRow" id="video_row">
-                    <property name="title" translatable="yes">_Video</property>
-                    <property name="use-underline">True</property>
-                    <property name="content-type">video/x-ogm+ogg</property>
-                    <property name="filters">video/*</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcDefaultAppsRow" id="photos_row">
-                    <property name="title" translatable="yes">_Photos</property>
-                    <property name="use-underline">True</property>
-                    <property name="content-type">image/jpeg</property>
-                    <property name="filters">image/*</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcDefaultAppsRow" id="calls_row">
-                    <property name="visible">False</property>
-                    <property name="title" translatable="yes" comments="Translators: This is a telephone call">_Calls</property>
-                    <property name="use-underline">True</property>
-                    <property name="content-type">x-scheme-handler/tel</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcDefaultAppsRow" id="sms_row">
-                    <property name="visible">False</property>
-                    <property name="title" translatable="yes">_SMS</property>
-                    <property name="use-underline">True</property>
-                    <property name="content-type">x-scheme-handler/sms</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </property>
-      </object>
-    </property>
-  </template>
-</interface>
diff --git a/panels/default-apps/default-apps.gresource.xml b/panels/default-apps/default-apps.gresource.xml
deleted file mode 100644
index a2029e7b32..0000000000
--- a/panels/default-apps/default-apps.gresource.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/control-center/default-apps">
-    <file preprocess="xml-stripblanks">cc-default-apps-panel.ui</file>
-  </gresource>
-</gresources>
diff --git a/panels/default-apps/gnome-default-apps-panel.desktop.in b/panels/default-apps/gnome-default-apps-panel.desktop.in
deleted file mode 100644
index ddc40d5a0d..0000000000
--- a/panels/default-apps/gnome-default-apps-panel.desktop.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=Default Apps
-Comment=Configure Default Apps
-Exec=gnome-control-center default-apps
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Settings-default-apps-symbolic
-Terminal=false
-Type=Application
-NoDisplay=true
-StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
-OnlyShowIn=GNOME;Unity;
-# Translators: Search terms to find the Default Apps panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-Keywords=default;application;preferred;media;
diff --git a/panels/default-apps/icons/meson.build b/panels/default-apps/icons/meson.build
deleted file mode 100644
index 0e9b7ffe11..0000000000
--- a/panels/default-apps/icons/meson.build
+++ /dev/null
@@ -1,4 +0,0 @@
-install_data(
-  'scalable/org.gnome.Settings-default-apps-symbolic.svg',
-  install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'apps')
-)
diff --git a/panels/default-apps/meson.build b/panels/default-apps/meson.build
deleted file mode 100644
index 134c9d91af..0000000000
--- a/panels/default-apps/meson.build
+++ /dev/null
@@ -1,38 +0,0 @@
-panels_list += cappletname
-desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
-
-deps = common_deps
-if host_is_linux
-  deps += mm_dep
-endif
-
-i18n.merge_file(
-  type: 'desktop',
-  input: desktop + '.in',
-  output: desktop,
-  po_dir: po_dir,
-  install: true,
-  install_dir: control_center_desktopdir
-)
-
-sources = files(
-  'cc-default-apps-panel.c',
-  'cc-default-apps-row.c'
-)
-
-sources += gnome.compile_resources(
-  'cc-' + cappletname + '-resources',
-  cappletname + '.gresource.xml',
-  c_name: 'cc_' + cappletname.underscorify (),
-  export: true
-)
-
-panels_libs += static_library(
-  cappletname,
-  sources: sources,
-  include_directories: [ top_inc, common_inc ],
-  dependencies: deps,
-  c_args: cflags
-)
-
-subdir('icons')
diff --git a/panels/meson.build b/panels/meson.build
index 502fa3b642..5f29894718 100644
--- a/panels/meson.build
+++ b/panels/meson.build
@@ -5,7 +5,6 @@ panels = [
   'background',
   'color',
   'datetime',
-  'default-apps',
   'display',
   'info-overview',
   'keyboard',
@@ -17,7 +16,6 @@ panels = [
   'printers',
   'privacy',
   'region',
-  'removable-media',
   'search',
   'sharing',
   'sound',
diff --git a/panels/removable-media/cc-removable-media-panel.ui b/panels/removable-media/cc-removable-media-panel.ui
deleted file mode 100644
index 5410b99465..0000000000
--- a/panels/removable-media/cc-removable-media-panel.ui
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <template class="CcRemovableMediaPanel" parent="CcPanel">
-    <property name="child">
-      <object class="AdwToolbarView">
-        <child type="top">
-          <object class="AdwHeaderBar"/>
-        </child>
-
-        <property name="content">
-          <object class="AdwClamp">
-            <child>
-              <object class="GtkBox">
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="margin_top">32</property>
-                <property name="margin_bottom">32</property>
-                <property name="margin_start">24</property>
-                <property name="margin_end">24</property>
-                <property name="spacing">18</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkBox" id="handlers_box">
-                    <property name="spacing">10</property>
-                    <property name="valign">start</property>
-                    <property name="vexpand">False</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="spacing">10</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="halign">center</property>
-                            <property name="justify">center</property>
-                            <property name="wrap">True</property>
-                            <property name="label" translatable="yes">Select how media should be handled</property>
-                            <property name="margin_bottom">12</property>
-                            <style>
-                              <class name="dim-label"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="spacing">18</property>
-                            <property name="margin-start">12</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkGrid">
-                                <property name="hexpand">True</property>
-                                <property name="column-spacing">6</property>
-                                <property name="row-spacing">12</property>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">CD _audio</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">audio_cdda_chooser</property>
-                                    <layout>
-                                      <property name="row">0</property>
-                                      <property name="column">0</property>
-                                    </layout>
-                                    <style>
-                                     <class name="dim-label"/>
-                                    </style>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">_DVD video</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">video_dvd_chooser</property>
-                                    <layout>
-                                      <property name="row">1</property>
-                                      <property name="column">0</property>
-                                    </layout>
-                                    <style>
-                                     <class name="dim-label"/>
-                                    </style>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkAppChooserButton" id="audio_cdda_chooser">
-                                    <property name="hexpand">True</property>
-                                    <property name="content_type">x-content/audio-cdda</property>
-                                    <layout>
-                                      <property name="row">0</property>
-                                      <property name="column">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkAppChooserButton" id="video_dvd_chooser">
-                                    <property name="hexpand">True</property>
-                                    <property name="content_type">x-content/video-dvd</property>
-                                    <layout>
-                                      <property name="row">1</property>
-                                      <property name="column">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">_Music player</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">music_player_chooser</property>
-                                    <layout>
-                                      <property name="row">2</property>
-                                      <property name="column">0</property>
-                                    </layout>
-                                    <style>
-                                     <class name="dim-label"/>
-                                    </style>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkAppChooserButton" id="music_player_chooser">
-                                    <property name="hexpand">True</property>
-                                    <property name="content_type">x-content/audio-player</property>
-                                    <layout>
-                                      <property name="row">2</property>
-                                      <property name="column">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">_Photos</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">dcf_chooser</property>
-                                    <layout>
-                                      <property name="row">3</property>
-                                      <property name="column">0</property>
-                                    </layout>
-                                    <style>
-                                     <class name="dim-label"/>
-                                    </style>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkAppChooserButton" id="dcf_chooser">
-                                    <property name="hexpand">True</property>
-                                    <property name="content_type">x-content/image-dcf</property>
-                                    <layout>
-                                      <property name="row">3</property>
-                                      <property name="column">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">_Software</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">software_chooser</property>
-                                    <layout>
-                                      <property name="row">4</property>
-                                      <property name="column">0</property>
-                                    </layout>
-                                    <style>
-                                     <class name="dim-label"/>
-                                    </style>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkAppChooserButton" id="software_chooser">
-                                    <property name="hexpand">True</property>
-                                    <property name="content_type">x-content/unix-software</property>
-                                    <layout>
-                                      <property name="row">4</property>
-                                      <property name="column">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="extra_options_button">
-                                <property name="label" translatable="yes">_Other Media…</property>
-                                <property name="halign">end</property>
-                                <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_extra_options_button_clicked" object="CcRemovableMediaPanel" swapped="yes"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="autorun_never_checkbutton">
-                    <property name="valign">end</property>
-                    <property name="vexpand">False</property>
-                    <property name="child">
-                      <object class="GtkLabel">
-                        <property name="use_underline">True</property>
-                        <property name="label" translatable="yes">_Never prompt or start apps on media insertion</property>
-                        <property name="wrap">True</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </property>
-      </object>
-    </property>
-  </template>
-
-  <object class="AdwWindow" id="other_type_dialog">
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="hide-on-close">True</property>
-    <signal name="close-request" handler="on_extra_options_dialog_close_request" object="CcRemovableMediaPanel" swapped="yes"/>
-    <child>
-      <object class="GtkShortcutController">
-        <property name="scope">managed</property>
-        <child>
-          <object class="GtkShortcut">
-            <property name="trigger">Escape</property>
-            <property name="action">action(window.close)</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <property name="content">
-      <object class="AdwToolbarView">
-        <child type="top">
-          <object class="AdwHeaderBar"/>
-        </child>
-        <property name="content">
-          <object class="GtkBox">
-            <property name="margin-top">18</property>
-            <property name="margin-bottom">18</property>
-            <property name="margin-start">18</property>
-            <property name="margin-end">18</property>
-            <property name="spacing">10</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Select how other media should be handled</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="spacing">6</property>
-                <property name="margin-start">12</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkGrid">
-                    <property name="column_spacing">6</property>
-                    <property name="row_spacing">10</property>
-                    <child>
-                      <object class="GtkComboBox" id="other_type_combo_box">
-                        <property name="model">other_type_list_store</property>
-                        <signal name="changed" handler="on_other_type_combo_box_changed" object="CcRemovableMediaPanel" swapped="yes"/>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">0</property>
-                        </layout>
-                        <child>
-                          <object class="GtkCellRendererText"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="other_action_label">
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Action:</property>
-                        <property name="use_underline">True</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="other_action_box">
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Type:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">other_type_combo_box</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">0</property>
-                        </layout>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </property>
-      </object>
-    </property>
-  </object>
-  <object class="GtkListStore" id="other_type_list_store">
-    <columns>
-      <!-- column-name description -->
-      <column type="gchararray"/>
-      <!-- column-name content-type -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-</interface>
diff --git a/panels/removable-media/gnome-removable-media-panel.desktop.in b/panels/removable-media/gnome-removable-media-panel.desktop.in
deleted file mode 100644
index 1c1934f2fd..0000000000
--- a/panels/removable-media/gnome-removable-media-panel.desktop.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=Removable Media
-Comment=Configure Removable Media settings
-Exec=gnome-control-center removable-media
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Settings-removable-media-symbolic
-Terminal=false
-Type=Application
-NoDisplay=true
-StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
-OnlyShowIn=GNOME;Unity;
-# Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-Keywords=device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;
diff --git a/panels/removable-media/icons/meson.build b/panels/removable-media/icons/meson.build
deleted file mode 100644
index b03db66481..0000000000
--- a/panels/removable-media/icons/meson.build
+++ /dev/null
@@ -1,4 +0,0 @@
-install_data(
-  'scalable/org.gnome.Settings-removable-media-symbolic.svg',
-  install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'apps')
-)
diff --git a/panels/removable-media/meson.build b/panels/removable-media/meson.build
deleted file mode 100644
index bf38b86229..0000000000
--- a/panels/removable-media/meson.build
+++ /dev/null
@@ -1,36 +0,0 @@
-panels_list += cappletname
-desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
-
-i18n.merge_file(
-  type: 'desktop',
-  input: desktop + '.in',
-  output: desktop,
-  po_dir: po_dir,
-  install: true,
-  install_dir: control_center_desktopdir
-)
-
-sources = files(
-  'cc-removable-media-panel.c'
-)
-
-sources += gnome.compile_resources(
-  'cc-' + cappletname + '-resources',
-  cappletname + '.gresource.xml',
-  c_name: 'cc_' + cappletname.underscorify (),
-  export: true
-)
-
-deps = common_deps + [
-  dependency('libgtop-2.0')
-]
-
-panels_libs += static_library(
-  cappletname,
-  sources: sources,
-  include_directories: [ top_inc, common_inc ],
-  dependencies: deps,
-  c_args: cflags
-)
-
-subdir('icons')
diff --git a/panels/removable-media/removable-media.gresource.xml b/panels/removable-media/removable-media.gresource.xml
deleted file mode 100644
index 330dbf2466..0000000000
--- a/panels/removable-media/removable-media.gresource.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/control-center/removable-media">
-    <file preprocess="xml-stripblanks">cc-removable-media-panel.ui</file>
-  </gresource>
-</gresources>
diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c
index a39c880317..5dae768251 100644
--- a/shell/cc-panel-list.c
+++ b/shell/cc-panel-list.c
@@ -377,7 +377,6 @@ static const gchar * const panel_order[] = {
   "mouse",
   "keyboard",
   "printers",
-  "removable-media",
   "wacom",
   "color",
 
@@ -385,7 +384,6 @@ static const gchar * const panel_order[] = {
   "region",
   "universal-access",
   "user-accounts",
-  "default-apps",
   "reset-settings",
   "datetime",
   "info-overview",
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 3b33f4eb19..aa7ed3cb35 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -38,7 +38,6 @@ extern GType cc_bluetooth_panel_get_type (void);
 #endif /* BUILD_BLUETOOTH */
 extern GType cc_color_panel_get_type (void);
 extern GType cc_date_time_panel_get_type (void);
-extern GType cc_default_apps_panel_get_type (void);
 extern GType cc_display_panel_get_type (void);
 extern GType cc_info_overview_panel_get_type (void);
 extern GType cc_keyboard_panel_get_type (void);
@@ -54,7 +53,6 @@ extern GType cc_power_panel_get_type (void);
 extern GType cc_printers_panel_get_type (void);
 extern GType cc_privacy_panel_get_type (void);
 extern GType cc_region_panel_get_type (void);
-extern GType cc_removable_media_panel_get_type (void);
 extern GType cc_search_panel_get_type (void);
 extern GType cc_sharing_panel_get_type (void);
 extern GType cc_sound_panel_get_type (void);
@@ -95,7 +93,6 @@ static CcPanelLoaderVtable default_panels[] =
 #endif
   PANEL_TYPE("color",            cc_color_panel_get_type,                NULL),
   PANEL_TYPE("datetime",         cc_date_time_panel_get_type,            NULL),
-  PANEL_TYPE("default-apps",     cc_default_apps_panel_get_type,         NULL),
   PANEL_TYPE("display",          cc_display_panel_get_type,              NULL),
   PANEL_TYPE("info-overview",    cc_info_overview_panel_get_type,        NULL),
   PANEL_TYPE("keyboard",         cc_keyboard_panel_get_type,             NULL),
@@ -111,7 +108,6 @@ static CcPanelLoaderVtable default_panels[] =
   PANEL_TYPE("printers",         cc_printers_panel_get_type,             NULL),
   PANEL_TYPE("privacy",          cc_privacy_panel_get_type,              NULL),
   PANEL_TYPE("region",           cc_region_panel_get_type,               NULL),
-  PANEL_TYPE("removable-media",  cc_removable_media_panel_get_type,      NULL),
   PANEL_TYPE("search",           cc_search_panel_get_type,               NULL),
   PANEL_TYPE("sharing",          cc_sharing_panel_get_type,              NULL),
   PANEL_TYPE("sound",            cc_sound_panel_get_type,                NULL),
-- 
GitLab


From ccf7c8a5652e27d9919b993cdc23a1f07d389861 Mon Sep 17 00:00:00 2001
From: Nishal Kulkarni <kulknishu@gmail.com>
Date: Sun, 9 May 2021 20:18:15 +0530
Subject: [PATCH 4/4] removable-media: UI changes

Make removable media UI conform with other panels.
Based off of initial mockups given in #1096
---
 .../cc-removable-media-settings.c             |  54 +++-
 .../cc-removable-media-settings.ui            | 289 ++++++------------
 2 files changed, 147 insertions(+), 196 deletions(-)

diff --git a/panels/applications/cc-removable-media-settings.c b/panels/applications/cc-removable-media-settings.c
index 2df61a3342..c14f52aa50 100644
--- a/panels/applications/cc-removable-media-settings.c
+++ b/panels/applications/cc-removable-media-settings.c
@@ -45,11 +45,18 @@ struct _CcRemovableMediaSettings
 {
   AdwPreferencesGroup  parent;
 
+  GtkWidget           *cd_audio_row;
+  GtkWidget           *dvd_video_row;
+  GtkWidget           *music_player_row;
+  GtkWidget           *photos_row;
+  GtkWidget           *software_row;
+  GtkWidget           *other_media_row;
+
+  GtkSwitch           *autorun_never_switch;
+
   GtkAppChooserButton *audio_cdda_chooser;
-  GtkCheckButton      *autorun_never_checkbutton;
   GtkAppChooserButton *dcf_chooser;
   GtkButton           *extra_options_button;
-  GtkBox              *handlers_box;
   GtkAppChooserButton *music_player_chooser;
   GtkDialog           *other_type_dialog;
   GtkLabel            *other_action_label;
@@ -469,13 +476,43 @@ info_panel_setup_media (CcRemovableMediaSettings *self)
 
   g_settings_bind (self->settings,
                    PREF_MEDIA_AUTORUN_NEVER,
-                   self->autorun_never_checkbutton,
+                   self->autorun_never_switch,
                    "active",
                    G_SETTINGS_BIND_DEFAULT);
 
   g_settings_bind (self->settings,
                    PREF_MEDIA_AUTORUN_NEVER,
-                   self->handlers_box,
+                   self->cd_audio_row,
+                   "sensitive",
+                   G_SETTINGS_BIND_INVERT_BOOLEAN);
+
+  g_settings_bind (self->settings,
+                   PREF_MEDIA_AUTORUN_NEVER,
+                   self->dvd_video_row,
+                   "sensitive",
+                   G_SETTINGS_BIND_INVERT_BOOLEAN);
+
+  g_settings_bind (self->settings,
+                   PREF_MEDIA_AUTORUN_NEVER,
+                   self->music_player_row,
+                   "sensitive",
+                   G_SETTINGS_BIND_INVERT_BOOLEAN);
+
+  g_settings_bind (self->settings,
+                   PREF_MEDIA_AUTORUN_NEVER,
+                   self->photos_row,
+                   "sensitive",
+                   G_SETTINGS_BIND_INVERT_BOOLEAN);
+
+  g_settings_bind (self->settings,
+                   PREF_MEDIA_AUTORUN_NEVER,
+                   self->software_row,
+                   "sensitive",
+                   G_SETTINGS_BIND_INVERT_BOOLEAN);
+
+  g_settings_bind (self->settings,
+                   PREF_MEDIA_AUTORUN_NEVER,
+                   self->other_media_row,
                    "sensitive",
                    G_SETTINGS_BIND_INVERT_BOOLEAN);
 }
@@ -513,10 +550,9 @@ cc_removable_media_settings_class_init (CcRemovableMediaSettingsClass *klass)
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/applications/cc-removable-media-settings.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, audio_cdda_chooser);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, autorun_never_checkbutton);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, autorun_never_switch);
   gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, dcf_chooser);
   gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, extra_options_button);
-  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, handlers_box);
   gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, music_player_chooser);
   gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, other_type_dialog);
   gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, other_action_box);
@@ -525,6 +561,12 @@ cc_removable_media_settings_class_init (CcRemovableMediaSettingsClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, other_type_list_store);
   gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, software_chooser);
   gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, video_dvd_chooser);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, cd_audio_row);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, dvd_video_row);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, music_player_row);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, photos_row);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, software_row);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaSettings, other_media_row);
 
   gtk_widget_class_bind_template_callback (widget_class, on_extra_options_dialog_close_request);
   gtk_widget_class_bind_template_callback (widget_class, on_extra_options_button_clicked);
diff --git a/panels/applications/cc-removable-media-settings.ui b/panels/applications/cc-removable-media-settings.ui
index 4f614aca1a..cebffdc577 100644
--- a/panels/applications/cc-removable-media-settings.ui
+++ b/panels/applications/cc-removable-media-settings.ui
@@ -4,198 +4,107 @@
   <template class="CcRemovableMediaSettings" parent="AdwPreferencesGroup">
     <property name="title" translatable="yes">Removable Media</property>
     <property name="description" translatable="yes">Apps which are launched when media or drives are connected</property>
-    <child type="content">
-      <object class="AdwClamp">
-        <child>
-          <object class="GtkBox">
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="margin_top">32</property>
-            <property name="margin_bottom">32</property>
-            <property name="margin_start">24</property>
-            <property name="margin_end">24</property>
-            <property name="spacing">18</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkBox" id="handlers_box">
-                <property name="spacing">10</property>
-                <property name="valign">start</property>
-                <property name="vexpand">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="spacing">10</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="spacing">18</property>
-                        <property name="margin-start">12</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkGrid">
-                            <property name="hexpand">True</property>
-                            <property name="column-spacing">6</property>
-                            <property name="row-spacing">12</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">CD _audio</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">audio_cdda_chooser</property>
-                                <layout>
-                                  <property name="row">0</property>
-                                  <property name="column">0</property>
-                                </layout>
-                                <style>
-                                  <class name="dim-label"/>
-                                </style>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">_DVD video</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">video_dvd_chooser</property>
-                                <layout>
-                                  <property name="row">1</property>
-                                  <property name="column">0</property>
-                                </layout>
-                                <style>
-                                  <class name="dim-label"/>
-                                </style>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkAppChooserButton" id="audio_cdda_chooser">
-                                <property name="hexpand">True</property>
-                                <property name="content_type">x-content/audio-cdda</property>
-                                <layout>
-                                  <property name="row">0</property>
-                                  <property name="column">1</property>
-                                </layout>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkAppChooserButton" id="video_dvd_chooser">
-                                <property name="hexpand">True</property>
-                                <property name="content_type">x-content/video-dvd</property>
-                                <layout>
-                                  <property name="row">1</property>
-                                  <property name="column">1</property>
-                                </layout>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">_Music player</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">music_player_chooser</property>
-                                <layout>
-                                  <property name="row">2</property>
-                                  <property name="column">0</property>
-                                </layout>
-                                <style>
-                                  <class name="dim-label"/>
-                                </style>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkAppChooserButton" id="music_player_chooser">
-                                <property name="hexpand">True</property>
-                                <property name="content_type">x-content/audio-player</property>
-                                <layout>
-                                  <property name="row">2</property>
-                                  <property name="column">1</property>
-                                </layout>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">_Photos</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">dcf_chooser</property>
-                                <layout>
-                                  <property name="row">3</property>
-                                  <property name="column">0</property>
-                                </layout>
-                                <style>
-                                  <class name="dim-label"/>
-                                </style>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkAppChooserButton" id="dcf_chooser">
-                                <property name="hexpand">True</property>
-                                <property name="content_type">x-content/image-dcf</property>
-                                <layout>
-                                  <property name="row">3</property>
-                                  <property name="column">1</property>
-                                </layout>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">_Software</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">software_chooser</property>
-                                <layout>
-                                  <property name="row">4</property>
-                                  <property name="column">0</property>
-                                </layout>
-                                <style>
-                                  <class name="dim-label"/>
-                                </style>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkAppChooserButton" id="software_chooser">
-                                <property name="hexpand">True</property>
-                                <property name="content_type">x-content/unix-software</property>
-                                <layout>
-                                  <property name="row">4</property>
-                                  <property name="column">1</property>
-                                </layout>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="extra_options_button">
-                            <property name="label" translatable="yes">_Other Media…</property>
-                            <property name="halign">end</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" handler="on_extra_options_button_clicked" object="CcRemovableMediaSettings" swapped="yes"/>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="autorun_never_checkbutton">
-                <property name="valign">end</property>
-                <property name="vexpand">False</property>
-                <property name="child">
-                  <object class="GtkLabel">
-                    <property name="use_underline">True</property>
-                    <property name="label" translatable="yes">_Never prompt or start apps on media insertion</property>
-                    <property name="wrap">True</property>
-                  </object>
-                </property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
+      <child>
+        <object class="AdwActionRow" id="disable_autostart_row">
+          <property name="title" translatable="yes">D_isable Autostart</property>
+          <property name="subtitle" translatable="yes">Never prompt or start programs on media insertion</property>
+          <property name="use_underline">True</property>
+          <child>
+            <object class="GtkSwitch" id="autorun_never_switch">
+              <property name="receives_default">False</property>
+              <property name="valign">center</property>
+            </object>
+          </child>
+        </object>
+      </child>
+      <child>
+        <object class="AdwActionRow" id="cd_audio_row">
+          <property name="title" translatable="yes">CD _audio</property>
+          <property name="use_underline">True</property>
+          <child>
+            <object class="GtkAppChooserButton" id="audio_cdda_chooser">
+              <property name="valign">center</property>
+              <property name="content_type">x-content/audio-cdda</property>
+            </object>
+          </child>
+        </object>
+      </child>
+      <child>
+        <object class="AdwActionRow" id="dvd_video_row">
+          <property name="title" translatable="yes">_DVD video</property>
+          <property name="use_underline">True</property>
+          <child>
+            <object class="GtkAppChooserButton" id="video_dvd_chooser">
+              <property name="valign">center</property>
+              <property name="content_type">x-content/video-dvd</property>
+            </object>
+          </child>
+        </object>
+      </child>
+      <child>
+        <object class="AdwActionRow" id="music_player_row">
+          <property name="title" translatable="yes">_Music player</property>
+          <property name="use_underline">True</property>
+          <child>
+            <object class="GtkAppChooserButton" id="music_player_chooser">
+              <property name="valign">center</property>
+              <property name="content_type">x-content/audio-player</property>
+            </object>
+          </child>
+        </object>
+      </child>
+      <child>
+        <object class="AdwActionRow" id="photos_row">
+          <property name="title" translatable="yes">_Photos</property>
+          <property name="use_underline">True</property>
+          <child>
+            <object class="GtkAppChooserButton" id="dcf_chooser">
+              <property name="valign">center</property>
+              <property name="content_type">x-content/image-dcf</property>
+            </object>
+          </child>
+        </object>
+      </child>
+      <child>
+        <object class="AdwActionRow" id="software_row">
+          <property name="title" translatable="yes">_Software</property>
+          <property name="use_underline">True</property>
+          <child>
+            <object class="GtkAppChooserButton" id="software_chooser">
+              <property name="valign">center</property>
+              <property name="content_type">x-content/unix-software</property>
+            </object>
+          </child>
+        </object>
+      </child>
+      <child>
+        <object class="AdwActionRow" id="other_media_row">
+          <property name="title" translatable="yes">_Other Media…</property>
+          <property name="use_underline">True</property>
+          <child>
+            <object class="GtkButton" id="extra_options_button">
+              <property name="label" translatable="yes">_Configure action</property>
+              <property name="receives_default">True</property>
+              <property name="valign">center</property>
+              <property name="use_underline">True</property>
+              <signal name="clicked" handler="on_extra_options_button_clicked" object="CcRemovableMediaSettings" swapped="yes"/>
+            </object>
+          </child>
+        </object>
+      </child>
   </template>
 
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="audio_cdda_chooser"/>
+      <widget name="video_dvd_chooser"/>
+      <widget name="music_player_chooser"/>
+      <widget name="dcf_chooser"/>
+      <widget name="software_chooser"/>
+      <widget name="extra_options_button"/>
+    </widgets>
+  </object>
+
   <object class="AdwWindow" id="other_type_dialog">
     <property name="resizable">False</property>
     <property name="modal">True</property>
-- 
GitLab