Skip to content

Commit

Permalink
Merge tag 'android-5.1.0_r1' into HEAD
Browse files Browse the repository at this point in the history 
Android 5.1.0 release 1
  • Loading branch information
@rmcc
rmcc committed Mar 10, 2015
2 parents a37307b + 679b210 commit 5b88c44
Show file tree
Hide file tree
Showing 1,810 changed files with 34,164 additions and 13,570 deletions.
10 changes: 10 additions & 0 deletions apps/Development/res/layout/connectivity.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,16 @@
android:layout_height="wrap_content"
android:text="@string/stop_hipri" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/report_all_bad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/report_all_bad" />
</LinearLayout>

<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
Expand Down
2 changes: 2 additions & 0 deletions apps/Development/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
<string name="start_hipri">Start HiPri</string>
<string name="stop_hipri">Stop HiPri</string>
<string name="crash">CRASH</string>
<string name="report_all_bad">Report all bad</string>

<string name="netid">NetId</string>
<string name="add_default_route">Add Default Route</string>
<string name="remove_default_route">Remove Default Route</string>
Expand Down
17 changes: 17 additions & 0 deletions apps/Development/src/com/android/development/Connectivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.ConnectivityManager;
import android.net.LinkAddress;
import android.net.Network;
import android.net.NetworkUtils;
import android.net.RouteInfo;
import android.net.wifi.ScanResult;
Expand Down Expand Up @@ -304,6 +305,7 @@ public void onCreate(Bundle icicle) {
findViewById(R.id.stop_mms).setOnClickListener(mClickListener);
findViewById(R.id.start_hipri).setOnClickListener(mClickListener);
findViewById(R.id.stop_hipri).setOnClickListener(mClickListener);
findViewById(R.id.report_all_bad).setOnClickListener(mClickListener);
findViewById(R.id.crash).setOnClickListener(mClickListener);

findViewById(R.id.add_default_route).setOnClickListener(mClickListener);
Expand All @@ -318,6 +320,11 @@ public void onCreate(Bundle icicle) {
registerReceiver(mReceiver, new IntentFilter(CONNECTIVITY_TEST_ALARM));
}

@Override
public void onDestroy() {
super.onDestroy();
unregisterReceiver(mReceiver);
}

@Override
public void onResume() {
Expand Down Expand Up @@ -387,6 +394,9 @@ public void onClick(View v) {
case R.id.add_default_route:
onAddDefaultRoute();
break;
case R.id.report_all_bad:
onReportAllBad();
break;
case R.id.crash:
onCrash();
break;
Expand Down Expand Up @@ -460,6 +470,13 @@ private void scheduleAlarm(long delayMs, String eventType) {
private void onStopScreenCycle() {
}

private void onReportAllBad() {
Network[] networks = mCm.getAllNetworks();
for (Network network : networks) {
mCm.reportBadNetwork(network);
}
}

private void onCrash() {
ConnectivityManager foo = null;
foo.startUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE,
Expand Down
2 changes: 1 addition & 1 deletion apps/Fallback/res/values-sl/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="appTitle" msgid="161410001913116606">"Nadomestna aplikacija"</string>
<string name="appTitle" msgid="161410001913116606">"Nadomestni program"</string>
<string name="title" msgid="8156274565006125136">"Dejanje ni podprto."</string>
<string name="error" msgid="6539615832923362301">"To dejanje trenutno še ni podprto."</string>
</resources>
3 changes: 2 additions & 1 deletion build/product_sdk.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ PRODUCT_PACKAGES += \
layoutlib-tests \
llvm-rs-cc \
sqlite3 \
vgabios-cirrus.bin
vgabios-cirrus.bin \
split-select
2 changes: 2 additions & 0 deletions build/sdk-darwin-x86.atree
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ prebuilts/sdk/tools/darwin/arm-linux-androideabi-ld strip build-tools/${PLATFO
prebuilts/sdk/tools/darwin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld
prebuilts/sdk/tools/darwin/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld

dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses

##############################################################################
# Docs Component
##############################################################################
Expand Down
1 change: 1 addition & 0 deletions build/sdk-linux-x86.atree
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ prebuilts/sdk/tools/linux/arm-linux-androideabi-ld strip build-tools/${PLATFOR
prebuilts/sdk/tools/linux/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld
prebuilts/sdk/tools/linux/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld

dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses

5 changes: 5 additions & 0 deletions build/sdk-windows-x86.atree
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ bin/etc1tool.exe strip platform-tools/etc1tool.exe
rm build-tools/${PLATFORM_NAME}/aapt
bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt.exe

rm build-tools/${PLATFORM_NAME}/split-select
bin/split-select.exe strip build-tools/${PLATFORM_NAME}/split-select.exe

rm build-tools/${PLATFORM_NAME}/aidl
bin/aidl.exe strip build-tools/${PLATFORM_NAME}/aidl.exe

Expand Down Expand Up @@ -101,6 +104,8 @@ prebuilts/sdk/tools/windows/i686-linux-android-ld.exe strip build-tools/${P
rm build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
prebuilts/sdk/tools/windows/mipsel-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld.exe

dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat


##############################################################################
# Docs Component
Expand Down
60 changes: 39 additions & 21 deletions build/sdk.atree
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ development/sdk/build_tools_runtime.properties build-tools/${PLATFORM_NAME}/runt
# build tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
bin/aapt strip build-tools/${PLATFORM_NAME}/aapt
bin/aidl strip build-tools/${PLATFORM_NAME}/aidl
bin/split-select strip build-tools/${PLATFORM_NAME}/split-select
bin/zipalign strip build-tools/${PLATFORM_NAME}/zipalign

# renderscript (cc + headers)
Expand Down Expand Up @@ -118,6 +119,12 @@ bin/dx build-tools/${PLATFORM_NAME}/dx
framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar
bin/dexdump build-tools/${PLATFORM_NAME}/dexdump

# multi-dex
prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar
prebuilts/sdk/tools/jack.jar build-tools/${PLATFORM_NAME}/jack.jar
prebuilts/sdk/tools/jill.jar build-tools/${PLATFORM_NAME}/jill.jar
dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/mainDexClasses.rules


##############################################################################
# Platform Component
Expand Down Expand Up @@ -177,6 +184,9 @@ docs/features.txt platforms/${PLATFORM_NAME}/data/featur
# fonts for layoutlib.
${FONT_OUT} platforms/${PLATFORM_NAME}/data/fonts

# timezone data for layoutlib
bionic/libc/zoneinfo/tzdata platforms/${PLATFORM_NAME}/data/tzdata

# NOTICE files are copied by build/core/Makefile from sdk.git
development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt
development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/data/NOTICE.txt
Expand Down Expand Up @@ -241,6 +251,11 @@ developers/build/prebuilts/gradle/ActivityInstrumentation/ sam
developers/build/prebuilts/gradle/MediaRecorder/ samples/${PLATFORM_NAME}/media/MediaRecorder
developers/build/prebuilts/gradle/BasicMediaRouter/ samples/${PLATFORM_NAME}/media/BasicMediaRouter
developers/build/prebuilts/gradle/BasicMediaDecoder/ samples/${PLATFORM_NAME}/media/BasicMediaDecoder
developers/build/prebuilts/gradle/MediaBrowserService/ samples/${PLATFORM_NAME}/media/MediaBrowserService
developers/build/prebuilts/gradle/BasicNotifications/ samples/${PLATFORM_NAME}/notification/BasicNotifications
developers/build/prebuilts/gradle/CustomNotifications/ samples/${PLATFORM_NAME}/notification/CustomNotifications
developers/build/prebuilts/gradle/LNotifications/ samples/${PLATFORM_NAME}/notification/LNotifications
developers/build/prebuilts/gradle/MessagingService/ samples/${PLATFORM_NAME}/notification/MessagingService
developers/build/prebuilts/gradle/BorderlessButtons/ samples/${PLATFORM_NAME}/ui/BorderlessButtons
developers/build/prebuilts/gradle/BasicAccessibility/ samples/${PLATFORM_NAME}/ui/BasicAccessibility
developers/build/prebuilts/gradle/CustomChoiceList/ samples/${PLATFORM_NAME}/ui/CustomChoiceList
Expand All @@ -250,8 +265,6 @@ developers/build/prebuilts/gradle/ActionBarCompat-Styled/ sam
developers/build/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-ListPopupMenu
developers/build/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-ShareActionProvider
developers/build/prebuilts/gradle/ActionBarCompat-Basic/ samples/${PLATFORM_NAME}/ui/ActionBarCompat-Basic
developers/build/prebuilts/gradle/BasicNotifications/ samples/${PLATFORM_NAME}/ui/BasicNotifications
developers/build/prebuilts/gradle/CustomNotifications/ samples/${PLATFORM_NAME}/ui/CustomNotifications
developers/build/prebuilts/gradle/DoneBar/ samples/${PLATFORM_NAME}/ui/DoneBar
developers/build/prebuilts/gradle/BasicImmersiveMode/ samples/${PLATFORM_NAME}/ui/BasicImmersiveMode
developers/build/prebuilts/gradle/AdvancedImmersiveMode/ samples/${PLATFORM_NAME}/ui/AdvancedImmersiveMode
Expand Down Expand Up @@ -284,41 +297,46 @@ developers/build/prebuilts/gradle/NavigationDrawer sam
developers/build/prebuilts/gradle/ElevationBasic samples/${PLATFORM_NAME}/ui/views/Elevation/ElevationBasic
developers/build/prebuilts/gradle/ElevationDrag samples/${PLATFORM_NAME}/ui/views/Elevation/ElevationDrag
developers/build/prebuilts/gradle/ClippingBasic samples/${PLATFORM_NAME}/ui/views/Clipping/ClippingBasic
developers/build/prebuilts/gradle/JobScheduler samples/${PLATFORM_NAME}/ui/views/Clipping/JobScheduler
developers/build/prebuilts/gradle/JobScheduler samples/${PLATFORM_NAME}/background/JobScheduler
developers/build/prebuilts/gradle/HdrViewfinder samples/${PLATFORM_NAME}/media/HdrViewfinder
developers/build/prebuilts/gradle/DocumentCentricApps samples/${PLATFORM_NAME}/ui/activitytasks/DocumentCentricApps
developers/build/prebuilts/gradle/DocumentCentricRelinquishIdentity samples/${PLATFORM_NAME}/ui/activitytasks/DocumentCentricRelinquishIdentity
developers/build/prebuilts/gradle/AppRestrictionEnforcer samples/${PLATFORM_NAME}/admin/AppRestrictionEnforcer
developers/build/prebuilts/gradle/AppRestrictionSchema samples/${PLATFORM_NAME}/admin/AppRestrictionSchema
developers/build/prebuilts/gradle/RecyclerView samples/${PLATFORM_NAME}/ui/views/RecyclerView
developers/build/prebuilts/gradle/CardView samples/${PLATFORM_NAME}/ui/views/CardView
developers/build/prebuilts/gradle/LNotifications samples/${PLATFORM_NAME}/ui/notifications/LNotifications
developers/build/prebuilts/gradle/DrawableTinting samples/${PLATFORM_NAME}/ui/DrawableTinting
developers/build/prebuilts/gradle/Interpolator samples/${PLATFORM_NAME}/ui/Interpolator
developers/build/prebuilts/gradle/PdfRendererBasic samples/${PLATFORM_NAME}/ui/graphics/PdfRendererBasic
developers/build/prebuilts/gradle/FloatingActionButtonBasic samples/${PLATFORM_NAME}/ui/views/FloatingActionButton/FloatingActionButtonBasic
developers/build/prebuilts/gradle/RevealEffectBasic samples/${PLATFORM_NAME}/ui/views/RevealEffect/RevealEffectBasic
developers/build/prebuilts/gradle/PermissionRequest samples/${PLATFORM_NAME}/content/webview/PermissionRequest
developers/build/prebuilts/gradle/DirectorySelection samples/${PLATFORM_NAME}/content/documentsUi/DirectorySelection
developers/build/prebuilts/gradle/AppUsageStatistics samples/${PLATFORM_NAME}/system/AppUsageStatistics
developers/build/prebuilts/gradle/ScreenCapture samples/${PLATFORM_NAME}/media/ScreenCapture

developers/build/prebuilts/androidtv samples/${PLATFORM_NAME}/androidtv

# Wearable sample tree
development/samples/wearable/AgendaData samples/${PLATFORM_NAME}/wearable/AgendaData
development/samples/wearable/DataLayer samples/${PLATFORM_NAME}/wearable/DataLayer
development/samples/wearable/DelayedConfirmation samples/${PLATFORM_NAME}/wearable/DelayedConfirmation
development/samples/wearable/ElizaChat samples/${PLATFORM_NAME}/wearable/ElizaChat
development/samples/wearable/EmbeddedApp samples/${PLATFORM_NAME}/wearable/EmbeddedApp
development/samples/wearable/FindMyPhone samples/${PLATFORM_NAME}/wearable/FindMyPhone
development/samples/wearable/Flashlight samples/${PLATFORM_NAME}/wearable/Flashlight
development/samples/wearable/Geofencing samples/${PLATFORM_NAME}/wearable/Geofencing
development/samples/wearable/GridViewPager samples/${PLATFORM_NAME}/wearable/GridViewPager
development/samples/wearable/JumpingJack samples/${PLATFORM_NAME}/wearable/JumpingJack
development/samples/wearable/Notifications samples/${PLATFORM_NAME}/wearable/Notifications
development/samples/wearable/Quiz samples/${PLATFORM_NAME}/wearable/Quiz
development/samples/wearable/RecipeAssistant samples/${PLATFORM_NAME}/wearable/RecipeAssistant
development/samples/wearable/SkeletonWearableApp samples/${PLATFORM_NAME}/wearable/SkeletonWearableApp
development/samples/wearable/SynchronizedNotifications samples/${PLATFORM_NAME}/wearable/SynchronizedNotifications
development/samples/wearable/Timer samples/${PLATFORM_NAME}/wearable/Timer
development/samples/wearable/WatchViewStub samples/${PLATFORM_NAME}/wearable/WatchViewStub
developers/build/prebuilts/gradle/AgendaData samples/${PLATFORM_NAME}/wearable/AgendaData
developers/build/prebuilts/gradle/DataLayer samples/${PLATFORM_NAME}/wearable/DataLayer
developers/build/prebuilts/gradle/DelayedConfirmation samples/${PLATFORM_NAME}/wearable/DelayedConfirmation
developers/build/prebuilts/gradle/ElizaChat samples/${PLATFORM_NAME}/wearable/ElizaChat
developers/build/prebuilts/gradle/EmbeddedApp samples/${PLATFORM_NAME}/wearable/EmbeddedApp
developers/build/prebuilts/gradle/FindMyPhone samples/${PLATFORM_NAME}/wearable/FindMyPhone
developers/build/prebuilts/gradle/Flashlight samples/${PLATFORM_NAME}/wearable/Flashlight
developers/build/prebuilts/gradle/Geofencing samples/${PLATFORM_NAME}/wearable/Geofencing
developers/build/prebuilts/gradle/GridViewPager samples/${PLATFORM_NAME}/wearable/GridViewPager
developers/build/prebuilts/gradle/JumpingJack samples/${PLATFORM_NAME}/wearable/JumpingJack
developers/build/prebuilts/gradle/Notifications samples/${PLATFORM_NAME}/wearable/Notifications
developers/build/prebuilts/gradle/Quiz samples/${PLATFORM_NAME}/wearable/Quiz
developers/build/prebuilts/gradle/RecipeAssistant samples/${PLATFORM_NAME}/wearable/RecipeAssistant
developers/build/prebuilts/gradle/SkeletonWearableApp samples/${PLATFORM_NAME}/wearable/SkeletonWearableApp
developers/build/prebuilts/gradle/SpeedTracker samples/${PLATFORM_NAME}/wearable/SpeedTracker
developers/build/prebuilts/gradle/SynchronizedNotifications samples/${PLATFORM_NAME}/wearable/SynchronizedNotifications
developers/build/prebuilts/gradle/Timer samples/${PLATFORM_NAME}/wearable/Timer
developers/build/prebuilts/gradle/WatchFace samples/${PLATFORM_NAME}/wearable/WatchFace
developers/build/prebuilts/gradle/WatchViewStub samples/${PLATFORM_NAME}/wearable/WatchViewStub

# Old sample tree
development/samples/AccelerometerPlay samples/${PLATFORM_NAME}/legacy/AccelerometerPlay
Expand Down
1 change: 1 addition & 0 deletions build/tools/windows_sdk.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ WIN_TARGETS := \
prebuilt \
sqlite3 \
zipalign \
split-select \
$(WIN_SDK_TARGETS)

# This is the list of *Linux* build tools that we need
Expand Down
1 change: 1 addition & 0 deletions build/windows_sdk_whitelist.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ subdirs += \
external/clang \
external/easymock \
external/expat \
external/gtest \
external/libcxx \
external/libcxxabi \
external/compiler-rt \
Expand Down
2 changes: 1 addition & 1 deletion docs/copyright-templates/asm.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; Copyright 2013 The Android Open Source Project
; Copyright 2015 The Android Open Source Project
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/copyright-templates/bash.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright 2013 The Android Open Source Project
# Copyright 2015 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/copyright-templates/bsd/c.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013 The Android Open Source Project
* Copyright 2015 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion docs/copyright-templates/c.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013 The Android Open Source Project
* Copyright 2015 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/copyright-templates/java.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013 The Android Open Source Project
* Copyright 2015 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/copyright-templates/make.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2013 The Android Open Source Project
# Copyright 2015 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/copyright-templates/plain.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2013 The Android Open Source Project
Copyright 2015 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/copyright-templates/sh.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright 2013 The Android Open Source Project
# Copyright 2015 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docs/copyright-templates/xml.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2013 The Android Open Source Project
<!-- Copyright 2015 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
1 change: 1 addition & 0 deletions samples/ApiDemos/res/layout/media_projection.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
android:orientation="horizontal"
android:layout_alignParentBottom="true">
<ToggleButton
android:id="@+id/screen_sharing_toggle"
android:text="@string/screen_sharing_toggle"
android:layout_width="0dp"
android:layout_height="match_parent"
Expand Down
Loading

0 comments on commit 5b88c44

Please sign in to comment.