D10951: Rename MaterialActivity to MainActivity

[Nicolas Fella]

nicolasfella updated this revision to Diff 28495.
nicolasfella added a comment.


  Resolve merge conflict

REPOSITORY
  R225 KDE Connect - Android application

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D10951?vs=28344&id=28495

BRANCH
  arcpatch-D10951

REVISION DETAIL
  https://phabricator.kde.org/D10951

AFFECTED FILES
  AndroidManifest.xml
  res/layout-land/activity_mpris.xml
  res/layout/activity_device.xml
  res/layout/activity_find_my_phone.xml
  res/layout/activity_list.xml
  res/layout/activity_main.xml
  res/layout/activity_mousepad.xml
  res/layout/activity_mpris.xml
  res/layout/activity_notification_filter.xml
  res/layout/activity_refresh_list.xml
  res/layout/custom_ip_list.xml
  res/layout/list_item_category.xml
  res/layout/list_item_entry.xml
  res/layout/list_item_with_button_entry.xml
  res/layout/list_item_with_icon_entry.xml
  res/layout/mpris_control.xml
  res/layout/nav_header.xml
  res/layout/preference_with_button.xml
  res/menu/menu_mousepad.xml
  res/menu/pairing.xml
  res/menu/refresh.xml
  res/values/styles.xml
  res/xml/fileprovider_paths.xml
  res/xml/mousepadplugin_preferences.xml
  res/xml/mprisplugin_preferences.xml
  res/xml/remotekeyboardplugin_keyboard.xml
  res/xml/remotekeyboardplugin_method.xml
  res/xml/remotekeyboardplugin_preferences.xml
  res/xml/shareplugin_preferences.xml
  res/xml/telephonyplugin_preferences.xml
  src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLink.java
  src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java
  src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothPairingHandler.java
  src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
  src/org/kde/kdeconnect/BackgroundService.java
  src/org/kde/kdeconnect/Device.java
  src/org/kde/kdeconnect/Helpers/AppsHelper.java
  src/org/kde/kdeconnect/Helpers/ContactsHelper.java
  src/org/kde/kdeconnect/Helpers/DeviceHelper.java
  src/org/kde/kdeconnect/Helpers/FilesHelper.java
  src/org/kde/kdeconnect/Helpers/ImagesHelper.java
  src/org/kde/kdeconnect/Helpers/NetworkHelper.java
  src/org/kde/kdeconnect/Helpers/NotificationHelper.java
  src/org/kde/kdeconnect/Helpers/RandomHelper.java
  src/org/kde/kdeconnect/Helpers/SecurityHelpers/RsaHelper.java
  src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java
  src/org/kde/kdeconnect/Helpers/StorageHelper.java
  src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
  src/org/kde/kdeconnect/NetworkPackage.java
  src/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java
  src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java
  src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java
  src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneActivity.java
  src/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyInputConnection.java
  src/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java
  src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java
  src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadPlugin.java
  src/org/kde/kdeconnect/Plugins/MprisPlugin/AlbumArtCache.java
  src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
  src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisMediaSession.java
  src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
  src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
  src/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java
  src/org/kde/kdeconnect/Plugins/Plugin.java
  src/org/kde/kdeconnect/Plugins/PluginFactory.java
  src/org/kde/kdeconnect/Plugins/ReceiveNotificationsPlugin/ReceiveNotificationsPlugin.java
  src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardPlugin.java
  src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardService.java
  src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java
  src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java
  src/org/kde/kdeconnect/Plugins/SftpPlugin/SimpleSftpServer.java
  src/org/kde/kdeconnect/Plugins/SharePlugin/NotificationUpdateCallback.java
  src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
  src/org/kde/kdeconnect/Plugins/SharePlugin/ShareChooserTargetService.java
  src/org/kde/kdeconnect/Plugins/SharePlugin/ShareNotification.java
  src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java
  src/org/kde/kdeconnect/Plugins/SharePlugin/ShareSettingsActivity.java
  src/org/kde/kdeconnect/Plugins/TelepathyPlugin/TelepathyPlugin.java
  src/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java
  src/org/kde/kdeconnect/UserInterface/AppCompatPreferenceActivity.java
  src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
  src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
  src/org/kde/kdeconnect/UserInterface/List/CustomItem.java
  src/org/kde/kdeconnect/UserInterface/List/EntryItem.java
  src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
  src/org/kde/kdeconnect/UserInterface/List/PairingDeviceItem.java
  src/org/kde/kdeconnect/UserInterface/List/PluginItem.java
  src/org/kde/kdeconnect/UserInterface/List/SectionItem.java
  src/org/kde/kdeconnect/UserInterface/List/SmallEntryItem.java
  src/org/kde/kdeconnect/UserInterface/MainActivity.java
  src/org/kde/kdeconnect/UserInterface/MaterialActivity.java
  src/org/kde/kdeconnect/UserInterface/PairingFragment.java
  tests/org/kde/kdeconnect/DeviceTest.java
  tests/org/kde/kdeconnect/LanLinkProviderTest.java
  tests/org/kde/kdeconnect/LanLinkTest.java
  tests/org/kde/kdeconnect/NetworkPackageTest.java

To: nicolasfella, #kde_connect, mtijink
Cc: mtijink, #kde_connect, vhyvert, adeen-s, SemperPeritus, ahmedbesbes, daniel.z.tg, jeanv, tfella, aboudhar, seebauer, bugzy, MayeulC, menasshock, ach, apol
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdeconnect/attachments/20180303/07d37eda/attachment.html>