OSDN Git Service
Wale Ogunwale [Mon, 1 Jun 2015 19:06:44 +0000 (19:06 +0000)]
Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
Wale Ogunwale [Mon, 1 Jun 2015 16:48:36 +0000 (09:48 -0700)]
Allow app to stop lockTaskMode if started by manifest attribute
It is possible lockTaskMode was started by the system process
because android:lockTaskMode is set to a locking value in the
application's manifest instead of the app calling
startLockTaskMode. In this case TaskRecord.mLockTaskUid will
be 0, so we compare the callingUid to the
TaskRecord.effectiveUid instead so the app can exit lockTaskMode.
Bug:
21464182
Change-Id: Ibca6de8e4b17051d5fcbb05cde9c8aefed7216f2
Winson Chung [Mon, 1 Jun 2015 18:19:44 +0000 (18:19 +0000)]
Merge "Ensuring that we write to disk first." into mnc-dev
Winson Chung [Fri, 29 May 2015 20:36:56 +0000 (13:36 -0700)]
Ensuring that we write to disk first.
Change-Id: I2c55db77ab6feef1b405858aac53fb0ed3370dc2
Winson Chung [Fri, 29 May 2015 23:27:00 +0000 (16:27 -0700)]
Allow long-pressing task icon to show app-info.
Bug:
17369696
Yorke Lee [Mon, 1 Jun 2015 18:00:49 +0000 (18:00 +0000)]
Merge "Add ability to modify default dialer via ADB" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 18:00:05 +0000 (18:00 +0000)]
Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev
Yin-Chia Yeh [Mon, 1 Jun 2015 17:53:40 +0000 (17:53 +0000)]
Merge "Camera2: Add missing LEGACY available keys" into mnc-dev
Alex Klyubin [Mon, 1 Jun 2015 17:53:28 +0000 (17:53 +0000)]
Merge "No need to specify key size when importing." into mnc-dev
Andres Morales [Mon, 1 Jun 2015 17:50:57 +0000 (17:50 +0000)]
Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev
Chien-Yu Chen [Mon, 1 Jun 2015 17:50:54 +0000 (17:50 +0000)]
Merge "Camera2: update docs for reprocess timestamp" into mnc-dev
Andres Morales [Mon, 1 Jun 2015 17:50:43 +0000 (17:50 +0000)]
Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
This reverts commit
831e01a89e9636baf15d35e7f8ff5e9f290c8b87.
Change-Id: I48bf74631b842178964d25906b2790f18632e32a
Alan Viverette [Mon, 1 Jun 2015 17:45:49 +0000 (10:45 -0700)]
Prevent crash when ColorStateList has unresolved attrs
Bug:
21471789
Change-Id: Ieba6ab62b5e82eb716934a65efb6bfef2fc4e15a
Yin-Chia Yeh [Thu, 28 May 2015 22:58:22 +0000 (15:58 -0700)]
Camera2: Add missing LEGACY available keys
Add missing available characteristics keys.
Bug:
20883751
Change-Id: I6f07deca4b469de720f44a663ce9140658c346f1
Alan Viverette [Mon, 1 Jun 2015 17:33:15 +0000 (17:33 +0000)]
Merge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 17:30:21 +0000 (10:30 -0700)]
Don't ignore explicit dividerHeight of 0 specified in XML
Also minor cleanup and adding annotations.
Bug:
21420748
Change-Id: I89edcd3ce423ad75a4028bebf0dcd828b9619c15
Alex Klyubin [Mon, 1 Jun 2015 16:52:16 +0000 (09:52 -0700)]
No need to specify key size when importing.
The underlying Keymaster implementation no longer requires that.
Bug:
19799085
Change-Id: I6b651bac5d4825b4ed0981a49bb79aedcf79d749
Alan Viverette [Mon, 1 Jun 2015 16:39:09 +0000 (16:39 +0000)]
Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
Stuart Scott [Mon, 20 Apr 2015 21:07:45 +0000 (14:07 -0700)]
Network Reset should have a lockdown like Factory Reset.
bug:
20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit
94b038bbb291431a7b39611d72f206b07e839891)
Joe Fernandez [Mon, 1 Jun 2015 16:26:12 +0000 (16:26 +0000)]
am
583b7f2c: am
9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
* commit '
583b7f2c6dacc412016c15a21f5376fc7fc0e88b':
docs: Android Dashboard - June 2015 update
Filip Gruszczynski [Mon, 1 Jun 2015 16:23:14 +0000 (09:23 -0700)]
resolved conflicts for merge of
a61e23f1 to mnc-dev
Change-Id: Ief5ad11d4f97ae6dbe2d26420550dd145811becc
Mady Mellor [Mon, 1 Jun 2015 16:17:36 +0000 (16:17 +0000)]
Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
Mady Mellor [Mon, 1 Jun 2015 16:16:16 +0000 (16:16 +0000)]
Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev
Mady Mellor [Mon, 1 Jun 2015 16:15:52 +0000 (16:15 +0000)]
Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:07:47 +0000 (16:07 +0000)]
Merge "Revert "Revert "Fix build.""" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:07:36 +0000 (16:07 +0000)]
Revert "Revert "Fix build.""
This reverts commit
944a6c937cd3576ecae5c3fdd0dcf265329e6bcf.
Change-Id: I7daa255f331a1e39308eb626580aa00c63c5cb3e
Joe Fernandez [Mon, 1 Jun 2015 16:06:26 +0000 (16:06 +0000)]
am
9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
* commit '
9bf0e9d03f805bbbb10b87df0586cf6953f18e98':
docs: Android Dashboard - June 2015 update
Alan Viverette [Mon, 1 Jun 2015 16:03:27 +0000 (09:03 -0700)]
Fix row/column order when unparcelling CollectionItemInfo
Bug:
21527853
Change-Id: I02a75b9395a4d573f5fd49abcbd282b35e2c8f3c
smain@google.com [Mon, 1 Jun 2015 16:01:30 +0000 (16:01 +0000)]
am
67725e2a: am
7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
* commit '
67725e2aa47596207ebffc00e3737c609536fe93':
add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
Filip Gruszczynski [Mon, 1 Jun 2015 16:01:16 +0000 (16:01 +0000)]
am
35a803be: Only use outsets for full screen windows.
* commit '
35a803beec9ce508fd53ab7e4111f2f9f87296c1':
Only use outsets for full screen windows.
Joe Fernandez [Mon, 1 Jun 2015 15:52:31 +0000 (15:52 +0000)]
Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
Joe Fernandez [Mon, 1 Jun 2015 15:47:19 +0000 (08:47 -0700)]
docs: Android Dashboard - June 2015 update
Change-Id: I81709ea7f4d5ac0abfbd2834c98c4e05b4904878
smain@google.com [Mon, 1 Jun 2015 15:42:57 +0000 (15:42 +0000)]
am
7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
* commit '
7f6da0c3cbb9b38d345f7c575d1069d2a85099e5':
add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
Filip Gruszczynski [Mon, 1 Jun 2015 15:42:40 +0000 (15:42 +0000)]
Merge "Revert "Revert "resolved conflicts for merge of
47249f2a to mnc-dev""" into mnc-dev
Filip Gruszczynski [Wed, 27 May 2015 22:38:29 +0000 (15:38 -0700)]
Only use outsets for full screen windows.
Change-Id: I1d89c314b0f9944dfa417ce066c397073d51466e
smain@google.com [Mon, 1 Jun 2015 15:21:07 +0000 (08:21 -0700)]
add back the GMS and GCM reference lists to fix search suggest.
mistakenly removed during:
https://googleplex-android-review.git.corp.google.com/#/c/697534/1
Change-Id: I804364d98d5dea6110bb309603c80df84c66a19d
Geoff Mendal [Mon, 1 Jun 2015 15:19:48 +0000 (15:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 1 Jun 2015 15:19:18 +0000 (15:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
John Spurlock [Mon, 1 Jun 2015 15:04:25 +0000 (15:04 +0000)]
Merge "Battery saver: limit notification intents to system UI." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 14:56:42 +0000 (10:56 -0400)]
Battery saver: limit notification intents to system UI.
Ensure the actions taken by the HUN warnings came from sysui.
Bug:
20918350
Change-Id: I8dc02ebdfcc1f60d068bea43e10e350dc566728d
Geoff Mendal [Mon, 1 Jun 2015 14:56:20 +0000 (07:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I486cfef976fec3c97a0f7a07dfdbb65b585e6554
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Jun 2015 14:51:58 +0000 (07:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I04d01f1c65927634e8b27c3780e5e392fcdba28b
Auto-generated-cl: translation import
Selim Cinek [Mon, 1 Jun 2015 14:50:10 +0000 (14:50 +0000)]
Merge "Shortened the duration of HUNs" into mnc-dev
Neil Fuller [Mon, 1 Jun 2015 12:04:43 +0000 (12:04 +0000)]
Merge "Fix javadocs based on recent case consistency change" into mnc-dev
Neil Fuller [Thu, 28 May 2015 17:19:02 +0000 (18:19 +0100)]
Fix javadocs based on recent case consistency change
Commit
a40d2447b6f516116135ee7f126579771ba98a2c made the
case consistently "as for the beginning of a sentence".
This updates the docs to reflect that. Previously the
result depended on the string returned (e.g. "Tomorrow"
was capitalized in English) and the casing varied
within and between locales.
Bug:
20247811
(cherry-picked from commit
0e1c0e11e41c85487349fcb719d2ab1d1823534e)
Change-Id: I7b48958725b32b13bee00347585472f8073e7761
Erik Kline [Mon, 1 Jun 2015 03:44:01 +0000 (12:44 +0900)]
Treat RTM_DELNEIGH as a transition to NUD_NONE
RTM_DELNEIGHs can happen naturally during garbage collection of STALE
entries, as well as when an interface is going down. All other
transitions of interest at this time pass through FAILED.
Bug:
18581716
Bug:
21531726
Change-Id: Ib2a731dd6ad6ece478df6950d4cc7752588328a4
Geoff Mendal [Sun, 31 May 2015 03:18:40 +0000 (03:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:01:28 +0000 (20:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib590e26c7e75ed6bbc29654fbe16a18e75089dbc
Auto-generated-cl: translation import
Geoff Mendal [Sun, 31 May 2015 02:59:58 +0000 (02:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:59:03 +0000 (02:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:58:20 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:58:03 +0000 (19:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic3da6671bd7a81f8a9c07a0a922d07b773377f96
Auto-generated-cl: translation import
Geoff Mendal [Sun, 31 May 2015 02:57:51 +0000 (02:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:57:21 +0000 (02:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:55:30 +0000 (02:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:55:02 +0000 (02:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:54:47 +0000 (02:54 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:46:03 +0000 (19:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee1ea995ead91aaa2264414fcd73817ab94aa973
Auto-generated-cl: translation import
Geoff Mendal [Sun, 31 May 2015 02:42:49 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie86b62bb9884b5043fada9b96feac9104b67a052
Auto-generated-cl: translation import
Geoff Mendal [Sun, 31 May 2015 02:39:34 +0000 (19:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6c36a192af260cddb4e659825037b5727a9c8fcd
Auto-generated-cl: translation import
Geoff Mendal [Sun, 31 May 2015 02:36:14 +0000 (19:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I40a24917618ab5fb0c5ef063b6ccc6b845bf0ec9
Auto-generated-cl: translation import
Geoff Mendal [Sun, 31 May 2015 02:32:52 +0000 (19:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2548176e1f01dd7955f765ce8ff6207fd92c9110
Auto-generated-cl: translation import
Geoff Mendal [Sun, 31 May 2015 02:29:41 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf2d35fbd552a97e238b3b4ba0b531a86d842e9f
Auto-generated-cl: translation import
Geoff Mendal [Sun, 31 May 2015 02:26:25 +0000 (19:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifde28ca81052a95d8216d8dbd119c07f99ae08e8
Auto-generated-cl: translation import
Geoff Mendal [Sat, 30 May 2015 22:59:53 +0000 (22:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 30 May 2015 22:59:32 +0000 (22:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 30 May 2015 22:58:43 +0000 (17:58 -0500)]
Import translations. DO NOT MERGE
Change-Id: I600637b0abc1f3de8f2156137b216b2d271cd575
Auto-generated-cl: translation import
Geoff Mendal [Sat, 30 May 2015 22:55:18 +0000 (17:55 -0500)]
Import translations. DO NOT MERGE
Change-Id: I9c4c481d77a1754e05bbe11786a8302630a0c252
Auto-generated-cl: translation import
Barnaby James [Sat, 30 May 2015 21:57:47 +0000 (21:57 +0000)]
Merge "Minor VoiceInteractor documentation fixes." into mnc-dev
Jeff Sharkey [Sat, 30 May 2015 18:20:45 +0000 (11:20 -0700)]
Fix the build months later?
Change-Id: Ic5902fbe39cf2b536eb75682ad18f06e1ad8983e
Joe Fernandez [Sat, 30 May 2015 05:16:11 +0000 (05:16 +0000)]
am
0e997308: am
e2ee9b6b: docs: M Preview - Update volantis download signatures
* commit '
0e997308905d26000eafeee24dc4f7e685b1ec5b':
docs: M Preview - Update volantis download signatures
Joe Fernandez [Sat, 30 May 2015 05:02:50 +0000 (05:02 +0000)]
am
e2ee9b6b: docs: M Preview - Update volantis download signatures
* commit '
e2ee9b6be1b4bf70d5dd27d25527a1744b73d920':
docs: M Preview - Update volantis download signatures
Joe Fernandez [Sat, 30 May 2015 04:39:45 +0000 (21:39 -0700)]
docs: M Preview - Update volantis download signatures
- uploading a new system install package from J Eason
Change-Id: Iae9bde945feb6b6c7d742e10ca4c6a66760a4926
Alan Viverette [Sat, 30 May 2015 02:19:57 +0000 (02:19 +0000)]
Merge "Reduce amount of unnecessary RippleDrawable mask redraw" into mnc-dev
Andrew Solovay [Sat, 30 May 2015 01:51:00 +0000 (01:51 +0000)]
am
c5abcba4: am
820f2501: Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs
* commit '
c5abcba46131748e03484af3cc7cb474461f47f7':
docs: Quick fixes for the M Preview "Setup SDK" page.
David Friedman [Sat, 30 May 2015 01:50:54 +0000 (01:50 +0000)]
am
270d4a70: am
acb470be: am
490f8761: am
7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit '
270d4a70afc5fac8f48746751c34b3e0618cf5b7':
Quick typo fix.
Andrew Solovay [Sat, 30 May 2015 01:37:11 +0000 (01:37 +0000)]
am
820f2501: Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs
* commit '
820f2501d6371059eb253d6a0d523ceb9f7473ca':
docs: Quick fixes for the M Preview "Setup SDK" page.
David Friedman [Sat, 30 May 2015 01:37:05 +0000 (01:37 +0000)]
am
acb470be: am
490f8761: am
7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit '
acb470be4f456f4f42c9ed0e6e3babb2ea767353':
Quick typo fix.
Andrew Solovay [Sat, 30 May 2015 01:27:28 +0000 (01:27 +0000)]
Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs
Deepanshu Gupta [Sat, 30 May 2015 00:00:34 +0000 (17:00 -0700)]
Fix ParserFactory not initialized error.
Bug: http://b.android.com/175129
Change-Id: I2111673767e0f62ee910560022b559a177d55abd
David Friedman [Sat, 30 May 2015 01:22:58 +0000 (01:22 +0000)]
am
490f8761: am
7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit '
490f876113cc58e9b3bbc1b6aab7c86aca4345ca':
Quick typo fix.
Joe Fernandez [Sat, 30 May 2015 01:12:55 +0000 (01:12 +0000)]
am
4a97fb5d: am
6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs
* commit '
4a97fb5d290388371049436910f97fbf900b1bcf':
docs: supportlib 22.2.0 design version update
David Friedman [Sat, 30 May 2015 01:05:03 +0000 (01:05 +0000)]
am
7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit '
7b3ecd65270802bb9231a0d546f1674c7c133d60':
Quick typo fix.
Joe Fernandez [Sat, 30 May 2015 00:59:41 +0000 (00:59 +0000)]
am
6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs
* commit '
6fdb83a914ddb27d4fbf727834431d33bec0d314':
docs: supportlib 22.2.0 design version update
Yohei Yukawa [Sat, 30 May 2015 00:52:29 +0000 (00:52 +0000)]
Merge "Close input session when the view is detached from the window." into mnc-dev
Christopher Tate [Wed, 13 May 2015 00:06:33 +0000 (17:06 -0700)]
Adjust key/value backup scheduling
We now try to perform key/value backups only while charging, proceeding
off-charger only after we've waited a full day for the device to be
plugged in.
Bug
21076663
Change-Id: Ib32c9f8bfaf8a310f5f388907e38a28d3c54bd8e
Yohei Yukawa [Sat, 30 May 2015 00:09:14 +0000 (17:09 -0700)]
Close input session when the view is detached from the window.
This is the 3rd trial to fix Bug
20820914.
In followig CLs, we have tried to address a input session
leak when the focused view is detached from the focused
window by relying on IMM#focusOut() but failed because of
regressions like Bug
21508503.
- Ib4bd70ce0305a6bde6a929bcc6ad20a2b8402a97
- I219394178e4172bc47864297f1418e677dba25e5
- Id6afc8fc64512225578c62557b96c7dc2e969adf
- Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930
- I2228ae0c48ad3d9e0b55875f0dcb5ef8c55b0c5f
What we have learned from Bug
21508503 was that re-enabling
IMM#focusOut() probably requires much more work than we
thought. Also relying on IMM#focusOut() might be overkill
because the situation in Bug
20820914 is really special where
the focused view is detached from the focused window hence
we should be able to be fix the issue more conservatively
by closing input session when and only when the focused
view is detached from the focused view, rather than
re-enabling IMM#focusOut() globally.
Bug:
20820914
Change-Id: Iaf3fe2c065b5bf91e49a729ba46262114bb6da88
Joe Fernandez [Sat, 30 May 2015 00:44:37 +0000 (00:44 +0000)]
Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs
Jeff Brown [Sat, 30 May 2015 00:33:05 +0000 (00:33 +0000)]
Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev
Doris Liu [Sat, 30 May 2015 00:31:45 +0000 (00:31 +0000)]
Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev
Jeff Brown [Wed, 27 May 2015 02:50:18 +0000 (19:50 -0700)]
Tell PhoneWindowManager when we start/finish interactive changes.
Added some new callbacks that can be used to more precisely trigger
certain behaviors that need to happen around the time the device
is put to sleep and locked.
Fixed an issue where the going to sleep signal might be sent too
early on devices that don't support ambient mode due to the extra
wakefulness change between DOZING and ASLEEP. We are now track
the early / late interactive change work separately from the rest.
Bug:
21375811
Change-Id: I95387195e216ae92a6e45485bd1bd362e41aa45a
Dirk Dougherty [Sat, 30 May 2015 00:28:35 +0000 (00:28 +0000)]
am
0e124520: am
8c11025e: Fix a date, adjust permissions language.
* commit '
0e12452091a23d7c7cb1171e71fe5ec49fa392c5':
Fix a date, adjust permissions language.
Chien-Yu Chen [Fri, 29 May 2015 18:49:54 +0000 (11:49 -0700)]
Camera2: update docs for reprocess timestamp
Bug:
21112186
Change-Id: Ie49c00c96f7e69b672df5afa34e06e3dcd49490f
Dirk Dougherty [Sat, 30 May 2015 00:14:38 +0000 (00:14 +0000)]
am
8c11025e: Fix a date, adjust permissions language.
* commit '
8c11025e3b0689c32a0c69c4f88caae4fdbb3349':
Fix a date, adjust permissions language.
David Friedman [Sat, 30 May 2015 00:02:46 +0000 (00:02 +0000)]
Merge "Quick typo fix." into lmp-docs
Dirk Dougherty [Fri, 29 May 2015 23:45:15 +0000 (16:45 -0700)]
Fix a date, adjust permissions language.
Change-Id: Icb09eb44645130af5e109c390b757dc12f458f91
Alan Viverette [Fri, 29 May 2015 23:23:43 +0000 (16:23 -0700)]
Reduce amount of unnecessary RippleDrawable mask redraw
Bug:
19638504
Change-Id: Ie7b639c543150e13aec30dfeca2b303d5b601cf3
Alan Viverette [Fri, 29 May 2015 22:50:56 +0000 (22:50 +0000)]
Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev
Adrian Roos [Fri, 29 May 2015 22:23:18 +0000 (15:23 -0700)]
Fix broken transition to secure apps when relaunching
Previously, the logic for keeping occluded mode during transitions
would also trigger when transitioning from the lockscreen to a
SHOW_WHEN_LOCKED activity that was already on-screen, which would
then prematurely clear the occluded mode and break the launch
transition.
With the fix, the lockscreen must already be occluded before the
keep-occluded-during-transitions logic is triggered.
Bug:
21525170
Change-Id: I1d9ad95b2dd0728af7986f09adb67a617cc62cb2
Marco Nelissen [Fri, 29 May 2015 22:26:56 +0000 (22:26 +0000)]
Merge "Update ExifInterface.getDateTime to support subseconds" into mnc-dev
OSDN Git Service
