143311 Commits

Author SHA1 Message Date
Deepanshu Gupta
5efee91e12 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
d3ac01ff76 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev 2014-07-17 21:04:20 +00:00
Ricardo Cervera
9c36b83519 am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs
* commit '7a4253608397e647e2f04a1b14d0f02f3d695336':
  docs: Fixed RecyclerView example. Bug: 15973665
2014-07-17 20:34:58 +00:00
Ricardo Cervera
7a42536083 am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs
* commit '25303a980c026aab3ba0a01ce2a51122eb9982c2':
  docs: Fixed RecyclerView example. Bug: 15973665
2014-07-17 20:31:01 +00:00
Robert Ly
ee65b63d25 am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs
* commit '049cadd8c965ad69b875cd5ed7768c1b162acb39':
  docs: Fix typo in Wear docs. Bug: 16327298
2014-07-17 20:30:32 +00:00
Robert Ly
049cadd8c9 am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs
* commit 'f1b18ded01adf94ee34dbd95a86616d8eadbdf06':
  docs: Fix typo in Wear docs. Bug: 16327298
2014-07-17 20:27:03 +00:00
Prashant Malani
162d943350 am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev
* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional
2014-07-17 19:55:32 +00:00
Filip Gruszczynski
bbc499415c am a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev
* commit 'a76164e1d0d283baf412c18999e680d93bd50f01':
  Only use bottom outset for main display.
2014-07-17 19:55:27 +00:00
Selim Cinek
4cb6746e6b Merge "Fixed a bug with low priotity notification coloring" into lmp-dev 2014-07-17 19:55:10 +00:00
Selim Cinek
3107cfacd3 Fixed a bug with low priotity notification coloring
When there where only low priority notifications, the topmost
notification was not colored correctly.

Bug: 16197778
Change-Id: I9fe8da79cfa78a3b94a3107c9e1af83b859a093e
2014-07-22 15:28:54 +02:00
Guang Zhu
b477fc6c2f Merge "add command to enable bt snoop log" into klp-modular-dev 2014-07-17 19:26:18 +00:00
Guang Zhu
946f207d3d add command to enable bt snoop log
Change-Id: I22a6482a90c2bb976a5ce44946e9f0fb8b59e6b2
2014-07-17 20:24:56 -07:00
Dan Sandler
a7c49aa1b8 Merge "Old habits die hard." into lmp-dev 2014-07-17 19:20:15 +00:00
Alan Viverette
bfe76f4547 Fix docs build error in MediaFormat
Change-Id: I5faf72efa1a792f9a500eb4abc76d4e4cda5516d
2014-07-21 19:37:17 -07:00
Dan Sandler
7dea0eeb06 Old habits die hard.
Bug: 16458225
Change-Id: Ie5edebbb406412ed5643fda65ab94e92a86b217e
2014-07-21 21:07:15 -04:00
Derek Sollenberger
94ca6cd7c9 Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev 2014-07-17 19:20:15 +00:00
Derek Sollenberger
2cb8c3c9e5 Remove invalid SkASSERT that prevents us from running with SK_DEBUG
Change-Id: I5634990e6cb962d72b686f7f103b9af7d96d4b55
2014-07-21 12:46:33 -04:00
Derek Sollenberger
637c588cf1 Merge "Separate Canvas JNI code from the implementation." into lmp-dev 2014-07-20 04:41:30 +00:00
Robert Ly
fb06b4800c am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video
* commit '205196f128b13eecea2789506341c7ecd2044b71':
  docs: change copy for edu video
2014-07-21 16:22:12 +00:00
Derek Sollenberger
8872b38ef4 Separate Canvas JNI code from the implementation.
This introduces Canvas.h which is a pure virtual interface that
is intended to be used by both Skia and HWUI implementation. To help
stage this transition this CL only introduces the interface and Skia
implementation.  The interface is not intended to be final and will
undoubtedly go through iterations in both style and location as we
look to introduce the HWUI implementation.

BUG:15672762
Change-Id: Ibaccdddb87d3b9358f4f0c1d317ead5282d4ee16
2014-07-21 12:08:57 -04:00
Adrian Roos
5005244f10 More user switching goodness
- Confirmation when exiting guest
- Dialog when resuming existing guest session (will be HUNed in follow-up CL)
- Properly center user name in QS user switcher

Bug: 15759638
Bug: 16378966
Change-Id: I63a1dd524975408618c10d90a18052f15deec756
2014-07-21 15:54:03 +00:00
Dan Sandler
09afc2e4ea Defend against null ApplicationInfos.
Bug: 16303792
Change-Id: Id2d7a70f92718ecda8e3ff418c4e109f6982a75f
2014-07-21 13:11:17 +00:00
Wonsik Kim
9f6799becf Merge "TIF: fix indexOfValue usage" into lmp-dev 2014-07-17 21:11:29 +00:00
Wonsik Kim
38feae971c TIF: fix indexOfValue usage
SparseArray.indexOfValue() was used in place where comparison using
equals() on value was desired, but the method actually uses == instead
of equals().

Change-Id: Id9fb3317d1e0f0cb60ce6512f6d0c0a7bcf2fb20
2014-07-21 21:43:48 +09:00
Wonsik Kim
34902f46c1 Merge "TIF: fix tvInputType attribute to match with TvInputInfo" into lmp-dev 2014-07-17 21:11:29 +00:00
Adrian Roos
edad7b24c1 Update LockPatternUtils to new alarm API
Change-Id: Idc6c2865b86e467e1e254452326f327f145177b0
2014-07-21 12:07:52 +00:00
Wonsik Kim
11145e52be TIF: fix tvInputType attribute to match with TvInputInfo
Change-Id: Ic42add6f09da7d2ad5793da41caeda6d0328ad30
2014-07-21 20:56:37 +09:00
Niels Egberts
1d44e0ccec New TtsSpan builders for money, electronic and telephone.
Change-Id: Idb6a66725395dbd665e17c00678901d54b4b1753
2014-07-21 11:17:49 +01:00
Jungshik Jang
5fe8dcf78d Merge "Add two apis for one touch record." into lmp-dev 2014-07-17 21:07:39 +00:00
Jungshik Jang
a6b2a7a59a Add two apis for one touch record.
This change introduces new two apis for one touch record.
1. setRecordRequestListener
 It's used to get notified when a recorder device initiates
 "one touch record". As return of callback, client should
 generate "record source" and return it.
2. startRecord
 It's used to initiate "one touch record" from Tv.

Along with this, add HdmiRecordSources which is a helper
class assisting buidling byte array form from the given
record source information.

Bug: 16160962

Change-Id: I403d37b752c9b7f799c6d8188a071ef420fe8ac2
2014-07-21 16:54:53 +09:00
Santos Cordon
f29511043e Change telecomm APIs from protected to public (1/3)
Bug: 16416927
Change-Id: I859c80a120fa59bba12a5c6bfca17fa57613a6aa
2014-07-21 06:19:35 +00:00
Ji-Hwan Lee
04d926cb13 Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev 2014-07-17 21:11:29 +00:00
Ji-Hwan Lee
4f9f57cede TIF: Extend multiple TV input per service for HDMI logical devices
Remove ITvInputManager.registerTvInputInfo() and let addTvInputInfo*()
cover the registration.

Bug: 15570939
Change-Id: Ic36701de96696e7fe32fc1faa0d5f6fde53f6666
2014-07-21 17:04:04 +09:00
Jinsuk Kim
75df3bf978 Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev 2014-07-17 22:03:23 +00:00
Joe Onorato
2d5720a028 Move android.bluetooth and android.telephony to framework2.jar.
Change-Id: I53cdd2a07165427c4dea037893ade3049f57f584
2014-07-21 05:30:25 +00:00
Jinsuk Kim
5ad57168da Invoke callback for HdmiControlService.deviceSelect() for internal source
The call should be always successful if device to switch to is internal
TV source as setting it as the active source doesn't require communication
with other devices. Added the missing callback invocation.

Change-Id: I9968098316a955509f4de0e7af6f4407087ad4a2
2014-07-21 13:37:49 +09:00
Santos Cordon
40075c7cdd Merge "Change incoming call intent to a TelecommManager method. (1/3)" into lmp-dev 2014-07-19 22:40:06 +00:00
Santos Cordon
96efb488af Change incoming call intent to a TelecommManager method. (1/3)
Also moves a few constants from TelecommConstants to TelecommManager.
Bug:16416927

Change-Id: I8e74feb228523ed1c186b2f06784d04cb9141f86
2014-07-20 17:41:08 -07:00
Jean-Michel Trivi
dfa871620c Merge "Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition" into lmp-dev 2014-07-18 18:24:25 +00:00
Youngsang Cho
4350a6210f TIF: update documentation of TvInputInfo.getParentId()
Change-Id: I5c0733d28621486ec0ff0f093c22eb1cc05f785d
2014-07-21 00:13:03 +00:00
Jean-Michel Trivi
9b9d72fd11 Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition
Bug 16401631

Change-Id: I522e7c7030a71b528a484d4d8ae517b4b09460bf
2014-07-20 16:53:27 -07:00
Sandeep Siddhartha
110f569b47 Fix synchronization issues in AlwaysOnHotwordDetector
- Remove unnecessary recognition status from AlwaysOnHotwordDetector

- Remove unnecessary recognition started callback from IRecognitionStatusCallback

- Fix a bug around the fact that we weren't picking up enrollment at runtime because
we were storing the availability at instantiation time.

- Handle 0-length arrays in SoundTrigger classes while parceling/unparceling

- Fix issue in SoundTrigger helper where we were not comparing binders for start/stop calls

- Unload the previous model when starting a new recognition

- Add more debug logging

Change-Id: Icc56d7f3dd1ffa49a8cfeea49080e3ab4d342c32
2014-07-20 16:53:09 -07:00
Evan Charlton
e954426494 Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev 2014-07-18 18:24:25 +00:00
Evan Charlton
8c8a062f52 Rename PhoneAccountMetadata to PhoneAccount
Change-Id: I4597b14110c1cee7f637ec125b839852ef0f34c4
2014-07-20 15:12:16 -07:00
Jungshik Jang
189bff29e6 Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev 2014-07-17 21:11:29 +00:00
Jinsuk Kim
6e8abd7fd8 Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev 2014-07-17 21:07:39 +00:00
Jinsuk Kim
7474faca5b TIF: Register IHdmiInputChangeListener to physical input manager
This lets the manager receive the callback from HdmiControlService
when a CEC device requests that it shall be the active source. It will be
transformed to an intent with a channel URI associated with
the corresponding TV input.

Change-Id: I02d4b24d5d05ad7a093e3b996942cbc43fd1ce8b
2014-07-21 11:50:19 +09:00
Jesse Hall
19eb5cb80e Merge "Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A" into lmp-dev 2014-07-20 04:41:30 +00:00
Santos Cordon
6aac0f52e1 Merge "Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)" into lmp-dev 2014-07-19 22:40:06 +00:00
Jae Seo
a759b111a1 TIF: Add sendAppPrivateCommand()
Added a way to send a private command from the application to the TV
input. This can be used to provide domain-specific features that are
only known between certain TV inputs and their clients.

Change-Id: I7548311a64147b8ff27562ec680b941e2ec10bc0
2014-07-20 19:16:15 -07:00