OSDN Git Service
Wonsik Kim [Thu, 3 Jul 2014 10:06:56 +0000 (19:06 +0900)]
TIF: Let TvInputHal handle multiple streams
Bug:
15579918
Change-Id: Iad972c36d675fb99b5950bcecf5925e660272cb4
Jinsuk Kim [Fri, 4 Jul 2014 05:10:04 +0000 (05:10 +0000)]
Merge "Remove the usage of TX_STATUS in HdmiControlService"
Jinsuk Kim [Fri, 4 Jul 2014 04:26:44 +0000 (13:26 +0900)]
Obtain TV power status correctly in HdmiControlService
Bug:
15845654
Change-Id: I28b97e7ecb462b4fbaf6ac573e4d0fc9fcf724da
Jinsuk Kim [Thu, 3 Jul 2014 09:02:01 +0000 (18:02 +0900)]
Launch routing control in HdmiControlService at boot up
Change-Id: I918c2a0da26a7cda20ee703dfeeacae276ec8373
Jinsuk Kim [Thu, 3 Jul 2014 03:51:52 +0000 (12:51 +0900)]
Remove the usage of TX_STATUS in HdmiControlService
Reflects the change to come in CEC HAL
Change-Id: I3a64e19bbdd8067855911ef11653fe64049b8880
Sailesh Nepal [Thu, 3 Jul 2014 04:26:12 +0000 (21:26 -0700)]
Remove handoff APIs
This CL removes the old handoff APIs and renames
handoffCall() to phoneAccountClicked().
Change-Id: Iab1595faaadcdfe428d97891d314babea21e9633
Jinsuk Kim [Fri, 4 Jul 2014 03:58:09 +0000 (03:58 +0000)]
Merge "Add API setProhibitMode in HdmiControlService"
Jinsuk Kim [Thu, 3 Jul 2014 07:43:58 +0000 (16:43 +0900)]
Add API setProhibitMode in HdmiControlService
setProhibitMode sets a flag inside the service that indicates if
input switch request will be processed or not. Sets to true when
TV is doing something for which TV display should be fixed, like
channel scan, software update - collectively called 'prohibit mode'.
Change-Id: I8ac623023210b58b684b9af3ac475a5fe0d09435
Jinsuk Kim [Fri, 4 Jul 2014 02:43:36 +0000 (11:43 +0900)]
Fix broken build
Added the missing file
Change-Id: I96a918b6e8a368b44eb3d51cd8bfd567dbc8de94
Jungshik Jang [Fri, 4 Jul 2014 02:27:32 +0000 (02:27 +0000)]
Merge "Remove duplicated cec keycode definitions."
Jungshik Jang [Fri, 4 Jul 2014 02:11:29 +0000 (11:11 +0900)]
Remove duplicated cec keycode definitions.
Remove keycode (ui command) defined and use HdmiCecKeycode one.
Change-Id: I9a7c4be3e5cfd561c7353b9cda715d431c00ff0c
Jinsuk Kim [Thu, 3 Jul 2014 05:04:02 +0000 (14:04 +0900)]
Update routing control action for HdmiControlService
Added an argument queryDevicePowerStatus on which routing control action flow
should be based.
Bug:
15845652
Change-Id: Ib8a2d31792aad67289308167d07f660c3438be78
Jungshik Jang [Fri, 4 Jul 2014 02:20:15 +0000 (02:20 +0000)]
Merge "Remove two TODOs from HotpulgDetectionAction."
Jungshik Jang [Fri, 4 Jul 2014 01:53:27 +0000 (10:53 +0900)]
Remove two TODOs from HotpulgDetectionAction.
Bug:
15844023
Bug:
15841646
Change-Id: I4022c48a9fdb1963f755895ec5ff0370157050c7
Jungshik Jang [Fri, 4 Jul 2014 01:00:59 +0000 (01:00 +0000)]
Merge "Prevent press&hold for non-repeatable keycode."
Jungshik Jang [Wed, 2 Jul 2014 08:32:22 +0000 (17:32 +0900)]
Prevent press&hold for non-repeatable keycode.
For non-repeat keys like power or mute key Hdmi-Cec
doesn't support press&hold feature. This change sends
user control pressed immediataly if the given keycode
is non-repeatable key.
Change-Id: Id571e67d94125a8c6a3553135b8e714b721405f3
Jungshik Jang [Fri, 4 Jul 2014 00:37:52 +0000 (00:37 +0000)]
Merge "Set source address for <Polling Message>"
Jungshik Jang [Thu, 3 Jul 2014 02:14:26 +0000 (11:14 +0900)]
Set source address for <Polling Message>
CEC spec mentions that logical address allocation uses
the same address for source and destination while <Polling Message>
uses device's source address.
Bug:
16045547
Change-Id: Id18f328755501c62a98a1040b287c180cb889c9b
Alan Viverette [Thu, 3 Jul 2014 00:30:35 +0000 (17:30 -0700)]
Update progress bar styling and labelFor attr type
BUG:
16045463
BUG:
15900514
BUG:
15936901
Change-Id: Ib84e78cd3110d36f49ea5d9fc76a4321132af9ab
Jeff Sharkey [Thu, 3 Jul 2014 01:36:07 +0000 (18:36 -0700)]
CleanSpec to fix build.
Change-Id: I3995214498d22fa1bdb82eb44cda2e5ca6ba02a4
Jeff Sharkey [Thu, 3 Jul 2014 01:35:33 +0000 (01:35 +0000)]
Merge "Fixing missing current api.txt related to CL/495976."
Tyler Gunn [Thu, 3 Jul 2014 01:32:54 +0000 (18:32 -0700)]
Fixing missing current api.txt related to CL/495976.
Bug:
16014224
Change-Id: Ib3b0b65caea194f458a4258a341c21d9898f24d9
Jungshik Jang [Thu, 26 Jun 2014 08:30:05 +0000 (17:30 +0900)]
Define force usage and category for System Audio Control.
This is to be sync with change of system/core/include/system/audio_policy.h
Change-Id: Ibd371197775fb70a96df6e3eef82ec8ae10b0508
Jungshik Jang [Thu, 3 Jul 2014 00:34:05 +0000 (09:34 +0900)]
Log unhandled message which has specific destination.
Broadcast message is unnecessary to log as broadcast message.
Bug:
16039302
Change-Id: Ifffc09b49bceaaf220ce929206eaecb78146016f
Jungshik Jang [Thu, 3 Jul 2014 01:26:14 +0000 (01:26 +0000)]
Merge "Add volume callback for Hdmi-Cec system audio mode."
Jungshik Jang [Mon, 30 Jun 2014 13:26:29 +0000 (22:26 +0900)]
Add volume callback for Hdmi-Cec system audio mode.
Hdmi-Cec's system audio mode delegates audio control to
audio receiver from tv. It requires to delegate
volume change including mute to audio receiver
instead of consuming by tv.
In order to do this this change introduces three apis.
One is added to IAudioService, the others are added
to IHdmiControlService as hidden apis.
1. IAudioService#setHdmiSystemAudioSupported;
This is to notify system audio mode change to audio
service so that it determines to notify volume or mute
change to HdmiControlService.
2. IHdmiControlService#setSystemAudioVolume;
This is to notify volume change to HdmiControlService.
It's called only where system audio mode is on.
3. IHdmiControlService#setSystemAudioMute;
This is to notify volume change to HdmiControlService .
It's called only where system audio mode is on.
Change-Id: I3d8534b37ddf1a812e32012059a8778772044bf0
Jose Lima [Thu, 3 Jul 2014 01:23:34 +0000 (01:23 +0000)]
Merge "Consume HOME key when it is used to dismiss Dream activity"
Jose Lima [Thu, 3 Jul 2014 00:21:51 +0000 (17:21 -0700)]
Consume HOME key when it is used to dismiss Dream activity
Bug:
15002352
Change-Id: I0e86ec62a1a45dd1e68752d36be07355a9c6e2fd
Jean-Michel Trivi [Wed, 2 Jul 2014 16:24:36 +0000 (09:24 -0700)]
Send media button events with FLAG_RECEIVER_FOREGROUND set
bug
11357318
Change-Id: Iccd000bebb31a2f6cb057e97d3ab276861d0b651
Jinsuk Kim [Fri, 4 Jul 2014 02:24:30 +0000 (02:24 +0000)]
Merge "Implement some apis for TV Input Framework and HdmiControlService"
Jinsuk Kim [Tue, 1 Jul 2014 23:29:26 +0000 (08:29 +0900)]
Implement some apis for TV Input Framework and HdmiControlService
- setInputChangeListener()
- getInputDevices()
Change-Id: I6f7d6d9c7094018e2b6b5ba37f63c8ee5df00e37
Jorim Jaggi [Fri, 4 Jul 2014 00:05:57 +0000 (00:05 +0000)]
Merge "Pressing back when QS is open only collapses QS"
Jorim Jaggi [Thu, 3 Jul 2014 22:02:42 +0000 (00:02 +0200)]
Pressing back when QS is open only collapses QS
Bug:
15856079
Change-Id: Ic4853cbb6569ecbd779d470e0b6911199e6bf09b
Ye Wen [Thu, 3 Jul 2014 21:04:34 +0000 (14:04 -0700)]
Support MMS send/download by carrier app (1/3)
Added send/download status update APIs similar to that for SMS
b/
14095333
Change-Id: Ib62951a2088330bf004383945416ff6f25b28625
Alan Viverette [Fri, 4 Jul 2014 01:58:48 +0000 (01:58 +0000)]
Merge "Make optical insets actually work"
Alan Viverette [Thu, 3 Jul 2014 22:16:41 +0000 (15:16 -0700)]
Make optical insets actually work
Change-Id: I9fabf4cb939cc7a868f95580e7229745acde0418
Yuncheol Heo [Fri, 4 Jul 2014 01:47:37 +0000 (01:47 +0000)]
Merge "Handle the power state change."
Yuncheol Heo [Tue, 1 Jul 2014 05:15:14 +0000 (14:15 +0900)]
Handle the power state change.
- Add BrocastIntent listener to catch SCREEN_ON/OFF intents.
- Add callbacks onTransitionToStandBy(), onStandBy() in HdmiCecLocalDevice.java.
- When it gets the SCREEN_OFF intent, the state will be TRANSITION_TO_STANDBY,
then when there is no outstanding actions, the state will be STANDBY.
- When the state is STANDBY, the TV device will broadcast <StandBy>.
- When it gets the SCREEN_ON intent, the state will be TRANSITION_TO_ON,
then when the initialization is done, the state will be ON.
- When the state is ON and it receives <StandBy> CEC message, it will force
the system to go to sleep.
- When the state is STANDBY and it receives the cec messages to wake-up the
system, it will force the system to wake up from sleep.
- Manage the active source state for the playback device.
Change-Id: Ib473219a0b0deb5224df89386db5a83720000411
Jae Seo [Wed, 2 Jul 2014 20:45:46 +0000 (20:45 +0000)]
Merge "TvContract: Add a field for network affiliation to the Channels table"
Tao Bai [Tue, 1 Jul 2014 19:39:54 +0000 (12:39 -0700)]
Enable new geolocation permission API.
BUG:
14668406
Change-Id: I9500154d14eceae0248eb3718de27fc33fef4f28
Jae Seo [Tue, 1 Jul 2014 21:33:11 +0000 (14:33 -0700)]
TvContract: Add a field for network affiliation to the Channels table
This is used to identify a channel that is commonly called by its
network affiliation instead of the display name.
Bug:
15993156
Change-Id: Ib5a15e0e44e815c98b762573b5a24289a86f9583
Ihab Awad [Wed, 2 Jul 2014 19:55:51 +0000 (19:55 +0000)]
Merge "Rename Telecomm "Subscription" to "Account" (1/7)"
Ihab Awad [Tue, 1 Jul 2014 04:17:13 +0000 (21:17 -0700)]
Rename Telecomm "Subscription" to "Account" (1/7)
Change-Id: Ieb29f6ba9dadacb2c7e26969a47141e11a339a40
Conflicts:
telecomm/java/android/telecomm/InCallCall.java
Jeff Sharkey [Thu, 3 Jul 2014 02:08:47 +0000 (02:08 +0000)]
Merge "Slow progress towards APK clusters."
Jeff Sharkey [Thu, 19 Jun 2014 00:46:05 +0000 (17:46 -0700)]
Slow progress towards APK clusters.
Differentiate between "split APKs" and "cluster packages". A cluster
package is a directory containing zero or more APKs (base+splits),
and a monolithic package is a single APK (base).
PackageSetting will use the directory name as its codePath, so track
the baseCodePath separately. Clarify documentation in several
places.
Require that all installers provide file:// URIs through existing
hidden APIs; PackageInstaller hasn't been able to read content://
URIs for a long time.
Bug:
14975160
Change-Id: I1c6fed1b55205c2474b09871161a98a26669d22e
Alan Viverette [Thu, 3 Jul 2014 00:06:26 +0000 (00:06 +0000)]
Merge "Update dropdown background asset"
Alan Viverette [Wed, 2 Jul 2014 23:52:01 +0000 (16:52 -0700)]
Update dropdown background asset
BUG:
15985882
Change-Id: I9f271bf99371516bce5bad3e1c3f0efbedc8ffdd
Prerepa Viswanadham [Wed, 2 Jul 2014 19:30:38 +0000 (12:30 -0700)]
Obtain capabilities from chipset for it's support of various features
Change-Id: I01bdb31136be63e4e46fb4e054c902eddc5647ab
Igor Murashkin [Wed, 2 Jul 2014 23:50:02 +0000 (23:50 +0000)]
Merge "camera2: Add crop region support and some other AE tags to legacy"
Igor Murashkin [Wed, 2 Jul 2014 01:06:13 +0000 (18:06 -0700)]
camera2: Add crop region support and some other AE tags to legacy
Change-Id: If7a87b210a57ea13d6329bb363b1c7ecdadc52e8
Winson Chung [Thu, 3 Jul 2014 22:56:42 +0000 (22:56 +0000)]
Merge "Fixing regression in search bar not appearing after clearing all your tasks and creating new ones."
Winson Chung [Thu, 3 Jul 2014 22:54:02 +0000 (15:54 -0700)]
Fixing regression in search bar not appearing after clearing all your tasks and creating new ones.
Winson Chung [Thu, 3 Jul 2014 20:38:01 +0000 (13:38 -0700)]
Bug fixes and cleanup
- Don't reinflate the search bar view every time you return to recents
- Fixing an issue where the default thumbnail was not being used when querying the thumbnail cache (thought WM still seems to not be giving us screenshots in many cases)
- Fixing an issue where an invisible header bar color was used instead of the default header bar color
- Fixing an issue where swipe-to-dismiss logic was running before the animation back into place
- Using outline clipping instead of doing it ourselves for the rounded TaskView
- Small optimization in finding the visible range
- Renaming some of the callbacks to make them more clear
- Removing some unused code
Christoph Studer [Thu, 3 Jul 2014 22:24:34 +0000 (22:24 +0000)]
Merge "NoMan: Allow notifications to transition !ZEN -> ZEN"
Christoph Studer [Thu, 3 Jul 2014 15:47:58 +0000 (17:47 +0200)]
NoMan: Allow notifications to transition !ZEN -> ZEN
Bug:
15979100
Change-Id: Ifd620caf2e00f8cd3d9f1458b93585a454af4b74
Marcin Kosiba [Tue, 17 Jun 2014 15:21:03 +0000 (16:21 +0100)]
Preload the WebView package into all applications.
This is a temporary workaround to allow the WebView to move into
an APK.
BUG:
11505352
Change-Id: I0c446d44c3f94f70bced7f471ae6fb74f65d5ff9
Christoph Studer [Wed, 2 Jul 2014 22:23:05 +0000 (00:23 +0200)]
Fix 'stuck notification' bug
Apply implied flags before notifying listeners.
Bug:
15589158
Change-Id: Ie1c7374fa562ff62725361fb0dc8b0d1a6725618
Narayan Kamath [Thu, 3 Jul 2014 11:49:46 +0000 (11:49 +0000)]
Merge "Revert "Enforce USB and storage restrictions""
Narayan Kamath [Thu, 3 Jul 2014 11:45:56 +0000 (11:45 +0000)]
Revert "Enforce USB and storage restrictions"
This reverts commit
39e53714ede48fcb464733834d7d9ccb868efe8a.
Change-Id: I81199fea8ca4b48516792bb02c1c3e90e5916c1f
Selim Cinek [Wed, 2 Jul 2014 20:12:47 +0000 (22:12 +0200)]
Made notifications below speedbump grey.
Also fixed a small scrimming bug where headsup where
scrimmed.
Bug:
15408642
Change-Id: I8319ccb001a1d654af055276de3c64ae388a7e47
Selim Cinek [Wed, 2 Jul 2014 17:40:30 +0000 (19:40 +0200)]
Refactored the notification backgrounds
The background now only uses one specific drawable and emulating
the legacy behaviour by tinting. Notification backrounds are now
also a ripple drawable, giving feedback on click.
Bug:
15837646
Change-Id: Ia3b7dafebe2439cc56ed258264ef33b5b07faa69
Emily Bernier [Thu, 3 Jul 2014 11:07:38 +0000 (11:07 +0000)]
Merge "Enforce USB and storage restrictions"
Brian Duff [Thu, 3 Jul 2014 09:49:24 +0000 (09:49 +0000)]
am
51d70ce9: am
c542745e: am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
51d70ce9b8dbbcb7f354c87b722efe84b2a62a28':
Fix a typo in NumberPicker javadoc.
Brian Duff [Thu, 3 Jul 2014 09:43:56 +0000 (09:43 +0000)]
am
c542745e: am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
c542745e23fe9d2e71c1f607d66f5570f585133d':
Fix a typo in NumberPicker javadoc.
Brian Duff [Thu, 3 Jul 2014 06:45:04 +0000 (06:45 +0000)]
am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
Fix a typo in NumberPicker javadoc.
Jason Sams [Wed, 2 Jul 2014 21:32:05 +0000 (14:32 -0700)]
Resolve conflicts with AOSP.
Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d
Brian Duff [Thu, 3 Jul 2014 06:05:07 +0000 (06:05 +0000)]
Merge "Fix a typo in NumberPicker javadoc."
Jorim Jaggi [Thu, 3 Jul 2014 21:35:37 +0000 (21:35 +0000)]
Merge "Disable flexy straw when in QS"
Jorim Jaggi [Thu, 3 Jul 2014 21:34:13 +0000 (23:34 +0200)]
Disable flexy straw when in QS
Change-Id: Ic6c7834512c3cc96e3e6956008727312ea1f2423
Jorim Jaggi [Thu, 3 Jul 2014 16:30:40 +0000 (18:30 +0200)]
Quick settings improvements
- Remove hole in landscape when no notifications are shown.
- Start intercepting touch events directly when already flinging.
- Fix jump in top panel when collapsing QS in landscape.
Change-Id: If2da5215ee20ea1b0d3a0f88f32c8f5b0dd147da
Jorim Jaggi [Wed, 2 Jul 2014 22:40:09 +0000 (00:40 +0200)]
Reenable touches to notifications in expanded QS
Revert "Closing the QS when tapping on the notifications now."
This reverts commit
3bb0bb8817690728a40edd3f8f665b09907a451b.
Revert "Disabled touch interaction when in Quick settings."
This reverts commit
5cd19bc6a4fac0513bb285fdaf08b1d19c87f4ae.
Also, shuffle order of notifications and quick settings such that
scrolling still works and delegate touches from stack scroller to
the scroll view for expanded QS panel.
In addition, make the panel close transition work when QS is expanded
and scrolled.
Last but not least, decrease scrim amount so the notifications still
look 100% interactive.
Change-Id: I17710e078cff84bcdf303c22986a31135dae2aee
Jorim Jaggi [Tue, 1 Jul 2014 21:34:41 +0000 (23:34 +0200)]
Implement nice motion for collapsing panel while QS open
Also remove the delay for actions which close the panel. Delaying is
no longer necessary as you still see the touch feedback when the
panel is closed.
Change-Id: I0dffae6998fc41b1590cb182667323f40be3a7d5
Jorim Jaggi [Thu, 3 Jul 2014 20:51:20 +0000 (20:51 +0000)]
Merge "Quick settings improvements"
Jessica Hummel [Thu, 3 Jul 2014 14:07:18 +0000 (14:07 +0000)]
Merge "Remove unused action from DevicePolicyManager."
Jessica Hummel [Thu, 26 Jun 2014 11:55:38 +0000 (12:55 +0100)]
Remove unused action from DevicePolicyManager.
This is part of a simplification to cut out one communication with mdm apps.
Change-Id: I7d0067928c20387dca8fcc45a7bc48d9d158fa2c
Winson Chung [Thu, 3 Jul 2014 20:41:54 +0000 (20:41 +0000)]
Merge "Bug fixes and cleanup"
John Spurlock [Thu, 3 Jul 2014 16:32:37 +0000 (16:32 +0000)]
Merge "QS: Wifi control panel."
John Spurlock [Wed, 2 Jul 2014 22:54:17 +0000 (18:54 -0400)]
QS: Wifi control panel.
Create first example of an inline detail view with line
items, bind to new access-point controller.
Move the common bits of all control panels into a
common abstraction. Share common parts of layout
(More settings / done button).
Change-Id: I14a1bf548f3291dc628f97bf09dd4e38ac2fb2dc
Jean-Michel Trivi [Thu, 3 Jul 2014 16:27:54 +0000 (16:27 +0000)]
Merge "AudioDevice class to expose concept of device in SDK"
Jean-Michel Trivi [Fri, 27 Jun 2014 16:03:56 +0000 (09:03 -0700)]
AudioDevice class to expose concept of device in SDK
Change-Id: I94c87e98061581a767d775f64dd6bd9a1f9956e1
Christoph Studer [Thu, 3 Jul 2014 15:54:42 +0000 (15:54 +0000)]
Merge "Inline replace notification views when layout changes"
Christoph Studer [Fri, 27 Jun 2014 17:32:44 +0000 (19:32 +0200)]
Inline replace notification views when layout changes
Instead of going through a full remove / add when a notification
is updated with a different layout, only re-inflate the inner views.
Bug:
15869868
Change-Id: Ie18c431e7b3e2a6209d4a9b6418b3150781a063f
Ihab Awad [Wed, 2 Jul 2014 21:24:26 +0000 (21:24 +0000)]
Merge "Fix references to two constants"
Ihab Awad [Wed, 2 Jul 2014 20:51:50 +0000 (13:51 -0700)]
Fix references to two constants
The names of two constants missed getting updated in a previous CL,
causing a build breakage.
Change-Id: I2a87f6b3aead2c6b751afedf32a321c8290b51be
Santos Cordon [Wed, 2 Jul 2014 23:40:51 +0000 (23:40 +0000)]
Merge "Move cancelMissedCallsNotification to PhoneManager."
Santos Cordon [Wed, 2 Jul 2014 20:20:40 +0000 (13:20 -0700)]
Move cancelMissedCallsNotification to PhoneManager.
Change-Id: I2ce26e77ef1f0acc11552bf28efc039391e09766
Craig Mautner [Wed, 2 Jul 2014 23:33:09 +0000 (23:33 +0000)]
Merge "Use cached thumbnails in Recent tasks."
Tyler Gunn [Wed, 2 Jul 2014 23:28:30 +0000 (16:28 -0700)]
Adding "start call with video" extra for ACTION_CALL intent.
Bug:
16014224
Change-Id: I6240b50383de60fbe9038b247856227c6c278b85
Craig Mautner [Tue, 1 Jul 2014 19:38:52 +0000 (12:38 -0700)]
Use cached thumbnails in Recent tasks.
The thumbnail returned from ActivityManager.getTaskThumbnail() now
contains either a Bitmap or a ParcelFileDescriptor that points to
a file containing a compressed Bitmap. The Recent tasks list is
now responsible for all thumbnail Bitmap caching as the activity
manager keeps only the most recent 5. This also permits low memory
devices to have many more tasks in the Recent tasks list.
As part of this CL the concept of subtasks is removed eliminating
code supporting the TaskAccessInfo and IThumbnailRetriever classes.
Fixes bug
15828934.
Change-Id: I0fd0320a1a04e3c78d79357899b83a2fff97abf2
Jason Sams [Wed, 2 Jul 2014 23:19:27 +0000 (23:19 +0000)]
am
24bea6a3: Resolve conflicts with AOSP.
* commit '
24bea6a3ef53733ffd1622dfa0bdaeea0a74303a':
Resolve conflicts with AOSP.
Baligh Uddin [Wed, 2 Jul 2014 23:19:22 +0000 (23:19 +0000)]
am
ed61958a: (-s ours) am
e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
ed61958a254deb6299b907ecb079ebe15da339c3':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Jul 2014 23:19:16 +0000 (23:19 +0000)]
am
0bd94e4b: (-s ours) am
48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
0bd94e4b7a5f490dac0090db931bef0f60121cf9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Jul 2014 23:19:12 +0000 (23:19 +0000)]
am
066fb41f: (-s ours) am
caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
066fb41fc74419d321f385f9d641c014efb474ae':
Import translations. DO NOT MERGE
Martijn Coenen [Wed, 2 Jul 2014 23:40:08 +0000 (23:40 +0000)]
Merge "Add API to query for AID prefix support."
Martijn Coenen [Wed, 2 Jul 2014 23:30:06 +0000 (16:30 -0700)]
Add API to query for AID prefix support.
For future devices which may support
registering AID prefixes. Get the API in for now,
the actual implementation is pretty simple and
will follow later.
Change-Id: I6c16dae9a4dbc0f9cd84bdb61a4de93cffd278ec
Martijn Coenen [Wed, 2 Jul 2014 20:58:42 +0000 (13:58 -0700)]
Clean up dynamic AID XML parser.
<aid-group> should be generated and parsed
in its own object.
Change-Id: I70f4511a682c66f8d11b7797a0f171cda24cc617
Martijn Coenen [Wed, 2 Jul 2014 19:44:33 +0000 (12:44 -0700)]
Move AID validation to CardEmulation.
More logical place since it's a generic utility
function.
Change-Id: I3381f10d6720e415d091dbd475ef0df8733e7e75
Alan Viverette [Wed, 2 Jul 2014 23:14:19 +0000 (23:14 +0000)]
Merge "Add style for SearchView"
Nick Kralevich [Wed, 2 Jul 2014 23:06:47 +0000 (16:06 -0700)]
resolved conflicts for merge of
dbbc0706 to master
Change-Id: I3b4e442988021d5ac569cb06682bc1355edbb430
Alan Viverette [Wed, 2 Jul 2014 22:46:04 +0000 (15:46 -0700)]
Add style for SearchView
BUG:
6420978
Change-Id: I31d9f7e66c2404388ccbe6d2e43a005deb0b7c25