Skip to content

Commit 03e309e

Browse files
author
Mark Ha
committed
Merge RC1.12 to Github
2 parents e0498cb + b028620 commit 03e309e

File tree

270 files changed

+5493
-1542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

270 files changed

+5493
-1542
lines changed

‎examples/anx_sdk_app/AndroidManifest.xml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
-->
1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1818
package="com.appnexus.opensdkapp"
19-
android:versionCode="5"
20-
android:versionName="1.9">
19+
android:versionCode="7"
20+
android:versionName="1.12">
2121

2222
<uses-sdk
2323
android:minSdkVersion="8"
@@ -59,13 +59,20 @@
5959

6060
<activity android:name="com.appnexus.opensdk.AdActivity"/>
6161

62-
<activity android:name="com.google.ads.AdActivity"
62+
<!--Admob-->
63+
<!--<activity android:name="com.google.ads.AdActivity"-->
64+
<!--android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>-->
65+
66+
<activity android:name="com.google.android.gms.ads.AdActivity"
6367
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>
68+
<activity android:name="com.amazon.device.ads.AdActivity"
69+
android:configChanges="keyboardHidden|orientation|screenSize"/>
6470
<activity android:name="com.millennialmedia.android.MMActivity"
6571
android:theme="@android:style/Theme.Translucent.NoTitleBar"
6672
android:configChanges="keyboardHidden|orientation|keyboard"/>
67-
<activity android:name="com.amazon.device.ads.AdActivity"
68-
android:configChanges="keyboardHidden|orientation|screenSize"/>
73+
74+
<meta-data android:name="com.google.android.gms.version"
75+
android:value="@integer/google_play_services_version"/>
6976
</application>
7077

7178
</manifest>

‎examples/anx_sdk_app/project.properties‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212

1313
# Project target.
1414
target=android-19
15-
android.library.reference.1=../../sdk
16-
android.library.reference.2=../libs/pulltorefresh
15+
android.library.reference.1=../libs/google-play-services_lib
16+
android.library.reference.2=../../sdk
17+
android.library.reference.3=../libs/pulltorefresh
18+
android.library.reference.4=../../mediation/mediatedviews/Amazon
19+
android.library.reference.5=../../mediation/mediatedviews/GooglePlay
20+
android.library.reference.6=../../mediation/mediatedviews/MillennialMedia
21+
android.library.reference.7=../../extras/AndroidAdvertisingID
1722

18-
19-
android.library.reference.3=../../mediation/mediatedviews

‎examples/anx_sdk_app/res/layout/dialog_fragment_custom_keywords.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:orientation="vertical"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent">
7+
<ScrollView android:layout_width="wrap_content" android:layout_height="wrap_content">
8+
<LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/keyword_layout">
9+
10+
</LinearLayout>
11+
</ScrollView>
12+
<LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content">
13+
<Button android:layout_width="0px" android:layout_height="wrap_content" android:layout_weight="1"
14+
android:text="+" android:id="@+id/add_keyword"/>
15+
<Button android:layout_width="0px" android:layout_height="wrap_content" android:layout_weight="1"
16+
android:text="Done" android:id="@+id/done_editing"/>
17+
</LinearLayout>
18+
</LinearLayout>

‎examples/anx_sdk_app/res/layout/fragment_settings.xml‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,123 @@
181181
android:layout_toRightOf="@id/mid_browser"
182182
/>
183183
</RelativeLayout>
184+
185+
<!-- Advanced "Switch" -->
186+
187+
<TextView
188+
android:layout_marginTop="8dp"
189+
android:layout_marginBottom="8dp"
190+
android:layout_below="@id/txt_browser"
191+
android:layout_centerVertical="false"
192+
android:id="@+id/txt_advanced"
193+
android:layout_alignBottom="@+id/btns_advanced"
194+
android:layout_alignTop="@+id/btns_advanced"
195+
android:text="@string/settings_txt_advanced"
196+
style="@style/settingsTextItem"
197+
/>
198+
199+
<RelativeLayout
200+
style="@style/switchContainer"
201+
android:id="@+id/btns_advanced"
202+
android:layout_below="@id/txt_browser"
203+
android:layout_toRightOf="@id/txt_advanced"
204+
>
205+
<View
206+
android:id="@+id/mid_advanced"
207+
android:layout_alignTop="@+id/btn_advanced_yes"
208+
android:layout_alignBottom="@+id/btn_advanced_yes"
209+
style="@style/switchButtonMiddle"
210+
/>
211+
<Button
212+
android:id="@+id/btn_advanced_yes"
213+
android:text="@string/settings_btn_advanced_show"
214+
android:enabled="false"
215+
android:layout_toLeftOf="@id/mid_advanced"
216+
style="@style/switchButtonItem"
217+
/>
218+
<Button
219+
android:id="@+id/btn_advanced_no"
220+
android:text="@string/settings_btn_advanced_hide"
221+
style="@style/switchButtonItem"
222+
android:layout_toRightOf="@id/mid_advanced"
223+
/>
224+
</RelativeLayout>
225+
184226
</RelativeLayout>
185227

228+
<!-- Advanced -->
229+
<LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content"
230+
android:orientation="vertical"
231+
android:id="@+id/advanced_block">
232+
<TextView
233+
style="@style/header"
234+
android:text="@string/settings_title_advanced"
235+
/>
236+
237+
<RelativeLayout
238+
style="@style/itemContainer">
239+
<TextView
240+
android:id="@+id/txt_gender"
241+
style="@style/settingsTextItem"
242+
android:text="@string/settings_txt_gender"/>
243+
244+
<Spinner
245+
android:id="@+id/dropdown_gender"
246+
style="@style/settingsEditItem"
247+
android:layout_alignTop="@id/txt_gender"
248+
android:layout_alignBottom="@id/txt_gender"
249+
/>
250+
</RelativeLayout>
251+
<RelativeLayout
252+
style="@style/itemContainer">
253+
<TextView
254+
android:id="@+id/txt_age"
255+
style="@style/settingsTextItem"
256+
android:text="@string/settings_txt_age"
257+
/>
258+
259+
<EditText
260+
android:id="@+id/edit_age"
261+
android:inputType="number"
262+
style="@style/settingsEditItem"
263+
android:layout_alignTop="@id/txt_age"
264+
android:layout_alignBottom="@id/txt_age"
265+
/>
266+
</RelativeLayout>
267+
<RelativeLayout
268+
style="@style/itemContainer">
269+
<TextView
270+
android:id="@+id/txt_zip"
271+
style="@style/settingsTextItem"
272+
android:text="@string/settings_txt_zip"
273+
/>
274+
275+
<EditText
276+
android:id="@+id/edit_zip"
277+
android:inputType="number"
278+
style="@style/settingsEditItem"
279+
android:layout_alignTop="@id/txt_zip"
280+
android:layout_alignBottom="@id/txt_zip"
281+
/>
282+
</RelativeLayout>
283+
<RelativeLayout
284+
style="@style/itemContainer">
285+
<TextView
286+
android:id="@+id/txt_custom_keywords"
287+
style="@style/settingsTextItem"
288+
android:text="@string/settings_txt_custom_keywords"
289+
/>
290+
291+
<Button
292+
android:id="@+id/edit_custom_keywords"
293+
android:inputType="number"
294+
style="@style/settingsEditItem"
295+
android:layout_alignTop="@id/txt_custom_keywords"
296+
android:layout_alignBottom="@id/txt_custom_keywords"
297+
android:text="@string/settings_txt_custom_keywords_button"
298+
/>
299+
</RelativeLayout>
300+
</LinearLayout>
186301
<!-- Banner -->
187302

188303
<TextView

‎examples/anx_sdk_app/res/values/strings.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@
6464

6565
<string name="log_title_applogs">App Logs</string>
6666
<string name="log_btn_email">Email Logs</string>
67+
<string name="settings_txt_advanced">Advanced:</string>
68+
<string name="settings_title_advanced">Advanced Targeting</string>
69+
<string name="settings_txt_gender">Gender:</string>
70+
<string name="settings_txt_age">Age:</string>
71+
<string name="settings_txt_zip">Zip:</string>
72+
<string name="settings_txt_custom_keywords">Custom Keywords:</string>
73+
<string name="settings_txt_custom_keywords_button">Edit</string>
74+
<string name="settings_btn_advanced_show">Show</string>
75+
<string name="settings_btn_advanced_hide">Hide</string>
6776

6877
<string-array name="sizes">
6978
<item>320x50</item>
@@ -84,4 +93,10 @@
8493
<item>120 seconds</item>
8594
</string-array>
8695

96+
<string-array name="gender">
97+
<item>Unknown</item>
98+
<item>Male</item>
99+
<item>Female</item>
100+
</string-array>
101+
87102
</resources>

‎examples/anx_sdk_app/src/com/appnexus/opensdk/CreativePreviewActivity.java‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.appnexus.opensdk.utils.Clog;
3333
import com.appnexus.opensdk.utils.HTTPGet;
3434
import com.appnexus.opensdk.utils.HTTPResponse;
35+
import com.appnexus.opensdk.utils.ViewUtil;
3536
import com.appnexus.opensdkapp.R;
3637

3738
import java.net.URLDecoder;
@@ -41,6 +42,7 @@ public class CreativePreviewActivity extends Activity {
4142
private String adType, url;
4243
int width, height;
4344

45+
LinearLayout adFrame;
4446
AdView adView;
4547

4648
private AlertDialog errorDialog;
@@ -70,7 +72,7 @@ private void handleIntent(Intent intent) {
7072

7173
setContentView(R.layout.activity_creativepreview);
7274

73-
LinearLayout adFrame = (LinearLayout) findViewById(R.id.creativepreview_adframe);
75+
adFrame = (LinearLayout) findViewById(R.id.creativepreview_adframe);
7476
Button reloadButton = (Button) findViewById(R.id.creativepreview_btn_reload);
7577
reloadButton.setOnClickListener(new View.OnClickListener() {
7678
@Override
@@ -79,16 +81,6 @@ public void onClick(View v) {
7981
}
8082
});
8183

82-
// default is banner
83-
adView = INTERSTITIAL.equals(adType) ? new InterstitialAdView(this) : new BannerAdView(this, 0);
84-
adView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
85-
LinearLayout.LayoutParams.WRAP_CONTENT));
86-
87-
if (adView instanceof BannerAdView) {
88-
adFrame.addView(adView);
89-
((LinearLayout.LayoutParams) adView.getLayoutParams()).gravity = Gravity.CENTER;
90-
}
91-
9284
runGetAdContent();
9385
}
9486

@@ -167,6 +159,21 @@ private void runGetAdContent() {
167159
@Override
168160
protected void onPostExecute(HTTPResponse response) {
169161
Clog.d(Clog.baseLogTag, "Opening Creative Preview for: " + url);
162+
163+
ViewUtil.removeChildFromParent(adView);
164+
165+
// default is banner
166+
adView = INTERSTITIAL.equals(adType)
167+
? new InterstitialAdView(CreativePreviewActivity.this)
168+
: new BannerAdView(CreativePreviewActivity.this, 0);
169+
170+
if (adView instanceof BannerAdView) {
171+
adView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
172+
LinearLayout.LayoutParams.WRAP_CONTENT));
173+
((LinearLayout.LayoutParams) adView.getLayoutParams()).gravity = Gravity.CENTER;
174+
adFrame.addView(adView);
175+
}
176+
170177
adView.loadAdFromHtml(response.getResponseBody(), width, height);
171178
if (adView instanceof InterstitialAdView) {
172179
((InterstitialAdView) adView).show();

‎examples/anx_sdk_app/src/com/appnexus/opensdkapp/MainActivity.java‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.appnexus.opensdkapp;
1818

19-
import android.R.color;
2019
import android.annotation.SuppressLint;
2120
import android.app.AlertDialog;
2221
import android.app.ProgressDialog;
@@ -35,8 +34,10 @@
3534
import android.view.inputmethod.InputMethodManager;
3635
import android.widget.*;
3736
import android.widget.TabHost.TabContentFactory;
37+
import com.appnexus.opensdk.AndroidAdvertisingIDUtil;
3838
import com.appnexus.opensdk.utils.Clog;
3939
import com.appnexus.opensdk.utils.ClogListener;
40+
import com.appnexus.opensdk.utils.Settings;
4041

4142
import java.io.BufferedReader;
4243
import java.io.FileReader;
@@ -119,6 +120,8 @@ public void onClick(View view) {
119120
contentView = getWindow().findViewById(Window.ID_ANDROID_CONTENT);
120121

121122
Clog.registerListener(logTabClogListener);
123+
124+
getAAID();
122125
}
123126

124127
@Override
@@ -324,6 +327,26 @@ private String buildBasicLogMessage(LOG_LEVEL level, String LogTag, String messa
324327
}
325328
};
326329

330+
/**
331+
* Android Advertising ID
332+
*/
333+
334+
private void getAAID() {
335+
AndroidAdvertisingIDUtil util = new AndroidAdvertisingIDUtil() {
336+
@Override
337+
public void onRetrievedID(String androidAdvertisingID, boolean isLimitAdTrackingEnabled) {
338+
Clog.d(Constants.BASE_LOG_TAG, "Setting aaid: " + androidAdvertisingID + " " + isLimitAdTrackingEnabled);
339+
Settings.setAAID(androidAdvertisingID, isLimitAdTrackingEnabled);
340+
}
341+
342+
@Override
343+
public void onFailedToRetrieveID() {
344+
Clog.d(Constants.BASE_LOG_TAG, "Failed to retrieve aaid");
345+
Settings.setAAID(null, false);
346+
}
347+
};
348+
util.getID(this);
349+
}
327350
/**
328351
* Log file management code
329352
*/

0 commit comments

Comments
 (0)