140867 Commits

Author SHA1 Message Date
Baligh Uddin
870897e4d3 Merge "Import translations. DO NOT MERGE" 2014-06-27 15:56:14 +00:00
Baligh Uddin
eadcf2b25b Merge "Import translations. DO NOT MERGE" 2014-06-27 16:52:20 +00:00
Baligh Uddin
46048fec8c Merge "Import translations. DO NOT MERGE" 2014-06-27 16:52:20 +00:00
Baligh Uddin
2cbab6c907 Import translations. DO NOT MERGE
Change-Id: I69929680cab4ea18219ae4b6890812578c9dd8ca
Auto-generated-cl: translation import
2014-06-26 11:50:05 -07:00
Baligh Uddin
b282abcbf0 Import translations. DO NOT MERGE
Change-Id: Ida59c57e420b5e808d438fb1080bdf627c882bb1
Auto-generated-cl: translation import
2014-06-26 11:39:51 -07:00
smain@google.com
67421351cc Merge "fix links to wear downloads" into klp-modular-dev 2014-06-26 18:07:29 +00:00
smain@google.com
44c249adb0 fix links to wear downloads
Change-Id: Ibf8fca2d8f504f0d0c7275851fc6282052043259
2014-06-27 15:49:15 -07:00
Robert Ly
137d9da3aa Merge "docs: fix images for notifications" into klp-modular-dev 2014-06-26 18:07:29 +00:00
Robert Ly
9e12140b0a docs: fix images for notifications
Change-Id: I8e5bd73c1b00a231fd08c822ccfa349143bd8410
2014-06-27 17:28:27 +00:00
Robert Ly
ba10292579 Merge "more doc fixes for notifcations and wear" into klp-modular-dev 2014-06-26 18:07:29 +00:00
Robert Ly
cfcb47c90a Merge "fix reference link" into klp-modular-dev 2014-06-26 18:07:29 +00:00
Robert Ly
2f48339b5e fix reference link
Change-Id: Ia291e04a6404a3732acdbc730a414b71ee5eee89
2014-06-26 11:36:23 -07:00
Robert Ly
99ff245482 fix link
Change-Id: Ic8d7f135e43d1a76c56c5f66245a4a499e1efab1
2014-06-26 11:31:46 -07:00
Robert Ly
495aa4efd7 fix more brokenness
Change-Id: I19c9d6345117825a2bb0504731c358adc7a2f55e
2014-06-26 11:20:57 -07:00
Robert Ly
af19c795e2 Merge "fix gmscore preview isntructions" into klp-modular-dev 2014-06-26 18:07:29 +00:00
Robert Ly
a96b96e7b5 fix gmscore preview isntructions
Change-Id: I58264d2bb608e726d95b64f3cfb829ffff573ea5
2014-06-26 13:16:19 -07:00
Robert Ly
ff0b60068a Merge "fix link" into klp-modular-dev 2014-06-26 18:07:29 +00:00
Andrew Lee
4ea10b0cba Merge "Add methods to set a CallVideoProvider on a Call." 2014-06-26 18:07:29 +00:00
Andrew Lee
5ffbe8b850 Add methods to set a CallVideoProvider on a Call.
Bug: 15893156
Change-Id: I6ae151bc37d8c0be2e4c9823e9444717b6cdc0de
2014-06-27 15:03:24 -07:00
Tyler Gunn
7c668b921b Adding CallVideoClient, used to provide a callback mechanism for the
framework to notify the InCallUI of events related to video calls.

Change-Id: Ife628b27bcefd8e88df2fc899cbbcfa07cfac90b
2014-06-27 21:57:12 +00:00
Andrew Lee
f759b5bb0b Add wrapper to provide method calls for binder to InCallUI.
Bug: 15893156
Change-Id: I6b12c0e8c915e184bb469b5934865242f9fde00d
2014-06-27 14:11:51 -07:00
Alan Viverette
100a2d1fc6 Clean up AnimationDrawable.setVisible() state management
BUG: 15823683
Change-Id: Ied0d476956c246bdfda66219aaa896f2ef58f0bd
2014-06-27 13:15:14 -07:00
John Spurlock
d42f495849 QS: Tile text to 70% white.
Change-Id: I4dcad126b1b2467b780192ae220493c301cdb5bb
2014-06-27 15:33:21 -04:00
George Mount
31e8005e06 Merge "Don't use overlay to transition ImageViews." 2014-06-27 15:56:14 +00:00
Alan Viverette
9550acf1e9 Merge "Require color in RippleDrawable constructor, fix documentation" 2014-06-27 16:52:20 +00:00
Alan Viverette
7275abde37 Require color in RippleDrawable constructor, fix documentation
Marks old constructor for removal and emits LOG_E when used.

BUG: 15808263
Change-Id: Iae4f3237261541cb04f42343351b3fc0ac4929ac
2014-06-27 14:34:54 -07:00
RoboErik
198dcfed84 Merge "clear calling identity when changing volume" 2014-06-26 18:07:29 +00:00
RoboErik
f77b99f08a clear calling identity when changing volume
bug: 15925039

Change-Id: I8596266109fd65d7c2de5718ccdda937694befba
2014-06-27 18:47:18 +00:00
Yorke Lee
1d80a877d6 Merge "Unhide more ContactsContracts fields" 2014-06-26 18:42:03 +00:00
Yorke Lee
8d3700988e Unhide more ContactsContracts fields
These are needed for unbundling of Dialer/Contacts

Bug: 6948882
Change-Id: I1640387a44608acc9c737bebea9c4f77e774fab1
2014-06-27 11:23:33 -07:00
Andre Eisenbach
d0cba405bc Merge "LE: Hide new congestion constant for now" 2014-06-27 16:52:20 +00:00
Andre Eisenbach
fad6726724 LE: Hide new congestion constant for now
Change-Id: I86455be16bc3356a1ad24db6d6e6835cb299eb5f
2014-06-27 11:42:19 -07:00
Robert Ly
5e27dc9257 am 00a05a90: am 6ebcfb87: docs: notif image
* commit '00a05a902f42d9d1233a6080bdc26108330c0a00':
  docs: notif image
2014-06-27 18:31:19 +00:00
Winson Chung
d7b2cb12ac Continuing refactor of TaskStackView.
- Extracting stack and filtering logic.

Change-Id: Id794cb2e36238baa49e614bc436bf07de6680804
2014-06-27 11:30:23 -07:00
Robert Ly
174943b39d Merge "fix more brokenness" into klp-modular-dev 2014-06-26 18:07:29 +00:00
Baligh Uddin
a3f8dc880b Merge "Import translations. DO NOT MERGE" 2014-06-26 18:07:29 +00:00
Alan Viverette
6a0a338ead Merge "Fix unsafe public methods that take TypedArray" 2014-06-26 23:40:51 +00:00
Alan Viverette
abda548088 Fix unsafe public methods that take TypedArray
BUG: 15782973
Change-Id: Ifeb032976cd20cf25fe7ecea83eab9d71a16ebc3
2014-06-27 23:11:55 +00:00
Baligh Uddin
035ef683a1 Import translations. DO NOT MERGE
Change-Id: Ide25c1a618ebed66da3ad87834761ddbf23ff08c
Auto-generated-cl: translation import
2014-06-26 11:40:39 -07:00
George Mount
566cbf20cc Merge "Fix activity transitions enter transition." 2014-06-26 18:07:29 +00:00
George Mount
2eb983be20 Merge "Activity Transitions: change default behavior." 2014-06-27 16:52:20 +00:00
Robert Ly
f618dcaea6 am b76f6afe: am 137d9da3: Merge "docs: fix images for notifications" into klp-modular-dev
* commit 'b76f6afeca731dbbc33e0c2aef234f42544e7890':
  docs: fix images for notifications
2014-06-27 18:09:15 +00:00
Andre Eisenbach
7bb5e3fd4c Merge "LE: Add notification sent and congestion callbacks (3/4)" 2014-06-26 18:07:29 +00:00
Andre Eisenbach
dadefdad8e LE: Add notification sent and congestion callbacks (3/4)
This change introduces two new callbacks for applications to better
handle LE notification flow control and transport congestion. The
notification callback is invoked when the remote platform confirms an
indication or when a local notification has been passed to the
controller. No new notifications should be sent until a callback is
received.

Congestion callbacks are triggered when a GATT operation cannot be sent
to the local Bluetooth controller. Repeatedly calling
writeCharacteristic() for example will eventually trigger a congestion
callback. Applications cannot send additional data until a further
callback is received, indicating that the congestion has cleared up.

Also made server callbacks "oneway" in the AIDL definition file.

Change-Id: I7fa3324712205c79efce58e5e3df8b80a265a442
2014-06-27 10:31:41 -07:00
Jason Monk
3ada97b002 Merge "Fix crash in starting lock task" 2014-06-26 18:34:16 +00:00
Jason Monk
a4e946bb6f Fix crash in starting lock task
Sometimes when coming from a dialog the current activity has changed,
which causes AM to crash and take down the framework.  Instead don't
check the current activity as the user has confirmed the operation
so it is not coming from the background.

Change-Id: I0daeabcfcf814c52bcc7907a624fe6e9453c427f
2014-06-27 10:11:56 -04:00
ztenghui
c94685037f Merge changes I557e855f,I16d2ed29
* changes:
  Add string support for valueFrom/valueTo
  Update the tests to show more animations from UX team
2014-06-26 23:40:51 +00:00
Robert Ly
80f7f1081d am a1180f7b: am 5627b521: Merge "fix build" into klp-modular-dev
* commit 'a1180f7b72e90d403ffe9358bc2d815f8518f551':
  fix build
2014-06-27 17:26:57 +00:00
Robert Ly
8f5c674836 am 672b1d13: am ba102925: Merge "more doc fixes for notifcations and wear" into klp-modular-dev
* commit '672b1d13c92ee14f13a70004acfb1971df323afe':
  more doc fixes for notifcations and wear
2014-06-27 17:19:17 +00:00
ztenghui
66d3d8a09e Add string support for valueFrom/valueTo
b/15910407

Change-Id: I557e855f7d16e2eb0452d43ca6a672acdcae2071
2014-06-27 09:05:40 -07:00