Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
e1c557e
Revert "Adding Google Play Services and checking for Google Play Serv…
DAGalpin Aug 25, 2015
447189d
Adding required support for Google services and Google Play services
joannasmith Jun 15, 2015
fa5355a
Revert "Manifest updates for GCM"
DAGalpin Aug 25, 2015
5f5eeb7
Adding GCM permissions and class declarations to AndroidManifest
joannasmith Jun 15, 2015
1323b51
Merge branch '5.01_Google_Play_Services' into 5.02_Android_Manifest
DAGalpin Aug 25, 2015
aff5418
Revert "Switched to using the Google Developer lingo for project numb…
DAGalpin Aug 25, 2015
e4d650a
Revert "Checking for registration ID and registering app"
DAGalpin Aug 25, 2015
b139832
Merge branch '5.02_Android_Manifest' into 5.03_Registering_with_GCM
DAGalpin Aug 25, 2015
b6d88a8
Registering the app with GCM
joannasmith Jun 15, 2015
2ed375e
Revert "Better message parsing and notification building"
DAGalpin Aug 25, 2015
7841f9a
Merge branch '5.03_Registering_with_GCM' into 5.04_Receiving_a_Message
DAGalpin Aug 25, 2015
c9d81d9
Merge branch '5.04_Receiving_a_Message' into 6.00_Material_Design
DAGalpin Aug 25, 2015
17bc1a5
Merge branch '6.00_Material_Design' into 6.01_Color_Constants
DAGalpin Aug 25, 2015
56b8daa
Merged from 6.01_Color_Constants
DAGalpin Aug 26, 2015
b34b6fb
Merge branch '6.02_Implementing_Toolbar' into 6.03_Altering_the_Layou…
DAGalpin Aug 26, 2015
9caaf90
Merge branch '6.03_Altering_the_Layout_Start' into 6.04_Altering_the_…
DAGalpin Aug 26, 2015
214e450
Merge branch '6.04_Altering_the_Layout_Finish' into 6.05_Improving_th…
DAGalpin Aug 26, 2015
d1fa2df
"Merged from 6.05_Improving_the_Forecast_View_Start"
DAGalpin Aug 26, 2015
ad59025
"Merged from 6.06_Improving_the_Forecast_View_Finish"
DAGalpin Aug 26, 2015
ffab3f0
"Merged from 6.07_So_Much_Real_Estate_Part_1_Start"
DAGalpin Aug 26, 2015
63c5af3
"Merged from 6.08_So_Much_Real_Estate_Part_1_Finish"
DAGalpin Aug 26, 2015
8b605f9
"Merged from 6.09_So_Much_Real_Estate_Part_2_Start"
DAGalpin Aug 26, 2015
d99dacf
"Merged from 6.10_So_Much_Real_Estate_Part_2_Finish"
DAGalpin Aug 26, 2015
6c74117
"Merged from 6.11_So_Much_Real_Estate_Part_3_Start"
DAGalpin Aug 26, 2015
868364d
"Merged from 6.12_So_Much_Real_Estate_Part_3_Finish"
DAGalpin Aug 26, 2015
f567866
"Merged from 6.13_Too_Little_Real_Estate_Start"
DAGalpin Aug 26, 2015
fdb06ae
"Merged from 6.14_Too_Little_Real_Estate_Finish"
DAGalpin Aug 26, 2015
b69b450
"Merged from 6.15_Starting_RecyclerView_Start"
DAGalpin Aug 26, 2015
9fd92fa
"Merged from 6.16_Starting_RecyclerView_Finish"
DAGalpin Aug 26, 2015
3a212b5
"Merged from 6.17_Improving_our_RecyclerView"
DAGalpin Aug 26, 2015
a59a393
"Merged from 6.18_Bonus_RecyclerView_Code"
DAGalpin Aug 26, 2015
1e7b3a9
"Merged from 6.19_Implement_Parallax_Scrolling"
DAGalpin Aug 26, 2015
4d84fc3
"Merged from 6.20_Animate_Your_Transitions"
DAGalpin Aug 26, 2015
67376ed
"Merged from 6.21_Begin_Sharing_Elements"
DAGalpin Aug 26, 2015
06fd72f
"Merged from 6.22_Implement_AppBar_Scrolling"
DAGalpin Aug 26, 2015
b7d3576
"Merged from 7.00_Building_a_Total_Experience"
DAGalpin Aug 26, 2015
7c67c40
"Merged from 7.01_Sunshines_First_Widget"
DAGalpin Aug 26, 2015
f9ea707
"Merged from 7.02_Get_Real_Data"
DAGalpin Aug 26, 2015
c6e7897
"Merged from 7.03_Choose_Your_Size"
DAGalpin Aug 26, 2015
90ae8a3
"Merged from 7.04_Integrating_the_Detail_Widget"
DAGalpin Aug 26, 2015
d93b5ff
Commented out the GCM sender ID
DAGalpin Aug 26, 2015
87571ae
Merge branch '5.03_Registering_with_GCM' into 5.04_Receiving_a_Message
DAGalpin Aug 26, 2015
a707535
Adding the GCM listener to process downstream messages
joannasmith Jun 15, 2015
c254021
Added a blank sender id and a check for it to keep things compiling.
DAGalpin Aug 26, 2015
29972d8
Added translatable=false to stub string.
DAGalpin Aug 27, 2015
8849a50
Merge branch '5.03_Registering_with_GCM' into 5.04_Receiving_a_Message
DAGalpin Aug 27, 2015
8b5aeaa
Added helper toast if senderId is zero length.
DAGalpin Aug 27, 2015
8d62089
"Merged from 5.04_Receiving_a_Message"
DAGalpin Aug 27, 2015
fc99bde
"Merged from 6.00_Material_Design"
DAGalpin Aug 27, 2015
0a24437
"Merged from 6.01_Color_Constants"
DAGalpin Aug 27, 2015
06ea47d
"Merged from 6.02_Implementing_Toolbar"
DAGalpin Aug 27, 2015
e9741e1
"Merged from 6.03_Altering_the_Layout_Start"
DAGalpin Aug 27, 2015
ccac130
"Merged from 6.04_Altering_the_Layout_Finish"
DAGalpin Aug 27, 2015
b275e6a
"Merged from 6.05_Improving_the_Forecast_View_Start"
DAGalpin Aug 27, 2015
882b35c
"Merged from 6.06_Improving_the_Forecast_View_Finish"
DAGalpin Aug 27, 2015
f483b13
"Merged from 6.07_So_Much_Real_Estate_Part_1_Start"
DAGalpin Aug 27, 2015
81d20ae
"Merged from 6.08_So_Much_Real_Estate_Part_1_Finish"
DAGalpin Aug 27, 2015
b6e66ee
"Merged from 6.09_So_Much_Real_Estate_Part_2_Start"
DAGalpin Aug 27, 2015
62a5c1b
"Merged from 6.10_So_Much_Real_Estate_Part_2_Finish"
DAGalpin Aug 27, 2015
fbe3d43
"Merged from 6.11_So_Much_Real_Estate_Part_3_Start"
DAGalpin Aug 27, 2015
ad46cd9
"Merged from 6.12_So_Much_Real_Estate_Part_3_Finish"
DAGalpin Aug 27, 2015
eb58297
"Merged from 6.13_Too_Little_Real_Estate_Start"
DAGalpin Aug 27, 2015
d2d753f
"Merged from 6.14_Too_Little_Real_Estate_Finish"
DAGalpin Aug 27, 2015
d478cc4
"Merged from 6.15_Starting_RecyclerView_Start"
DAGalpin Aug 27, 2015
4fa4a2e
"Merged from 6.16_Starting_RecyclerView_Finish"
DAGalpin Aug 27, 2015
11e2c85
"Merged from 6.17_Improving_our_RecyclerView"
DAGalpin Aug 27, 2015
556a07e
"Merged from 6.18_Bonus_RecyclerView_Code"
DAGalpin Aug 27, 2015
8ee1f9a
"Merged from 6.19_Implement_Parallax_Scrolling"
DAGalpin Aug 27, 2015
d14996d
"Merged from 6.20_Animate_Your_Transitions"
DAGalpin Aug 27, 2015
03d508f
"Merged from 6.21_Begin_Sharing_Elements"
DAGalpin Aug 27, 2015
02ae9bf
"Merged from 6.22_Implement_AppBar_Scrolling"
DAGalpin Aug 27, 2015
4d4d650
"Merged from 7.00_Building_a_Total_Experience"
DAGalpin Aug 27, 2015
f662d3f
"Merged from 7.01_Sunshines_First_Widget"
DAGalpin Aug 27, 2015
4ff9eaa
"Merged from 7.02_Get_Real_Data"
DAGalpin Aug 27, 2015
638194f
"Merged from 7.03_Choose_Your_Size"
DAGalpin Aug 27, 2015
3adc6bd
"Merged from 7.04_Integrating_the_Detail_Widget"
DAGalpin Aug 27, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'

android {
compileSdkVersion 21
Expand Down Expand Up @@ -28,6 +29,6 @@ dependencies {
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.android.support:design:22.2.0'
compile 'com.android.support:recyclerview-v7:22.2.0'
compile 'com.google.android.gms:play-services-gcm:7.0.0'
compile 'com.google.android.apps.muzei:muzei-api:2.0'
compile 'com.google.android.gms:play-services-gcm:7.5.0'
}
55 changes: 37 additions & 18 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,21 @@
<uses-permission android:name="android.permission.INTERNET" />

<!-- Permissions required by the sync adapter -->
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<uses-permission
android:name="android.permission.READ_SYNC_SETTINGS"/>
<uses-permission
android:name="android.permission.WRITE_SYNC_SETTINGS"/>
<uses-permission
android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>

<!-- Permissions required to make our UI more friendly -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission
android:name="android.permission.ACCESS_NETWORK_STATE" />

<!-- Permissions required for Google Cloud Messaging -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<permission
android:name="com.example.android.sunshine.app.permission.C2D_MESSAGE"
<permission android:name="com.example.android.sunshine.app.permission.C2D_MESSAGE"
android:protectionLevel="signature" />
<uses-permission android:name="com.example.android.sunshine.app.permission.C2D_MESSAGE" />

Expand Down Expand Up @@ -64,24 +68,22 @@
android:name=".SettingsActivity"
android:label="@string/title_activity_settings"
android:parentActivityName=".MainActivity"
android:theme="@style/SettingsTheme" >
android:theme="@style/SettingsTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.example.android.sunshine.app.MainActivity" />
</activity>

<provider
android:name=".data.WeatherProvider"
android:authorities="@string/content_authority"
android:name=".data.WeatherProvider"
android:exported="false"
android:syncable="true" />

<!-- SyncAdapter's dummy authentication service -->
<service android:name=".sync.SunshineAuthenticatorService" >
<service android:name=".sync.SunshineAuthenticatorService">
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator" />
</intent-filter>

<meta-data
android:name="android.accounts.AccountAuthenticator"
android:resource="@xml/authenticator" />
Expand All @@ -90,26 +92,27 @@
<!-- The SyncAdapter service -->
<service
android:name=".sync.SunshineSyncService"
android:exported="true" >
android:exported="true"
>
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>

<meta-data
android:name="android.content.SyncAdapter"
android:resource="@xml/syncadapter" />
</service>

<!-- GCM receiver -->
<!-- The Google Cloud Messaging receiver and services -->
<receiver
android:name=".GcmBroadcastReceiver"
android:name="com.google.android.gms.gcm.GcmReceiver"
android:exported="true"
android:permission="com.google.android.c2dm.permission.SEND" >
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
<category android:name="com.example.android.sunshine.app" />
</intent-filter>
</receiver>

<!-- Muzei Extension -->
<service android:name=".muzei.WeatherMuzeiSource"
android:icon="@drawable/ic_muzei"
Expand All @@ -120,7 +123,6 @@
</intent-filter>
<meta-data android:name="color" android:value="@color/primary" />
</service>

<!-- Today Widget -->
<receiver
android:name=".widget.TodayWidgetProvider"
Expand All @@ -133,7 +135,6 @@
android:resource="@xml/widget_info_today" />
</receiver>
<service android:name=".widget.TodayWidgetIntentService" />

<!-- Detail Widget -->
<receiver
android:name=".widget.DetailWidgetProvider"
Expand All @@ -151,6 +152,24 @@
android:enabled="@bool/widget_detail_enabled"
android:exported="false"
android:permission="android.permission.BIND_REMOTEVIEWS" />
<service
android:name="gcm.MyGcmListenerService"
android:exported="false" >
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
</intent-filter>
</service>
<service
android:name="gcm.MyInstanceIDListenerService"
android:exported="false">
<intent-filter>
<action android:name="com.google.android.gms.iid.InstanceID"/>
</intent-filter>
</service>
<service
android:name=".gcm.RegistrationIntentService"
android:exported="false" >
</service>
</application>

</manifest>

This file was deleted.

Loading