194297 Commits

Author SHA1 Message Date
Geoff Mendal
51ddeca824 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 14:18:58 +00:00
George Mount
7c79c82b97 Merge "Don't cause requestLayout when transition changes Visibility." into mnc-dev 2015-06-08 14:18:13 +00:00
Geoff Mendal
101ba78a80 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 14:16:53 +00:00
Geoff Mendal
29d6e8d302 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 14:15:23 +00:00
Jason Monk
eb738616c9 Merge "Add demo mode to tuner" into mnc-dev 2015-06-08 14:13:52 +00:00
Geoff Mendal
bff802b3ba Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 14:11:47 +00:00
Jason Monk
16ada3df30 Add demo mode to tuner
Allows turning on/off and setting to specific mode for screen shots.

Change-Id: Iee95aff17189dea7a77c493e9b396b9f21052ee8
2015-06-08 10:08:06 -04:00
Geoff Mendal
0926f585fd Import translations. DO NOT MERGE
Change-Id: I63c54f533e54ee9cc140f64e1956661deb8bc7b5
Auto-generated-cl: translation import
2015-06-08 08:53:29 -05:00
Geoff Mendal
40f26e1caa Import translations. DO NOT MERGE
Change-Id: Ib2b21a5127e5d2c29bf60c62fa90c5e1dca3ccf1
Auto-generated-cl: translation import
2015-06-08 08:47:53 -05:00
Jason Monk
8a3a964d0a Show Cast Tile when trusted
Add a trusted state to the KeyguardMonitor and update uses of it
to treat trusted as if it weren't secure.

Bug: 19709691
Change-Id: Ic46818b6c27e0bd093c7c3af904388fcb870c4c4
2015-06-08 09:46:34 -04:00
Geoff Mendal
124103fa52 Import translations. DO NOT MERGE
Change-Id: I8592894958f93b88c36e60e0484f5a1ff6a1bc3a
Auto-generated-cl: translation import
2015-06-08 08:45:04 -05:00
Geoff Mendal
4f460cdb46 Import translations. DO NOT MERGE
Change-Id: I2793d7c9398a326a5ed7eccc9e0d241876cf2947
Auto-generated-cl: translation import
2015-06-08 08:42:20 -05:00
Jason Monk
6236a820a2 Merge "Setup service for tunable things to use." into mnc-dev 2015-06-08 13:10:32 +00:00
Lorenzo Colitti
ef2ccf5f4b Merge "Correctly time out CMD_START_DHCP." into mnc-dev 2015-06-08 12:48:40 +00:00
Kenny Guy
a73e459950 Merge "Correct the docs for getUserBadgedIcon" into mnc-dev 2015-06-08 12:34:26 +00:00
Abodunrinwa Toki
7d3b8833df Merge "Fix ActionMode.snooze API" into mnc-dev 2015-06-08 11:36:19 +00:00
Lorenzo Colitti
5bc64b847a Correctly time out CMD_START_DHCP.
WifiStateMachine expects CMD_START_DHCP to time out after 30-40
seconds. Currently, DhcpClient imposes timeouts on DhcpInitState
and on DhcpRequestState, but not on the time it takes to get to
from CMD_START_DHCP to DhcpBoundState. So in theory the client
could oscillate between DhcpInitState and DhcpRequestState and
never time out.

Fix this by introducing a new oneshot timer that is set when DHCP
starts and is cancelled when it succeeds. CMD_RENEW_DHCP does not
need this because it's implemented using only one state, so the
oneshot timeout can be implemented using the state timeout.

Bug: 19704592
Change-Id: I6a5847a3dee23a2692237b8f3b3b0f8049da5140
2015-06-08 19:57:14 +09:00
Martijn Coenen
6280481af6 Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 2015-06-08 08:05:14 +00:00
Seigo Nonaka
dcfbb618e3 Merge "Catch BadTokenException and continue in clearInsetofPreviousIme." into mnc-dev 2015-06-08 05:36:10 +00:00
Lorenzo Colitti
dc540ea067 Merge "Delete code that checks for the simulator, it's long gone." into mnc-dev 2015-06-08 04:18:40 +00:00
Seigo Nonaka
e937216c33 Catch BadTokenException and continue in clearInsetofPreviousIme.
This is a follow up CL for Ib04967f39b2529251e4835c42e9f99dba2cf43f2.
As well explained in the I2c21573cf972145ab08e66604cdb9344139a3f31,
the race condition here cannot be avoided without an unacceptable
performance penalty.  For now, we follow the same way.

Bug: 21600287
Change-Id: I0ffdf8bf7e8a53cf8aba1339024b32da65d4f32d
2015-06-08 12:47:25 +09:00
Jason Monk
5e745172d9 Setup service for tunable things to use.
Change-Id: I13daa68d3d1ec5584fd84f356f4f5a0d1c0b853a
2015-06-07 08:44:14 -04:00
Jae Seo
683e3cfef1 Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 2015-06-06 05:06:07 +00:00
Jeff Brown
c203e61d60 Merge "Fix Bitmap parceling through ashmem." into mnc-dev 2015-06-06 04:28:02 +00:00
Jeff Brown
a316c5dfbc Fix Bitmap parceling through ashmem.
Fixes a bug where the Bitmap parceling code was unable to deal with
sending bitmaps through Parcels that disallow file descriptors.
Uses extended functionality of the Parcel blob interface to pass
buffers around more efficiently while adapting to whether FDs
are allowed.

Bug: 21428802
Change-Id: If24926f4388d29aa2aac627000436beb015edcb9
2015-06-06 04:23:45 +00:00
Adam Skory
e76e7014c7 Don't forget to parcel mIsAppProvidedIntent
If you forget to parcel it like I did, it's
not going to do you much good.

Change-Id: I85191594e7ffab2c36aeed317932b126da288bdf
2015-06-05 19:08:01 -06:00
Adam Skory
a28863e769 Merge "Record provision of custom Intents in AssistContent" into mnc-dev 2015-06-06 01:01:00 +00:00
Adam Skory
cd70c64f50 Record provision of custom Intents in AssistContent
Simplifies behavior wrt automatically setting the
web URI for ACTION_VIEW Intents, by not doing so
for custom Intents.

Adds a boolean isAppProvidedIntent() as a signal for
recepients of the AssistContent that a custom Intent
was provided. Custom Intents are more likely to be
relevant.

Change-Id: Ibe4bfa040eba904411b9820ab4ddfcf509413829
2015-06-05 18:55:29 -06:00
Eino-Ville Talvala
76233f068b Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 2015-06-06 00:40:16 +00:00
Jae Seo
63d37d9f16 MediaController: Keep the controller when touch exploration is enabled
Also added missing final and @Override keywords

Bug: 17199815
Change-Id: If96554e36799557a2d81767f287aeb446e4a1983
2015-06-05 17:27:30 -07:00
Alan Viverette
371b582c49 Merge "Implement getColorFilter() on VectorDrawable" into mnc-dev 2015-06-06 00:26:04 +00:00
George Mount
e5a93aa81c Don't cause requestLayout when transition changes Visibility.
Bug 21400515

When a Visibility transition temporarily changes a View's
visibility, it should not cause a requestLayout or any other
action, such as focus change. This adds a hidden method to
View to allow it to tweak the visibility without causing
other side-effects.

Change-Id: I5a06149983051319080130e5b5e7cc7edda8dd3e
2015-06-05 17:21:40 -07:00
Wei Wang
dd99df0dbe Merge "Fail sanity check when BSSID is empty in RTT request" into mnc-dev 2015-06-06 00:20:27 +00:00
Alan Viverette
a741711900 Implement getColorFilter() on VectorDrawable
Bug: 21580708
Change-Id: Id64bebeb5c39906ed34775e8ccc39f666966bad9
2015-06-05 17:20:11 -07:00
Heidi von Markham
25af46b07d Merge branch 'mnc-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev 2015-06-06 00:07:02 +00:00
Zhijun He
d3bc26a853 Merge "Camera2: add missing HFR implementation" into mnc-dev 2015-06-06 00:06:46 +00:00
Joe Fernandez
c37d84ac08 am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs
* commit 'edaf008c5e594d140aa430965a779f0b35280730':
  Revert "docs: studio 1.2.2.0 updates"
2015-06-06 00:06:25 +00:00
Justin Harrison
c3b9156e28 am 6715ef75: am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev
* commit '6715ef754a72fdc2477257051e539c38aae6afcd':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
2015-06-06 00:06:07 +00:00
Justin Harrison
9445df6f0b am 95be178d: am c4d7c826: am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev
* commit '95be178dafd0dfefcae060f65df296cb523f82a4':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
2015-06-06 00:06:02 +00:00
Rich Slogar
3a2a310429 am 34bebb04: am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs
* commit '34bebb044062ebb783705c420b8a2e6b38d6af04':
  docs: studio 1.2.2.0 updates
2015-06-06 00:05:44 +00:00
Luan Nguyen
1877a32f21 am 26c3dd5b: am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs
* commit '26c3dd5b0302ea6dcb353be2df8cfaf5f8ca5622':
  docs: Add DevByte embedded video.
2015-06-06 00:05:05 +00:00
Ruben Brunk
8f955f89c2 Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:24 +00:00
Svetoslav
772ca6cf2a Merge "Update SMS permission description string" into mnc-dev 2015-06-05 23:53:46 +00:00
Svetoslav
cfbca74bfa Update SMS permission description string
Change-Id: I777615113dbdcd0df1b5f4984ae18bfa57976ba3
2015-06-05 16:50:51 -07:00
Christopher Tate
97c699e2bd Merge "Don't run backups in battery-saver mode" into mnc-dev 2015-06-05 23:50:44 +00:00
James Cook
74f3d39671 Merge "Allow different visual and voice assist prompts" into mnc-dev 2015-06-05 23:49:59 +00:00
Sanket Padawe
912f705f1f Merge "Suppress default logging in SubscriptionManager." into mnc-dev 2015-06-05 23:45:45 +00:00
Stefan Kuhne
5c6c06bf18 Merge "Adding am send-trim-memory command" into mnc-dev 2015-06-05 23:37:15 +00:00
James Cook
6cf397508e Allow different visual and voice assist prompts
* Introduce VoiceInteractor.Prompt, holding multiple voice prompts
("What genre?", "What genre of music?", "What genre of music, for
example classical?") as well as a different visual prompt to show
on screen ("Choose genre").
* Migrate framework voice interactor code from a CharSequence prompt
to Prompt.

Bug: 21024958
Change-Id: Ib595fbdb2801cc558085e9b8366d619ff1d4d656
2015-06-05 16:36:22 -07:00
Adam Lesinski
8e518c81ea Merge "Update docs to reflect correct time units" into mnc-dev 2015-06-05 23:31:28 +00:00