Alan Viverette
db2911321b
Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev
2015-05-29 22:51:04 +00:00
Adrian Roos
b85e1ecfdf
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
2015-05-29 22:32:29 +00:00
Marco Nelissen
2e2ac33e88
Merge "Update ExifInterface.getDateTime to support subseconds" into mnc-dev
2015-05-29 22:26:58 +00:00
ztenghui
e9d8480fc1
Merge "Tweak the threshold for conic path quads computation." into mnc-dev
2015-05-29 22:17:30 +00:00
ztenghui
21ef8205a1
Tweak the threshold for conic path quads computation.
...
We still want it to be related to the threshold for bezier generation.
b/19903239
Change-Id: Ifdce32f1c28ecea9eac98d02c73afa948341fc7d
2015-05-29 15:12:55 -07:00
Alan Viverette
87e1938be8
Replace PNG-based seekbar thumb animation with AVD
...
Adds optical inset support for VectorDrawable and GradientDrawable.
Bug: 19944181
Change-Id: I9df04d9fe17ad858413e7f93694bf37ee2c43c85
2015-05-29 15:12:14 -07:00
Joe Fernandez
8c176dd22e
am 927b8204: am 80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs
...
* commit '927b8204d573176cd39b96abb25cfeb9fd1dd0d2':
docs: Regen wearable docs with new redesign templates
2015-05-29 22:06:57 +00:00
Joe Fernandez
927b8204d5
am 80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs
...
* commit '80aa2b3e9079f847040707b9f1cd5face238137e':
docs: Regen wearable docs with new redesign templates
2015-05-29 21:51:55 +00:00
Marco Nelissen
b2c890044e
Update ExifInterface.getDateTime to support subseconds
...
Also document that it returns local time.
Bug: 20638367
Change-Id: I6a1c35925e0555bcdcb079be0ca5b19a279a05a6
2015-05-29 14:49:03 -07:00
Andrew Solovay
9074831abd
am def1dde3: am 1521c51c: docs: Quick fixes to screenshot
...
* commit 'def1dde30656b7d785dd25c1a8f30292f4d47721':
docs: Quick fixes to screenshot
2015-05-29 21:43:30 +00:00
Joe Fernandez
80aa2b3e90
Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs
2015-05-29 21:38:03 +00:00
Chris Wren
0886dcc768
Merge "add time-in-mode metrics for zen mode" into mnc-dev
2015-05-29 21:33:58 +00:00
Adrian Roos
e67f67da9a
Merge "Hide KeyguardMessageArea if empty" into mnc-dev
2015-05-29 21:33:09 +00:00
Andrew Solovay
def1dde306
am 1521c51c: docs: Quick fixes to screenshot
...
* commit '1521c51cb69e73de2d37a98c367e5fd617056af6':
docs: Quick fixes to screenshot
2015-05-29 21:29:02 +00:00
destradaa
ce48c1c1d8
Allow INADDR_NONE as a valid configuration in AGpsStatus_v3.
...
b/21516868
This change makes AGpsStatus_v3 consistent and compatible with the behavior
of AGpsStatus_v2.
Change-Id: Ia4e729d8ed1d61b51ae22c7eaf9bbe33f31b7a45
2015-05-29 13:49:20 -07:00
Andrew Solovay
1521c51cb6
docs: Quick fixes to screenshot
...
I'd been using the "srcset" tag wrong (we're updating the devsite
style guide) so I'm fixing that. Also mislabeled this as "Figure 2"
(it's currently the only figure on the page).
Since this is a very straightforward fix I'm going to go ahead and
submit it.
See first comment for doc stage location.
Change-Id: I81969ff1a3838e516ef00612f3ae8944cca8fab5
2015-05-29 13:41:40 -07:00
Yohei Yukawa
650a91356b
Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
2015-05-29 20:41:25 +00:00
Doris Liu
f042cd841f
Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
2015-05-29 20:28:21 +00:00
Yohei Yukawa
0b52ed02df
Revert "Rely on IMM#focusOut() to close input session."
...
This reverts commit 41bb4953dad33b56b6d039d5bc87a574a0b70fe9.
Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930 caused Bug 21508503.
Since it looks like a timing issue, many other applications
could be affected potentially.
Bug 21508503 implies that re-enabling IMM#focusOut() globally
requires much more work than we thought. Probably the memory
leak found in Bug 20820914 should be addressed in a more
conservative way at the moment, e.g., by plumbing events from
ViewGroup to IMMS.
Bug: 21508503
Bug: 20820914
Change-Id: I2228ae0c48ad3d9e0b55875f0dcb5ef8c55b0c5f
2015-05-29 13:28:13 -07:00
Svetoslav
815be147a3
Merge "Use AtomicFile APIs correctly when reading." into mnc-dev
2015-05-29 20:05:43 +00:00
Svetoslav
3dcdd37b66
Use AtomicFile APIs correctly when reading.
...
21280155
Change-Id: I354ebac8fc91d8f28eec6016474a9521ff2a490d
2015-05-29 13:01:37 -07:00
Alex Klyubin
d377b06735
Merge "Cleanup Binder token resetting." into mnc-dev
2015-05-29 19:59:34 +00:00
John Spurlock
2473e1e922
Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev
2015-05-29 19:50:07 +00:00
Alex Klyubin
96d7245c00
Cleanup Binder token resetting.
...
This is a follow-up to 7cbcfd4fc1e538bd391a20cdd00dd1494ace2d0e where
during the review it was pointed out that the code could be
streamlined.
Bug: 18088752
Change-Id: Iecb9fdbc31a0f3cdcb94ddb1b3e7e12a0543a231
2015-05-29 12:41:22 -07:00
John Spurlock
157822682f
Zen: Dim status bar alarm icon when zen = total silence.
...
Bug: 21359239
Change-Id: I5bf207c4c181869127ed8b90787cbd7d9bb0f6c2
2015-05-29 15:41:12 -04:00
Jorim Jaggi
2400197f10
Enable Keyguard debug logging
...
Bug: 21320918
Change-Id: I2529bfb7cdaae6042bbc9e51340c7571a5a63ad0
2015-05-29 19:34:48 +00:00
Alex Klyubin
614b39f3de
Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev
2015-05-29 19:15:18 +00:00
Quddus Chong
c1862737f8
am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956
...
* commit 'f253e7d547f22bb02ef943bd80f598ca30302bda':
docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956
2015-05-29 18:55:02 +00:00
Quddus Chong
f253e7d547
am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956
...
* commit 'c4d39dfc6c00578d4f7b9970bc9b33b237a1da54':
docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956
2015-05-29 18:40:50 +00:00
Quddus Chong
c4d39dfc6c
docs: Fix issue where images are not appearing in mobile browsers.
...
bug: 21517956
Change-Id: Ia00a42cd5c195881885c2f2927ada9acf2e1f453
2015-05-29 11:23:16 -07:00
Luan Nguyen
c14dce738e
docs: Regen wearable docs with new redesign templates
...
bug:21497653
Change-Id: I7fd0058a14d4adcd14fd584bb10a777987169823
2015-05-29 11:23:15 -07:00
Doris Liu
b134b5e376
Update doc to include how clipToPadding affects EdgeEffect
...
Bug: 19126514
Change-Id: I72c6ac20b4c72421137d97f77da5425e74f2b09a
2015-05-29 11:20:46 -07:00
Tyler Gunn
2b26e8dcd1
Merge "Un-@hide some missed video APIs." into mnc-dev
2015-05-29 18:18:37 +00:00
John Spurlock
e648c5f1cb
Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev
2015-05-29 18:07:36 +00:00
Alex Klyubin
1a23c31752
Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
2015-05-29 18:01:08 +00:00
Andy Hung
51c1e3bd14
Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev
2015-05-29 17:51:53 +00:00
Jason Monk
2280218a93
Merge "Don't use string that has been removed." into mnc-dev
2015-05-29 17:50:51 +00:00
Jason Monk
5458aded3d
Don't use string that has been removed.
...
Change-Id: I60edc3f23f40e48013165dccab83af536582f1c4
2015-05-29 13:44:32 -04:00
Glenn Kasten
e5c3878864
am 92614179: am dedc768f: Fix typo
...
* commit '926141795c3115d674be2ed0a735e3b994e31c03':
Fix typo
2015-05-29 17:32:51 +00:00
James Cook
63b6320af4
Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
2015-05-29 17:30:23 +00:00
Glenn Kasten
926141795c
am dedc768f: Fix typo
...
* commit 'dedc768f829908242bda75b56d4a77ff247d5609':
Fix typo
2015-05-29 17:18:35 +00:00
Andy Hung
04065187d9
Clarify AudioFormat sample rate and encoding documentation
...
Bug: 21476142
Change-Id: I74fa3fcced5cc197a4cee6a7c10f3ed4690b0af1
2015-05-29 10:17:40 -07:00
Tyler Gunn
a2df92512b
Un-@hide some missed video APIs.
...
- renamed some methods to match what is in the non-remote version of
the API.
- Renamed RemoteConnection.VideoProvider.Listener to Callback.
Bug: 21474356
Change-Id: I4840e19921dafb4db288a4f8362b14d5dfa0aea1
2015-05-29 10:05:46 -07:00
Alex Klyubin
a8c837f11a
Add algorithm aliases for Android Keystore HMACs.
...
The aliases have been copied from Conscrypt.
Bug: 18088752
Change-Id: I1c66d8c3655f57db41cc0b9cc88d08b44b4a774b
2015-05-29 10:02:31 -07:00
Alex Klyubin
7cbcfd4fc1
Refactor Android Keystore CipherSpi base class.
...
This makes Android Keystore's CipherSpi base class suitable for
implementing AES and RSA ciphers. Previously, the class was heavily
biased towards only AES.
Bug: 18088752
Change-Id: I6bd1ca54165592d28482e56471dcfe0344337cf4
2015-05-29 09:53:05 -07:00
Tony Mantler
85b039f348
Merge "Move ZoneGetter into SettingsLib" into mnc-dev
2015-05-29 16:44:39 +00:00
Chris Wren
98d235bcba
add time-in-mode metrics for zen mode
...
Emit log whenever the mode changes, or periodically to catch devices that stay
in one mode for long stretches of time.
Bug: 20264417
Change-Id: I4efde180eef23c2afc34c6c2e78ef4d0b6c5b675
2015-05-29 12:31:49 -04:00
John Spurlock
8be53eaaf7
Zen: Add warning text if total silence will eat the next alarm.
...
Bug: 21359239
Change-Id: I8a69738e6488f40f24eed622529c913b6c3865a0
2015-05-29 12:18:34 -04:00
Geoff Mendal
55b4b2d5a8
Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
2015-05-29 15:57:51 +00:00
Geoff Mendal
bf2e5b5fa5
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 27c652fd0293e707110165eb1f8918f489b50fca.
Change-Id: Idb1365c91c67c0eb8f472bf6f9ace1b6429e3b0e
2015-05-29 15:57:37 +00:00