OSDN Git Service
Torne (Richard Coles) [Mon, 17 Mar 2014 17:58:29 +0000 (17:58 +0000)]
Merge "Fix javadoc." into klp-modular-dev
Geoff Mendal [Mon, 17 Mar 2014 17:54:58 +0000 (17:54 +0000)]
am
c3281db2: (-s ours) am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
c3281db2fb874f56d5612b9d3f07bd91067755ac':
Import translations. DO NOT MERGE
Torne (Richard Coles) [Mon, 17 Mar 2014 17:51:40 +0000 (17:51 +0000)]
Fix javadoc.
Fix javadoc reference missing a #
Bug:
13246311
Change-Id: Ifc06234943339250feb5b4f2077af03c35be076e
Geoff Mendal [Mon, 17 Mar 2014 16:46:53 +0000 (16:46 +0000)]
am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
6532523652cf16d3e498939965defab4bd22c491':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 16:34:19 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
Auto-generated-cl: translation import
Leon Scroggins III [Tue, 14 Jan 2014 20:14:57 +0000 (15:14 -0500)]
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:
13191516
Original CLs below:
In nativeDecodeFileDescriptor, use fdopen.
Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.
BUG:
11669944
BUG:
11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41
-------------------------------------------------------------------------
Decode file descriptor from the correct offset.
Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
The old behavior would have continued to modify the
file descriptor's offset each time a new decode was
required. The copy ensures that the file descriptor
remains unchanged.
3. Buffer the file stream.
Prior to this change, if the image was not a PNG,
the stream would be rewound to the beginning of the
file, even if the file descriptor was passed in with
an offset. Thanks to the buffer, the stream is only
rewound to the original offset.
Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia
BUG:
12807677
BUG:
12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
Leon Scroggins III [Tue, 3 Dec 2013 21:26:51 +0000 (16:26 -0500)]
Update framework to use M33 Skia. DO NOT MERGE
(These CLs are already in master.)
Bug:
13246311
This cherry-picks 7 CLs:
-----------------------------------------------------------------------
Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia.
Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.
cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
-----------------------------------------------------------------------
Merge AssetStream with AssetStreamAdaptor.
Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.
The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
the length (read(NULL, 0)) is no longer implemented, since it is
no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
so some implementation is necessary.
cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56
-----------------------------------------------------------------------
Deprecate Android-specific SkPaint functions.
The following functions were problematic:
const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
const void* findImage(const SkGlyph&, const SkMatrix*);
Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.
Bug:
11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08
-----------------------------------------------------------------------
pass SkGlyphCache into updateGlyphCache()
Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.
Bug:
11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89
-----------------------------------------------------------------------
Updates to the Skia API needed to merge the WebView m33 version of Skia.
cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3
Bugfix for screenshots (recent apps) due to incorrect rowBytes computation
bug:
12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714
-----------------------------------------------------------------------
Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.
cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5
-----------------------------------------------------------------------
Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33
Conflicts:
core/jni/android/graphics/Bitmap.cpp
core/jni/android/graphics/Graphics.cpp
core/jni/android/graphics/Typeface.cpp
graphics/java/android/graphics/Bitmap.java
Craig Mautner [Fri, 14 Mar 2014 23:49:50 +0000 (16:49 -0700)]
Merge commit '
54d5702c' into manualmerge
Conflicts:
services/core/java/com/android/server/am/TaskRecord.java
Change-Id: Id7bc15b6c3e47d8705c228b311c4d85a47c13dbe
Tim Kilbourn [Fri, 14 Mar 2014 23:13:45 +0000 (23:13 +0000)]
Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev
Marco Nelissen [Fri, 14 Mar 2014 22:55:50 +0000 (22:55 +0000)]
am
105c4792: am
10a07a04: Merge "Verify certificates" into klp-dev
* commit '
105c47924f7af9319ec9242b952b4bf074585229':
Verify certificates
Daniel 2 Olofsson [Fri, 14 Mar 2014 22:55:45 +0000 (22:55 +0000)]
am
4111e7e1: am
09421fab: Re-initialize error after attach
* commit '
4111e7e17665b1142853c71e9fd1cf6af5f68b82':
Re-initialize error after attach
Craig Mautner [Fri, 14 Mar 2014 22:36:15 +0000 (22:36 +0000)]
am
477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev
* commit '
477897ad7b0725fa68d32a94bf8c24264068fd5c':
Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
Marco Nelissen [Fri, 14 Mar 2014 22:32:02 +0000 (22:32 +0000)]
am
10a07a04: Merge "Verify certificates" into klp-dev
* commit '
10a07a043f7fa47148ae2cc2fcd6b0edeb52190b':
Verify certificates
Craig Mautner [Fri, 14 Mar 2014 22:30:04 +0000 (22:30 +0000)]
Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.
Fixes bug
12171535.
Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
Daniel 2 Olofsson [Fri, 14 Mar 2014 22:27:52 +0000 (22:27 +0000)]
am
09421fab: Re-initialize error after attach
* commit '
09421fab0784bcfc6660a09d02faea7835c28e31':
Re-initialize error after attach
Marco Nelissen [Fri, 14 Mar 2014 22:27:22 +0000 (22:27 +0000)]
Merge "Verify certificates" into klp-dev
Selim Cinek [Fri, 14 Mar 2014 21:55:05 +0000 (21:55 +0000)]
am
9c3fc0cc: am
eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height
* commit '
9c3fc0cc6003c4f66f32d8e5f22a4f3e7d22f817':
DO NOT MERGE - Fixed crash for odd image width/height
Craig Mautner [Fri, 14 Mar 2014 21:54:52 +0000 (21:54 +0000)]
am
00c7d34c: am
ff89d589: Merge commit \'
3b9de0a4\' into manualmerge
* commit '
00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2':
Show the keyguard if unsecure window on top
Yohei Yukawa [Fri, 14 Mar 2014 21:54:49 +0000 (21:54 +0000)]
am
fd2f8d43: am
51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit '
fd2f8d43419d1f25ced8b2bac96407925dd4c471':
DO NOT MERGE - Preserve the order of InputMethodManager method calls
Craig Mautner [Fri, 14 Mar 2014 21:54:45 +0000 (21:54 +0000)]
am
a921d8b6: am
3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev
* commit '
a921d8b6b1a3478f258b9999ed909907216edbae':
Fix activities appearing behind launcher icons
Daniel 2 Olofsson [Tue, 13 Aug 2013 08:30:26 +0000 (10:30 +0200)]
Re-initialize error after attach
If flag for error after attach is not reinitialized, it may cause
NullPointerException on subsequent onAttachedWindow if error text
was reset to null.
Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38
Mike Lockwood [Fri, 14 Mar 2014 21:42:58 +0000 (21:42 +0000)]
am
ff64f5ed: am
381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
* commit '
ff64f5ed7c2b55878d149d546092e029cba15465':
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
Selim Cinek [Fri, 14 Mar 2014 20:47:34 +0000 (20:47 +0000)]
am
eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height
* commit '
eb95e74e21a0e910704ca2fd67e074ab640bfba3':
DO NOT MERGE - Fixed crash for odd image width/height
Tim Kilbourn [Fri, 14 Mar 2014 20:44:12 +0000 (13:44 -0700)]
FEATURE_LEANBACK implies that the device is a tv.
For managing the ui mode, consider the device to be a television if it
has either the FEATURE_TELEVISION or FEATURE_LEANBACK system features.
When leanback is available for non-television devices, we need to
reconsider the use of these features for setting the television ui mode.
Change-Id: I7b82372ce19067e010be9b42111816bab186f95b
Tim Kilbourn [Fri, 14 Mar 2014 20:38:51 +0000 (20:38 +0000)]
Merge "Add leanback device features." into klp-modular-dev
Selim Cinek [Fri, 14 Mar 2014 17:42:48 +0000 (18:42 +0100)]
DO NOT MERGE - Fixed crash for odd image width/height
Due to an internal rounding in the renderer, the calculations
for the cropping area could be slightly offset, getting out
of the image boundaries. I sanitized the rect by ensuring they
are inside the image.
Bug:
12174629
Change-Id: Icc37790732ddd479631b898b23c05501d2dcd5be
Ricardo Cervera [Fri, 14 Mar 2014 16:28:46 +0000 (16:28 +0000)]
am
50694917: am
7e566239: Merge "docs: Updated Building your First App tutorial. Bug:
13429905" into klp-docs
* commit '
506949173761f9bde016b9d74de94df4b63df370':
docs: Updated Building your First App tutorial. Bug:
13429905
Joe Fernandez [Fri, 14 Mar 2014 16:28:30 +0000 (16:28 +0000)]
am
8bb11153: am
f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs
* commit '
8bb11153f946a95485644b08a067472735810ef2':
Doc change: Update developer video on home page carousel.
John Spurlock [Fri, 14 Mar 2014 16:28:26 +0000 (16:28 +0000)]
am
ad66c27b: am
6d9b034c: Fix typo in public logcat page.
* commit '
ad66c27b9c2f2dce1b9443018a7c4d097bc08fc3':
Fix typo in public logcat page.
Ricardo Cervera [Fri, 14 Mar 2014 16:28:22 +0000 (16:28 +0000)]
am
8714a343: am
ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit '
8714a3437e13b4a403e49c4c624f272dd6dc8f4e':
docs: Added step to get JDK to the Android Studio install instructions.
Katie McCormick [Fri, 14 Mar 2014 16:28:18 +0000 (16:28 +0000)]
am
b681794d: am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
b681794d2583e06693c23eec1af4e282b067abd9':
Doc update: new doc studio layout editor
John Spurlock [Fri, 14 Mar 2014 16:28:15 +0000 (16:28 +0000)]
am
62826f55: am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
62826f55be4415684b4e321469298ba43d598bbb':
Fix doc typos in AppOpsManager.java
JP Abgrall [Fri, 14 Mar 2014 16:28:09 +0000 (16:28 +0000)]
am
4ecd833e: am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
4ecd833ee35d1120f8c1ae52367947cacfc263a4':
ConnectivityService: add support to set TCP initial rwnd
Chad Brubaker [Fri, 14 Mar 2014 16:27:58 +0000 (16:27 +0000)]
am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
78f204aed8c0f3c8174616801d66f96a9a00a5fd':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 16:27:55 +0000 (16:27 +0000)]
am
fc1d0471: am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 16:27:51 +0000 (16:27 +0000)]
am
16858164: am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
16858164c73f0696d12161e97bad9cb22c55e603':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 16:27:44 +0000 (16:27 +0000)]
am
a5a921e3: (-s ours) am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 16:27:40 +0000 (16:27 +0000)]
am
e5191aab: am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
e5191aabff5b9b751349b8634836a858af744905':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 16:27:35 +0000 (16:27 +0000)]
am
825dd9dd: am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
825dd9dd38a42306d18a627768b16204cf4d8710':
Retain display when creating specialized contexts. (DO NOT MERGE)
Zhihai Xu [Fri, 14 Mar 2014 15:56:47 +0000 (15:56 +0000)]
am
bdd4c31a: am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Craig Mautner [Fri, 14 Mar 2014 08:47:54 +0000 (08:47 +0000)]
am
ff89d589: Merge commit \'
3b9de0a4\' into manualmerge
* commit '
ff89d589c7eb32265bf70068ffaef24104a580a5':
Show the keyguard if unsecure window on top
Craig Mautner [Fri, 14 Mar 2014 04:09:35 +0000 (21:09 -0700)]
Merge commit '
3b9de0a4' into manualmerge
Conflicts:
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Change-Id: I5433912e9d97a20bec6c8e287450550daab6d89b
Jeff Brown [Fri, 14 Mar 2014 04:07:33 +0000 (21:07 -0700)]
resolved conflicts for merge of
db3146c0 to klp-modular-dev
Change-Id: I1500228392add2de325b9530ae33d7c3e738c021
Yohei Yukawa [Fri, 14 Mar 2014 03:03:08 +0000 (03:03 +0000)]
am
51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit '
51b921d0e33302b3f431dcfa15bd6588408525ea':
DO NOT MERGE - Preserve the order of InputMethodManager method calls
Yohei Yukawa [Wed, 5 Mar 2014 05:53:01 +0000 (14:53 +0900)]
DO NOT MERGE - Preserve the order of InputMethodManager method calls
Cherrypick of I0f8d33b0c77129f72581bc43e7f4fdc25469b520
This CL allows the Framework class InputMethodManager to behave
in a more deterministic way, that is to say, with an I/O barrier.
InputMethodManager#setAdditionalInputMethodSubtypes is internally
implemented as a RPC to the corresponding counterpart in
InputMethodManagerService. The problem here is that this RPC is
marked as "oneway". As a consequence, this public API call
returns immediately without waiting the additional subtypes are
actually added. This behavior is also not documented so far
unfortunately.
See the following demo code:
Final InputMethodManager imm = ...;
imm.setAdditionalInputMethodSubtypes(id, subTypes);
Final List<InputMethodInfo> ims = imm.getInputMethodList();
Currently, it is not guaranteed that the InputMethodInfo returned
from #getInputMethodList reflects the result of the previous call
of #setAdditionalInputMethodSubtypes because of its undocumented
asynchronous nature.
With this CL, InputMethodManager#setAdditionalInputMethodSubtypes
behaves as if it has I/O barrier. This change should make it easy
for IME developers to use additional subtype mechanism.
BUG:
13033954
BUG:
13291370
Change-Id: I0455b176bfb3176c533ba3241881f05092b98abc
Craig Mautner [Fri, 14 Mar 2014 02:47:29 +0000 (19:47 -0700)]
am
00e12e61: am
1066fc61: Resolved conflicts for merge of
ad63d914 to jb-mr2-dev
* commit '
00e12e61472d850c00cf1e479fda2b371ead1257':
Show the keyguard if unsecure window on top
Craig Mautner [Fri, 14 Mar 2014 02:40:49 +0000 (19:40 -0700)]
am
1066fc61: Resolved conflicts for merge of
ad63d914 to jb-mr2-dev
* commit '
1066fc61a371443e9423f890f6f7615f2d1e4c6c':
Show the keyguard if unsecure window on top
Craig Mautner [Fri, 14 Mar 2014 00:42:43 +0000 (00:42 +0000)]
am
3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev
* commit '
3217cc6ff2b3139d8854a3f681da6ae1d163ac92':
Fix activities appearing behind launcher icons
Craig Mautner [Fri, 14 Mar 2014 00:40:20 +0000 (00:40 +0000)]
Merge "Fix activities appearing behind launcher icons" into klp-dev
Adam Powell [Thu, 13 Mar 2014 23:53:38 +0000 (23:53 +0000)]
am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
898d6d964cb3b650b5c9bed2276310547e5455e0':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Mike Lockwood [Thu, 13 Mar 2014 23:34:46 +0000 (23:34 +0000)]
am
381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
* commit '
381374b3cd66f364fd644c21f2d9128bcde2f58a':
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
Mike Lockwood [Thu, 13 Mar 2014 23:32:17 +0000 (23:32 +0000)]
Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
Craig Mautner [Thu, 13 Mar 2014 23:16:20 +0000 (16:16 -0700)]
Fix activities appearing behind launcher icons
cherry picked from
d5c91ece7bfea74ee7ab2bc86f3cb3f5c531f866
Change-Id: I76d20398e71c1be4accfaed6b0791674197b4fb0
Ricardo Cervera [Thu, 13 Mar 2014 22:25:20 +0000 (22:25 +0000)]
am
7e566239: Merge "docs: Updated Building your First App tutorial. Bug:
13429905" into klp-docs
* commit '
7e566239656c1de32a3bf695cd2ea3a28f1e906b':
docs: Updated Building your First App tutorial. Bug:
13429905
Ricardo Cervera [Thu, 13 Mar 2014 22:21:44 +0000 (22:21 +0000)]
Merge "docs: Updated Building your First App tutorial. Bug:
13429905" into klp-docs
Joe Fernandez [Thu, 13 Mar 2014 22:15:11 +0000 (22:15 +0000)]
am
f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs
* commit '
f7267c8bdc5431d486e8bb34722d492be82e44f3':
Doc change: Update developer video on home page carousel.
John Spurlock [Thu, 13 Mar 2014 22:15:09 +0000 (22:15 +0000)]
am
6d9b034c: Fix typo in public logcat page.
* commit '
6d9b034ce169eeaa7e49574f4694ec96651c7f4e':
Fix typo in public logcat page.
Ricardo Cervera [Thu, 13 Mar 2014 22:15:06 +0000 (22:15 +0000)]
am
ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit '
ef6c94700589958789039749248895a2631ebe55':
docs: Added step to get JDK to the Android Studio install instructions.
Katie McCormick [Thu, 13 Mar 2014 22:15:01 +0000 (22:15 +0000)]
am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
07c0ad973a2fdd8a35b3627e69f1134673c8b8e0':
Doc update: new doc studio layout editor
John Spurlock [Thu, 13 Mar 2014 22:14:57 +0000 (22:14 +0000)]
am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
f6228d95eae7b05dd0015b3062e72c89148e65a2':
Fix doc typos in AppOpsManager.java
Tim Kilbourn [Fri, 7 Mar 2014 23:13:48 +0000 (15:13 -0800)]
Add leanback device features.
android.software.leanback - the device supports leanback UIs.
android.software.leanback_only - the device ONLY supports leanback UIs.
leanback_only is a hidden feature for now.
Change-Id: I497bd96464125ad81212c804e150f210f3e95af2
Ricardo Cervera [Wed, 12 Mar 2014 23:02:51 +0000 (16:02 -0700)]
docs: Updated Building your First App tutorial. Bug:
13429905
-Updated default code in activities from ADT
-Updated screenshots for ADT wizards when changed
-Updated activity_ with fragment_ where required
-Other minor changes
Stage: http://quixote.mtv:8004/training/basics/firstapp/creating-project.html
Patch: Removed border from the new ADT screenshots.
Patch: Replaced device screenshots using an Android 4.4 device.
Patch: Addressed Katie's comments.
Change-Id: Ic0acf714b1b5913f1f82d6eafac53666a721dfe4
Marco Nelissen [Thu, 13 Mar 2014 21:18:59 +0000 (14:18 -0700)]
Verify certificates
b/
13418320
Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
JP Abgrall [Thu, 13 Mar 2014 20:36:51 +0000 (20:36 +0000)]
am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a':
ConnectivityService: add support to set TCP initial rwnd
JP Abgrall [Thu, 13 Mar 2014 20:33:43 +0000 (20:33 +0000)]
Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
Craig Mautner [Thu, 13 Mar 2014 19:35:23 +0000 (12:35 -0700)]
Resolved conflicts for merge of
ad63d914 to jb-mr2-dev
Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b
Narayan Kamath [Thu, 13 Mar 2014 18:18:48 +0000 (18:18 +0000)]
am
9af19bee: am
52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt.
* commit '
9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Naofumi Harada [Thu, 13 Mar 2014 18:18:45 +0000 (18:18 +0000)]
am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
3b18226133f27a5fe9e18f7da17d4cd0d0fa0471':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Thu, 13 Mar 2014 18:18:40 +0000 (18:18 +0000)]
am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
7fb074389370ac93afc5830189371dc3ec26265c':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Thu, 13 Mar 2014 18:18:36 +0000 (18:18 +0000)]
am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
1011960c44a4f84d53d05199fe1ca09be9473822':
Add the calling package name to requestRouteToHost
Chad Brubaker [Thu, 13 Mar 2014 18:12:36 +0000 (18:12 +0000)]
am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac':
Remove SO_BINDTODEVICE from VPN protect
Chad Brubaker [Thu, 13 Mar 2014 18:09:57 +0000 (18:09 +0000)]
Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
Craig Mautner [Thu, 13 Mar 2014 18:01:13 +0000 (11:01 -0700)]
am
20a4f490: am
817f5586: am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
20a4f490957407b9534fc453833de2fe2f276426':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:58:11 +0000 (10:58 -0700)]
am
817f5586: am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
817f5586053ae135a59cd0768980ca741e9215b0':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:55:31 +0000 (10:55 -0700)]
am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
3d958f81c54252b452631ea1bb6e7954fc7066c8':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:51:39 +0000 (10:51 -0700)]
am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
468e8e9873d764c090576d70aebf658e3e89bbfe':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:47:49 +0000 (10:47 -0700)]
am
1f52437d: Show the keyguard if unsecure window on top
* commit '
1f52437de9aa6089a72c7c992f9e7291a6a96115':
Show the keyguard if unsecure window on top
Jose Lima [Thu, 13 Mar 2014 17:40:36 +0000 (17:40 +0000)]
Merge "Add banner attribute to app manifest" into klp-modular-dev
Svetoslav [Thu, 13 Mar 2014 17:31:03 +0000 (17:31 +0000)]
am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
11b7d9fa6685e742f5b3e3235a8e6e4920dbed02':
PrintSpooler crash if printer is reported to have only one color mode.
Svetoslav [Thu, 13 Mar 2014 17:26:44 +0000 (17:26 +0000)]
Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
Adrian Roos [Thu, 13 Mar 2014 17:26:26 +0000 (17:26 +0000)]
am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Thu, 13 Mar 2014 17:22:58 +0000 (17:22 +0000)]
Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
Christopher Tate [Thu, 13 Mar 2014 17:19:17 +0000 (17:19 +0000)]
am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
87503f8561296fea489f8a3fe8384f61150976da':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 17:19:14 +0000 (17:19 +0000)]
am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
Import translations. DO NOT MERGE
Joe Fernandez [Thu, 13 Mar 2014 17:15:16 +0000 (17:15 +0000)]
Merge "Doc change: Update developer video on home page carousel." into klp-docs
John Spurlock [Thu, 13 Mar 2014 16:40:12 +0000 (12:40 -0400)]
Fix typo in public logcat page.
Change-Id: I3b2c9ab53c305ecbb93579be474dc85462d3e2e2
Baligh Uddin [Thu, 13 Mar 2014 16:25:45 +0000 (16:25 +0000)]
am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4545b1d29b23cbfe11aa7ca6b54f6518a38db278':
Import translations. DO NOT MERGE
Ricardo Cervera [Thu, 13 Mar 2014 16:23:31 +0000 (16:23 +0000)]
Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
Baligh Uddin [Thu, 13 Mar 2014 16:22:52 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Adrian Roos [Mon, 10 Mar 2014 16:00:11 +0000 (17:00 +0100)]
DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit
7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
Bug:
13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
Alan Viverette [Thu, 13 Mar 2014 10:01:39 +0000 (10:01 +0000)]
am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
9ebe031cdc916646e95ffcd92dde67e1655be7ba':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Thu, 13 Mar 2014 10:01:35 +0000 (10:01 +0000)]
am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
7b09a4e5df908783a95dbfef3bc9fabda339c3a1':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Thu, 13 Mar 2014 10:01:30 +0000 (10:01 +0000)]
am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
3c3377a2290764937548de5a49ca8ec28dc98153':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Thu, 13 Mar 2014 10:01:15 +0000 (10:01 +0000)]
am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
75958c298477a3d1e556c4fe36e516b9e828c311':
Fix a bug in submenu presenter priority handling
Jason Sams [Thu, 13 Mar 2014 08:49:05 +0000 (01:49 -0700)]
Force merge of remaining KLP changes to fix build.
Change-Id: I389a23c6615663c325980fcb30350ea6635d2d17
Jason Sams [Thu, 13 Mar 2014 08:17:49 +0000 (01:17 -0700)]
Fix build issues from bad merge
Change-Id: I6ebac7c87b807a8ed2fbeac895c1db8b199f715a
Jason Sams [Thu, 13 Mar 2014 07:39:04 +0000 (00:39 -0700)]
resolved conflicts for merge of
780d57b8 to klp-modular-dev
Change-Id: Idf2f939c25c342fff98da6b83be875d7708deba0
JP Abgrall [Fri, 21 Feb 2014 20:05:20 +0000 (12:05 -0800)]
ConnectivityService: add support to set TCP initial rwnd
The value for the TCP initial receive window comes from,
in order,
kernel
/proc/sys/net/ipv4/tcp_default_init_rwnd
init.rc (via properties)
net.tcp.default_init_rwnd
properties
net.tcp.default_init_rwnd
gservices
Settings.Global.TCP_DEFAULT_INIT_RWND
Bug:
12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
Jason Sams [Thu, 13 Mar 2014 01:35:42 +0000 (01:35 +0000)]
am
e14d5e90: am
5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '
e14d5e901172559a5e18077bde3ccafd03e8a6e2':
Add hidden minor version ID for support lib workarounds.