189389 Commits

Author SHA1 Message Date
Yang Ni
f5fa550afa Merge "Move new script group API into ScriptGroup class" 2015-04-22 23:14:38 +00:00
Adam Lesinski
98c7c1355b Merge "AAPT: Add flag to disable versioning of vector related XML" 2015-04-22 23:10:31 +00:00
Steve McKay
a78a3694b5 Update activities to clear search term when a root that doesn't support search is selected by the user.
BUG=20495230

Change-Id: Iee2e2bd80dea6d368cad0911117e3759bdfe37d9
2015-04-22 15:57:11 -07:00
Andy Hung
98d4ca6229 Add channel index mask to AudioRecord
Change-Id: I5d2504d3a7af6611d3ffa9a4c2d3665a2cf97fef
2015-04-22 15:43:48 -07:00
Todd Kennedy
acf4698ce6 Merge "Add hardware feature describing a car" 2015-04-22 22:42:14 +00:00
Andy Hung
463cb818ba Merge "Add PlaybackSettings for use with AudioTrack" 2015-04-22 22:36:17 +00:00
Yang Ni
ead1af8319 Move new script group API into ScriptGroup class
And mark existing methods and builder deprecated.
Removed ScriptGroup2 class.
Renamed nested class UnboundValue to Input.
Marked classes Closure, Future, and Input as final.

Change-Id: I362910c115e9d0173dc515674e08bf4878232879
2015-04-22 15:34:07 -07:00
Mike Lockwood
ec32ac95dc Add Context.MIDI_Service to the public API
I forgot this when the rest of MidiManager was made public.

Change-Id: Ic5f8e2674d5b8e13bd88feebf3cf219f7af7fbcc
2015-04-22 15:33:34 -07:00
Andy Hung
263b4c9782 Add PlaybackSettings for use with AudioTrack
Change-Id: Ie59686d46869558d489a7600170ddace00e548d5
2015-04-22 15:27:16 -07:00
Luan Nguyen
a5ee27b3aa am ee066f57: Merge "cherrypick from lmp-docs docs: Add Wear Capability training Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0" into lmp-mr1-ub-docs
* commit 'ee066f576e153bc11ea1a3991d0204c953d2c3fa':
  cherrypick from lmp-docs docs: Add Wear Capability training Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0
2015-04-22 22:11:22 +00:00
Luan Nguyen
ee066f576e Merge "cherrypick from lmp-docs docs: Add Wear Capability training Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0" into lmp-mr1-ub-docs 2015-04-22 21:58:08 +00:00
Quddus Chong
cfdcf7d6d8 docs: Added What's New section for GMS v7.3 (Parmesan).
Change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
2015-04-22 14:56:37 -07:00
Doris Liu
a01fbf35de Infer value type for keyframes when it is undefined
Bug: 20140483

Change-Id: Idf6caea2a8eae803e33dd34b9c8f563ad12e1848
2015-04-22 14:50:17 -07:00
Wale Ogunwale
7e0fea3557 Merge "Don't limit fullscreen stack window size to parent window size" 2015-04-22 21:41:44 +00:00
Tor Norbye
891ad60a6f Merge "Add threading annotations" 2015-04-22 21:32:39 +00:00
Todd Kennedy
7f95a00ec0 Add hardware feature describing a car
We need to define a hardware feature for when Android is running
embedded on a vehicle's headunit. This is not applicable when
running Android on a phone and projecting onto a headunit.

Bug: 20016089
Change-Id: I70e94564f7493afe70a49bf582a627c5ea9f0a60
2015-04-22 14:28:25 -07:00
Selim Cinek
06a24ebd77 Fixed a regression with collapsed notification heights
This could lead to collapsed notifications having and intrinsic
height smaller than the collapsed size and notifications
overlapping.

Change-Id: Iabba19033f8069f1f75218280b97d3a1a45a5efb
2015-04-22 14:22:05 -07:00
Rubin Xu
dc105cc91c Enable system service to notify device owners about pending update
Create a DevicePolicyManager API which can be used by OTA subsystem
to tell device owners about pending updates. Device owners will get
a callback from its DeviceAdminReceiver when the update service sends
out such notifications.

Bug: 20213644
Change-Id: Ifcc755655e4f441980cf77d76175a046112ca9ae
2015-04-22 22:11:04 +01:00
Luan Nguyen
679934f37f am 34997731: cherrypick from lmp-docs docs: Add Channel API summary for Wear. Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
* commit '34997731954015ce4e946ce696d487db17b848c1':
  cherrypick from lmp-docs docs: Add Channel API summary for Wear. Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
2015-04-22 20:48:02 +00:00
Svet Ganov
db30ac84b6 Merge "Make read/write from/to XML persistent state more robust." 2015-04-22 20:44:20 +00:00
Svet Ganov
ba0821ed3b Make read/write from/to XML persistent state more robust.
When writing critical state to XML an excpetion can lead to creating
a malformed XML that is later parsed and may put the device in a bad
state. Hence, on any error while writing we should bail out and drop
the partially write state on the floor.

Corollary, any error on parsing can lead to having a partially read
state that is not consistent which may lead to writing this bad state
back to disk. Hence, on any error while parsing we should bail as
our current state may be unrecoverable.

Change-Id: Ia050c16198cb583f8a51263ad2035dbb948052b8
2015-04-22 13:42:54 -07:00
Marco Nelissen
453100c06e am 3430f599: am ba43f7e9: Merge "Revert "Sometimes the application context is null""
* commit '3430f59951328c6d17045fbc8f85f629723af541':
  Revert "Sometimes the application context is null"
2015-04-22 20:42:41 +00:00
Alan Viverette
3797a788dc Merge "Fix visual styling for Material Spinner background" 2015-04-22 20:41:30 +00:00
Rich Slogar
e85ca7d1fe docs: support library 22.1 feature updates
b/20456505

Change-Id: Iff4b97928d73fa38d9ada2e786ac644d61e918cb
2015-04-22 13:39:42 -07:00
Marco Nelissen
3430f59951 am ba43f7e9: Merge "Revert "Sometimes the application context is null""
* commit 'ba43f7e914cd2cb8145ffeb5720aa5e87be48b9b':
  Revert "Sometimes the application context is null"
2015-04-22 20:28:54 +00:00
Marco Nelissen
ba43f7e914 Merge "Revert "Sometimes the application context is null"" 2015-04-22 20:08:38 +00:00
Marco Nelissen
360f2ab62d Revert "Sometimes the application context is null"
This reverts commit d86281cb3da685672d89f964228980f6753adcae.

Change-Id: Icaf8e1e4812f64060066331f9000be15c134d1d2
2015-04-22 20:07:15 +00:00
John Reck
f7de58130a Merge "GraphicsJNI Canvas cleanup" 2015-04-22 20:00:46 +00:00
Wale Ogunwale
b171abbca8 Don't limit fullscreen stack window size to parent window size
A previous change limited the size of a window to the parent window
size at max. so that child windows don't extend outside their parent
stack when resized in a multi-window environment. This broke the
wallpaper positioning functionality since the wallpaper is no longer
bigger than it's containing stack so it can't be scrolled. Now, we
only limit the window size to the parent window size if the window
stack is not fullscreen.

Bug: 19434096
Bug: 19225079
Change-Id: I1a8788727e6c4a91da45d8a87850093ef5a24edf
2015-04-22 12:47:17 -07:00
Marco Nelissen
75da217605 am 9e05ece7: am 0601a280: Merge "Sometimes the application context is null"
* commit '9e05ece7ab8510fc3dade202a8647de22f4b0906':
  Sometimes the application context is null
2015-04-22 19:41:57 +00:00
Marco Nelissen
9e05ece7ab am 0601a280: Merge "Sometimes the application context is null"
* commit '0601a280e5db18ff2c084a0785504f959c2ff92f':
  Sometimes the application context is null
2015-04-22 19:31:26 +00:00
Mady Mellor
73d74680b7 Merge "Enable stylus scale by default for apps targeting MNC+" 2015-04-22 19:21:36 +00:00
destradaa
4fbc845b68 Merge "Avoid performing work in the platform when GPS HAL does not support a feature. b/19271554" 2015-04-22 19:17:08 +00:00
Marco Nelissen
0601a280e5 Merge "Sometimes the application context is null" 2015-04-22 19:06:47 +00:00
Mady Mellor
7c36a685fe Enable stylus scale by default for apps targeting MNC+
Bug: 20467919
Change-Id: Icadd45c8031e362d8101419c298133d59165939b
2015-04-22 11:52:31 -07:00
Wale Ogunwale
a48a8db90f Fixed bug with black background when exiting a wallpaper window.
* Defer hiding the wallpaper until all animations are done. We were
previously hiding the wallpaper once the closing app animation is
done which leads to the background of the opening app animation
going black since there is nothing to show there.

* Don't set the wallpaper_close_enter animation blackground
to black. This will also cause the background of the opening app
animation to go black once the wallpaper closing app animation is
done.

* Don't set task_open_enter animation blackground to black. This
can cause an undesired black frame during transition if the new
task is created on the home stack instead of an application stack.

Bug: 17098816
Bug: 19454410
Change-Id: I0e63d72b1748d7d2424119b3176f48476293af92
2015-04-22 11:24:46 -07:00
Abodunrinwa Toki
d5358ffbee Fix floating toolbar touchable region bug.
The floating toolbar is rendered inside a transparent popup window
so that we can have smooth animations inside of the window (NOTE that
animating a view and a window at the same time do not work well as
both are not in sync.) Having a transparent window implies that we
can't get touch events through to the content below the window for
areas covered by the transparent window. To handle this issue we
"burn a hole" through the window by specifying it's "touchable area".
This is done using the mInsetsComputer which is set on the popup
window's root view's tree observer. When the popup is dismissed and
re-shown, we need to reset the mInsetsComputer as we most likely
won't have that root view any longer.

Change-Id: I13ea50bc19950180d339d05d82cbee03230e2f05
2015-04-22 18:19:38 +00:00
Steve McKay
a56104d74d Merge "Reduce code duplication between DocumentsActivity and StandaloneActivity." 2015-04-22 18:13:21 +00:00
Todd Kennedy
4ff2617265 Merge "update api files" 2015-04-22 18:08:52 +00:00
Todd Kennedy
89902b9040 update api files
Bug: 20410696
Change-Id: I3a9d14e4031b0746b2527ad2b0ff1c8521c64e1d
2015-04-22 11:07:28 -07:00
Adam Skory
26d68e50fa Merge "nullcheck Activity.getIntent() for AssistContent" 2015-04-22 17:59:34 +00:00
Quddus Chong
967d2057e9 am a5617d07: am 8408cbe3: cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402
* commit 'a5617d07623d773a03230866c95712a795149b33':
  cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402
2015-04-22 17:51:25 +00:00
Kris Giesing
1aa5fb9619 am 6ea4f936: (-s ours) am 0ab9655a: (-s ours) Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs
* commit '6ea4f9361e644e371c2f49454d2832c451648ebd':
  DO NOT MERGE Revert "Load libraries directly from apk"
2015-04-22 17:51:18 +00:00
Kris Giesing
d516650495 am 2a0c4a3a: (-s ours) am 6cf2d35d: (-s ours) Merge "DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"" into lmp-mr1-ub-docs
* commit '2a0c4a3ae091c4a922a1dec040a56c2edcc5e588':
  DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"
2015-04-22 17:51:12 +00:00
Kris Giesing
834678ed8b am b3ebc0f8: am 663cdc5c: Tweak wording on release notes for Leanback.
* commit 'b3ebc0f8f3cfc3efbd5cda42a303046aa9c71af1':
  Tweak wording on release notes for Leanback.
2015-04-22 17:51:05 +00:00
Rich Slogar
20a5478af7 am ac66e2aa: am 1c6c22d3: docs: support library 22.1 updates
* commit 'ac66e2aa292f2bf9924e7189b14813b76ab16304':
  docs: support library 22.1 updates
2015-04-22 17:50:56 +00:00
Ryosuke Matsuuchi
fd48dcca5f am 12651970: am 2fb3dc2f: doc: Add Korean version of DAC/distribute/ page.
* commit '12651970876f8829d87f2075b0719c766f31dd73':
  doc: Add Korean version of DAC/distribute/ page.
2015-04-22 17:50:49 +00:00
Dirk Dougherty
fad1c48161 am a136b544: am 7e75d3ec: Doc change: distribute landing page.
* commit 'a136b5442f0dd3cd088e4a2995cb507df1ad604d':
  Doc change: distribute landing page.
2015-04-22 17:50:42 +00:00
Joe Fernandez
c6820220e4 am c3afa452: am 7ce1ab5f: Merge "docs: studio remove gradle tasks dialog" into lmp-mr1-ub-docs
* commit 'c3afa452b913304232d61ab96d1e2ffe77af1f54':
  docs: studio remove gradle tasks dialog
2015-04-22 17:50:35 +00:00
Rich Slogar
3ee60bb0a3 am a2fb6d63: am 6b1b71c9: docs: hierarchyviewer updates
* commit 'a2fb6d63d8b4e18c302e4b08f02c4c7737345d24':
  docs: hierarchyviewer updates
2015-04-22 17:50:29 +00:00