OSDN Git Service
John Spurlock [Mon, 10 Mar 2014 16:24:31 +0000 (16:24 +0000)]
am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
b2bd63f00631b68df3595a4369ec4802e6443bc7':
Fix doc typos in Vibrator.java
Scott Main [Mon, 10 Mar 2014 16:24:29 +0000 (16:24 +0000)]
am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
29de50633348fb6329ed38980abce0010253a941':
fix some typos for GoogleApiClient doc
Scott Main [Mon, 10 Mar 2014 16:24:26 +0000 (16:24 +0000)]
am
69e49a81: Merge "fix typos" into klp-docs
* commit '
69e49a819a5fd3a9d0ede1ba18f204e5e2050da6':
fix typos
John Spurlock [Mon, 10 Mar 2014 16:22:22 +0000 (16:22 +0000)]
Merge "Fix doc typos in Vibrator.java" into klp-docs
Scott Main [Mon, 10 Mar 2014 16:21:10 +0000 (16:21 +0000)]
Merge "fix some typos for GoogleApiClient doc" into klp-docs
Scott Main [Mon, 10 Mar 2014 16:20:45 +0000 (16:20 +0000)]
Merge "fix typos" into klp-docs
John Spurlock [Mon, 10 Mar 2014 15:29:35 +0000 (11:29 -0400)]
Fix doc typos in Vibrator.java
Change-Id: Ie95cd7fa16042897e6acf94badec98bc19bde57a
Wei Wang [Sat, 8 Mar 2014 02:05:57 +0000 (02:05 +0000)]
am
1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '
1327e59f36ceea5a1ee7dc66b311206345353de5':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Wei Wang [Sat, 8 Mar 2014 02:01:01 +0000 (02:01 +0000)]
Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
Adam Powell [Fri, 7 Mar 2014 23:38:30 +0000 (23:38 +0000)]
am
f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
* commit '
f175b19aaac7ffe5553013d996a073693cac929d':
Fix a bug where OnTouchListeners in action views could be removed
Marco Nelissen [Fri, 7 Mar 2014 23:38:27 +0000 (23:38 +0000)]
am
57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
* commit '
57a45f22ea7b0509fb918fa39e797a6061f75438':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Craig Mautner [Fri, 7 Mar 2014 23:38:20 +0000 (23:38 +0000)]
am
93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '
93df07a1b72488b64354098cd00dff1d36b76b12':
Show the keyguard if unsecure window on top. DO NOT MERGE.
Adam Powell [Fri, 7 Mar 2014 23:28:19 +0000 (23:28 +0000)]
Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 22:49:33 +0000 (22:49 +0000)]
Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
Craig Mautner [Fri, 7 Mar 2014 22:30:25 +0000 (22:30 +0000)]
Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
Elliott Hughes [Wed, 13 Nov 2013 23:10:40 +0000 (15:10 -0800)]
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/
12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
Marco Nelissen [Fri, 7 Mar 2014 21:12:21 +0000 (21:12 +0000)]
am
9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '
9823a170e4f9ff1d9233eb7eb661c4d418c2e2a7':
Make MtpDatabase use libexif instead of libjhead
Vineeta Srivastava [Fri, 7 Mar 2014 21:12:17 +0000 (21:12 +0000)]
am
dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit '
dbeb0c12950e92a59671f8da7952ddf3486789b4':
telephony: Add same named operator configuration for some operators
Marco Nelissen [Fri, 7 Mar 2014 20:23:29 +0000 (20:23 +0000)]
Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
Vineeta Srivastava [Fri, 7 Mar 2014 20:09:00 +0000 (20:09 +0000)]
Merge "telephony: Add same named operator configuration for some operators" into klp-dev
Sungmin Choi [Fri, 13 Dec 2013 05:50:40 +0000 (14:50 +0900)]
telephony: Add same named operator configuration for some operators
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.
Bug:
12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
Vineeta Srivastava [Fri, 7 Mar 2014 18:40:53 +0000 (18:40 +0000)]
am
ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit '
ef86ff58178e876f1dfbedd65166cc806f006ba8':
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
Vineeta Srivastava [Fri, 7 Mar 2014 18:37:42 +0000 (18:37 +0000)]
Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
Sungmin Choi [Mon, 16 Dec 2013 07:14:44 +0000 (16:14 +0900)]
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
This reverts commit
119e24f98706cb0a1217b41e7e750b94c1a8941a.
Bug:
12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
Marco Nelissen [Fri, 10 Jan 2014 18:39:27 +0000 (10:39 -0800)]
Make MtpDatabase use libexif instead of libjhead
b/
12203995
Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
Leon Scroggins III [Fri, 7 Mar 2014 18:15:23 +0000 (18:15 +0000)]
am
bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
* commit '
bc57651fb510d7b1a2811235f96e711b6be12a12':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Dianne Hackborn [Fri, 7 Mar 2014 18:15:19 +0000 (18:15 +0000)]
am
785d764b: Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
* commit '
785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
More on issue #
12031685 (DO NOT MERGE)
Leon Scroggins III [Fri, 7 Mar 2014 18:13:29 +0000 (18:13 +0000)]
Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 18:12:30 +0000 (18:12 +0000)]
Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
Andy McFadden [Fri, 7 Mar 2014 17:43:40 +0000 (17:43 +0000)]
am
faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '
faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Andy McFadden [Fri, 7 Mar 2014 17:40:39 +0000 (17:40 +0000)]
Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
Craig Mautner [Mon, 3 Mar 2014 21:26:03 +0000 (13:26 -0800)]
Show the keyguard if unsecure window on top. DO NOT MERGE.
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.
Fixes bug
13225149.
Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
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
Chris Wren [Fri, 7 Mar 2014 15:10:47 +0000 (15:10 +0000)]
am
70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
* commit '
70d5ed269268c1da6169b49b555d7295ac5d6763':
use relative positioning for notification actions
Chris Wren [Fri, 7 Mar 2014 15:08:29 +0000 (15:08 +0000)]
Merge "use relative positioning for notification actions" into klp-dev
Adam Powell [Fri, 10 Jan 2014 18:16:27 +0000 (10:16 -0800)]
Fix a bug where OnTouchListeners in action views could be removed
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.
Bug
12470259
Change-Id: I8c4c6110065605225a20cb7ed872255282085661
Dianne Hackborn [Fri, 7 Mar 2014 01:39:11 +0000 (17:39 -0800)]
More on issue #
12031685 (DO NOT MERGE)
Integrate from master:
Fix issue #
13065185: Frequent runtime restarts on launching...
..."Hill Climb Racing" app
A service is in use when it is in the restarting state.
Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8
Marco Nelissen [Fri, 7 Mar 2014 01:26:10 +0000 (01:26 +0000)]
am
98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev
* commit '
98a6bcf433fc23c343343b04c57c5a68d0177ac7':
ExifInterface: fix class load failure
Dianne Hackborn [Fri, 7 Mar 2014 01:26:05 +0000 (01:26 +0000)]
am
430652c1: Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
* commit '
430652c1e18c54dc6ae9debedb6394f2f1905903':
Fix issue #
13199860: PRE_BOOT_COMPLETED intent is...
Marco Nelissen [Fri, 7 Mar 2014 01:16:49 +0000 (01:16 +0000)]
Merge "ExifInterface: fix class load failure" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 01:04:50 +0000 (01:04 +0000)]
Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
Zhijun He [Fri, 20 Dec 2013 21:28:00 +0000 (13:28 -0800)]
ExifInterface: fix class load failure
libexif_jni was renamed as libjhead_jni
b/
12203995
Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
Svetoslav [Fri, 7 Mar 2014 00:39:05 +0000 (00:39 +0000)]
am
8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit '
8cb232cb796718ad91e56672a2c8fdbf88633001':
ProgressBar is important for accessibility by default.
Marco Nelissen [Fri, 7 Mar 2014 00:38:48 +0000 (00:38 +0000)]
am
e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '
e29c96e7ae96f3b94937ea86ffcc0d4d1e930248':
libexif is now libjhead
Svetoslav [Fri, 7 Mar 2014 00:37:14 +0000 (00:37 +0000)]
Merge "ProgressBar is important for accessibility by default." into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 00:34:36 +0000 (00:34 +0000)]
Merge "libexif is now libjhead" into klp-dev
Marco Nelissen [Thu, 19 Dec 2013 22:21:19 +0000 (14:21 -0800)]
libexif is now libjhead
b/
12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
Jay Shrauner [Fri, 7 Mar 2014 00:00:14 +0000 (00:00 +0000)]
am
a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
* commit '
a3ea4be5425fc2a561290c08a9f5f31f374afc31':
Prevent SpellChecker from setting invalid range - DO NOT MERGE
Jay Shrauner [Fri, 7 Feb 2014 21:28:59 +0000 (13:28 -0800)]
Prevent SpellChecker from setting invalid range - DO NOT MERGE
Add check for invalid range before setting for further check
at end of parse() loop.
Bug:
12936072
Change-Id: Ie0b33b8e69fe47e5d3371640be5681f13a4e4f6e
(cherry picked from commit
ea4adf28474d949c51518a5abe6dbd3a3529cf29)
Takahiro Aizawa [Wed, 11 Dec 2013 10:22:26 +0000 (19:22 +0900)]
EGL14.eglCreateWindowSurface should set producerControlledByApp
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in
0fa257fe53bf520bdde93996a1901ce6bc3e1788
Bug
13226025
(cherry-pick from AOSP Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0)
Change-Id: I853484c38f065d71b365bb48b2a794ca4787e70a
Leon Scroggins III [Thu, 6 Mar 2014 21:31:31 +0000 (21:31 +0000)]
am
92a32832: DO NOT MERGE - Fix Javadoc build break.
* commit '
92a3283286df3a6c2a27ecde8eddf23abbb87de9':
DO NOT MERGE - Fix Javadoc build break.
Leon Scroggins III [Wed, 15 Jan 2014 19:23:14 +0000 (14:23 -0500)]
DO NOT MERGE - Fix Javadoc build break.
Remove links to non-specific function name.
Bug:
13246311
Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
(cherry picked from commit
2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)
Chris Wren [Tue, 3 Dec 2013 19:31:01 +0000 (14:31 -0500)]
use relative positioning for notification actions
Bug:
10531101
Change-Id: Ia1d7cac880f620a9760271344edf920caf0d852d
Leon Scroggins III [Thu, 6 Mar 2014 19:49:58 +0000 (19:49 +0000)]
am
ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
* commit '
ee008d4264a95bba5f90b17856fc06fa29a6f12c':
Update framework to use M33 Skia. DO NOT MERGE
Eric Laurent [Thu, 6 Mar 2014 19:49:55 +0000 (19:49 +0000)]
am
617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
* commit '
617e715a40e2867c0b30d1bae38c20815ee30071':
Fix RemoteController synchronization mode
Dianne Hackborn [Thu, 6 Mar 2014 19:49:52 +0000 (19:49 +0000)]
am
71ab245a: Merge "Fix issue #
11536426 DO NOT MERGE" into klp-dev
* commit '
71ab245a0d7830791cb89ec9130313620a1ee029':
Fix issue #
11536426 DO NOT MERGE
Santos Cordon [Thu, 6 Mar 2014 19:49:46 +0000 (19:49 +0000)]
am
4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
* commit '
4c8c27ed7360abe3cd91a281e40d4e21948abc2a':
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
Leon Scroggins III [Thu, 6 Mar 2014 19:37:28 +0000 (19:37 +0000)]
Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
Svetoslav [Mon, 13 Jan 2014 23:25:58 +0000 (15:25 -0800)]
ProgressBar is important for accessibility by default.
If a view does not have callbacks, or content description, or does not draw
content, and it is marked as important for accessibility auto, then the system
decides it is not important and does not report it. Apparently progress bar
draws content that means something and it should be important for accessibility
by default.
Change-Id: Icd3837fb8b9e208c98b90707f3b195622d71949e
(cherry picked from commit
7face75f2c655a371a4dcdf6063886f92c637ce4)
Eric Laurent [Thu, 6 Mar 2014 19:21:26 +0000 (19:21 +0000)]
Merge "Fix RemoteController synchronization mode" into klp-dev
Dianne Hackborn [Thu, 6 Mar 2014 18:52:05 +0000 (10:52 -0800)]
Fix issue #
13199860: PRE_BOOT_COMPLETED intent is...
...broadcasted repeatedly at every boot time
Remember the last done pre-boot receivers, so that if we have
a new pre boot receiver appearing (without the platform version
changing), when we re-write the file of done receivers it will
contain all of them, not just the new one.
Change-Id: I4ed3478edc549d4b023ec4b3719111bc4d970ae4
Wei Wang [Wed, 30 Oct 2013 04:05:37 +0000 (21:05 -0700)]
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Add bluetooth adv data, APIs in BluetoothAdpater etc.
Cherry picking ble advertising changes from master to KLP MR2.
b/
13137996
Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
core/java/android/bluetooth/BluetoothGatt.java
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
Dianne Hackborn [Thu, 6 Mar 2014 18:29:19 +0000 (18:29 +0000)]
Merge "Fix issue #
11536426 DO NOT MERGE" into klp-dev
Dianne Hackborn [Mon, 2 Dec 2013 18:04:42 +0000 (10:04 -0800)]
Fix issue #
11536426 DO NOT MERGE
Permission denied when trying to launch an activity from a notification
We don't remove pending intents when updating an app, which is necessary
to keep app widgets and other things working. However, when uninstalling
an app, we should clear out all of its pending intents.
Change-Id: I95067b31098115b5a7b127766fd093750063bbb8
Baligh Uddin [Thu, 6 Mar 2014 17:41:09 +0000 (17:41 +0000)]
am
221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
221849b6d68704340754200492329f19cef7979b':
Import translations. DO NOT MERGE
Santos Cordon [Tue, 4 Mar 2014 00:06:54 +0000 (16:06 -0800)]
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
bug:
12175514
Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
(cherry picked from commit
b4aeac730503eb4b9db7d2dcece48e1ca13b4b30)
Jean-Michel Trivi [Thu, 2 Jan 2014 23:08:26 +0000 (15:08 -0800)]
Fix RemoteController synchronization mode
Fix erroneous argument check in RemoteController syncrhonization
mode setter..
Bug
12189375
Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10
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
Baligh Uddin [Thu, 6 Mar 2014 17:00:46 +0000 (17:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Santos Cordon [Thu, 6 Mar 2014 01:56:50 +0000 (01:56 +0000)]
am
77a60f00: Merge "Update permission description string." into klp-dev
* commit '
77a60f006f8b7260207043529d3ed004db301bd5':
Update permission description string.
Santos Cordon [Thu, 6 Mar 2014 01:54:20 +0000 (01:54 +0000)]
Merge "Update permission description string." into klp-dev
Michael Wright [Thu, 6 Mar 2014 00:53:22 +0000 (00:53 +0000)]
am
c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
* commit '
c5dea68e9856698953dafca868eaee7207614641':
Revert Japanese special case fallback keys.
Michael Wright [Thu, 6 Mar 2014 00:50:15 +0000 (00:50 +0000)]
Merge "Revert Japanese special case fallback keys." into klp-dev
Fabrice Di Meglio [Thu, 6 Mar 2014 00:32:30 +0000 (00:32 +0000)]
am
1ff2df61: Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '
1ff2df6194148f487ccb014a7c5302fa8ffe2571':
Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
Fabrice Di Meglio [Thu, 6 Mar 2014 00:32:27 +0000 (00:32 +0000)]
am
2b58a29f: Merge "Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit '
2b58a29f825e6442d8767a36adaf1770b86d5725':
Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
Fabrice Di Meglio [Thu, 6 Mar 2014 00:29:34 +0000 (00:29 +0000)]
Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
Fabrice Di Meglio [Thu, 6 Mar 2014 00:29:20 +0000 (00:29 +0000)]
Merge "Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
Dirk Dougherty [Mon, 3 Mar 2014 22:05:21 +0000 (14:05 -0800)]
Update permission description string.
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
(cherry picked from commit
08d7c2861fee205a314c3847ab5f5894617a233b)
Dianne Hackborn [Wed, 5 Mar 2014 23:07:45 +0000 (23:07 +0000)]
am
40a26004: Issue #
13308712: Add --checkin to package manager dump.
* commit '
40a26004810623f02546a31cb0ce49a0502bdff7':
Issue #
13308712: Add --checkin to package manager dump.
Dianne Hackborn [Fri, 17 Jan 2014 21:29:21 +0000 (13:29 -0800)]
Issue #
13308712: Add --checkin to package manager dump.
Change-Id: I50a559ea4bded47a792e1b5b319a5bbed41b4233
Fabrice Di Meglio [Tue, 10 Dec 2013 00:40:14 +0000 (16:40 -0800)]
Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
- fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...)
Change-Id: I61b9233345a4f1110aa06ea563a81dcdf6b35783
Fabrice Di Meglio [Tue, 7 Jan 2014 00:30:43 +0000 (16:30 -0800)]
Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
- force TextView internal layout recreation when its TextDirection is changed
Change-Id: I7d6b088a9235362e03cb6694392df71bbf5a323a
(cherry picked from commit
22228fec05129af9684f95d7a13aeff92144bd90)
Robert Greenwalt [Wed, 5 Mar 2014 18:27:03 +0000 (18:27 +0000)]
am
2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
* commit '
2d1e8c49582fb91df0a05a778c228fc1cd89e026':
Only apply tcp buffer sizes for default net
Robert Greenwalt [Wed, 5 Mar 2014 18:23:56 +0000 (18:23 +0000)]
Merge "Only apply tcp buffer sizes for default net" into klp-dev
Baligh Uddin [Wed, 5 Mar 2014 17:58:27 +0000 (09:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I04b3a1aaa779644d884edf77fd94dc8dccd1e36b
Auto-generated-cl: translation import
Christopher Tate [Wed, 5 Mar 2014 00:54:17 +0000 (00:54 +0000)]
am
1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
* commit '
1d13f13deac644bddbae8a1f92642074a32d7a6c':
Adapt to underlying changes in the PBKDF2 implementation
Christopher Tate [Wed, 5 Mar 2014 00:54:14 +0000 (00:54 +0000)]
am
1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
* commit '
1e995c76485f8a7477177886890b834c31e8d1a6':
Update PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Wed, 5 Mar 2014 00:51:32 +0000 (00:51 +0000)]
Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
Christopher Tate [Wed, 5 Mar 2014 00:51:04 +0000 (00:51 +0000)]
Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:12:40 +0000 (19:12 +0000)]
am
fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '
fee6f69e8321c3f94c2b341fe483f7b1f6534169':
Volume panel should not clear system ui flags.
John Spurlock [Tue, 4 Mar 2014 19:12:37 +0000 (19:12 +0000)]
am
8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '
8ec59a72889f7da0c13119977ca62ada8a1498e0':
Show hideycling for non-primary users.
John Spurlock [Tue, 4 Mar 2014 19:12:33 +0000 (19:12 +0000)]
am
d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
* commit '
d36ede391619e6fc8a1553f5b2f4b33b3603cd65':
Allow lights-out + bar icon dimming on low-end devices.
John Spurlock [Tue, 4 Mar 2014 19:09:20 +0000 (19:09 +0000)]
Merge "Volume panel should not clear system ui flags." into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:08:46 +0000 (19:08 +0000)]
Merge "Show hideycling for non-primary users." into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:08:31 +0000 (19:08 +0000)]
Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
Guang Zhu [Tue, 4 Mar 2014 18:38:32 +0000 (18:38 +0000)]
am
be659185: use min app launch time in AppLaunch perf test
* commit '
be6591856bd62e14d7c87dd927db0cbbed242d81':
use min app launch time in AppLaunch perf test
Guang Zhu [Thu, 20 Feb 2014 01:58:38 +0000 (17:58 -0800)]
use min app launch time in AppLaunch perf test
Change-Id: Id3a5872ff29fba5daeff058f0842fd011e50a0a1
(cherry picked from commit
2861a89bed9066e206917c41357a5e589e8482cb)
Robert Greenwalt [Sat, 1 Mar 2014 00:44:00 +0000 (16:44 -0800)]
Only apply tcp buffer sizes for default net
This may mean that secondary networks have bad network settings,
but currently default settings are overriden by secondary nets
which seems worse.
bug:
13211589
Change-Id: I08d56e618208781bf6b21a88663c2b8503a4f226
John Spurlock [Wed, 4 Dec 2013 18:47:36 +0000 (13:47 -0500)]
Volume panel should not clear system ui flags.
Remove private WM flag (used only by the volume panel) to force
the clearable system UI flags clear.
Instead, always lay out the volume panel as if the bars are visible,
as we do for system dialogs - and don't clear the flags.
Reverts part of I25f29af5b6518aba695b64a75977ae240b742118
Bug:
11986621
Change-Id: I842729d729d2a6eb2a687d0b930ddb160c6a1b57
John Spurlock [Mon, 9 Dec 2013 16:59:45 +0000 (11:59 -0500)]
Show hideycling for non-primary users.
User 0 owns the window (system_server) but should be allowed
to display on a user's behalf.
Use the corresponding private flag for this system window, since
we cannot classify it by type (TYPE_TOAST) in policy.
Bug:
12015090
Change-Id: I33aedb4624288415a5e1ae937676b693024546a9