OSDN Git Service
George Mount [Wed, 3 Sep 2014 19:35:09 +0000 (12:35 -0700)]
"Back" with translucent window now sets ActivityOptions.
Also made convertToTranslucent set the canvas opacity.
Bug
16215650
Change-Id: Id4325eaed34cda1269d874f239aeb5f6f82c959f
Svet Ganov [Tue, 2 Sep 2014 17:43:17 +0000 (17:43 +0000)]
Merge "Magnification bounds not always animated on a looper thread." into lmp-dev
Jorim Jaggi [Tue, 2 Sep 2014 17:43:10 +0000 (17:43 +0000)]
Merge "Use separate icon group for signal/battery in QS header" into lmp-dev
Jorim Jaggi [Tue, 2 Sep 2014 13:55:57 +0000 (15:55 +0200)]
Use separate icon group for signal/battery in QS header
This reverts the terrible hack that reattaches the system icons when
expanding QS. This primarily fixes that the alpha of the icons was
wrong when closing the shade, but also fixes flickering when expanding
the shade.
Bug:
17338013
Change-Id: Ifcbe03eca43ed7639059734e23d740c1b8a7a9de
Tyler Gunn [Tue, 2 Sep 2014 17:31:38 +0000 (17:31 +0000)]
Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
Dianne Hackborn [Tue, 2 Sep 2014 17:30:48 +0000 (17:30 +0000)]
Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
Dianne Hackborn [Sat, 30 Aug 2014 00:32:04 +0000 (17:32 -0700)]
Hide the interaction part of VoiceInteractionService.
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.
Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
Ronghua Wu [Tue, 2 Sep 2014 17:27:25 +0000 (17:27 +0000)]
Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev
Yorke Lee [Tue, 2 Sep 2014 17:24:54 +0000 (17:24 +0000)]
Merge "Add lookup key to callerInfo" into lmp-dev
Amith Yamasani [Tue, 2 Sep 2014 17:21:57 +0000 (17:21 +0000)]
Merge "Make it possible to remove current user" into lmp-dev
RoboErik [Tue, 2 Sep 2014 16:58:29 +0000 (16:58 +0000)]
Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev
Jae Seo [Tue, 2 Sep 2014 16:20:22 +0000 (16:20 +0000)]
Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev
Jae Seo [Tue, 2 Sep 2014 16:20:09 +0000 (16:20 +0000)]
Merge "TIF: Fix the Singapore content ratings" into lmp-dev
George Mount [Tue, 2 Sep 2014 16:20:05 +0000 (16:20 +0000)]
Merge "Update window always on convertTo/FromTranslucent" into lmp-dev
ztenghui [Tue, 2 Sep 2014 16:17:00 +0000 (16:17 +0000)]
Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev
Sungsoo Lim [Tue, 2 Sep 2014 16:16:01 +0000 (16:16 +0000)]
Merge "Do not show the input icon when it's not available." into lmp-dev
Sungsoo Lim [Tue, 2 Sep 2014 00:12:05 +0000 (17:12 -0700)]
Do not show the input icon when it's not available.
Bug:
17335230
Change-Id: Icb84949ed55f22bb384df9ed4bbfe3d86949c301
Robin Lee [Tue, 2 Sep 2014 15:51:50 +0000 (15:51 +0000)]
Merge "Delete locksettings files for toplevel users only" into lmp-dev
Tyler Gunn [Tue, 2 Sep 2014 15:39:35 +0000 (08:39 -0700)]
Remove "ask each time" SIP call setting. (1/2)
1. Removed setting from Settings.System class.
2. Added settings database migration step to change "SIP_ASK_ME_EACH_TIME"
to "SIP_ADDRESS_ONLY" as the "ask me each time" option no longer makes
sense given the new phone accounts settings.
Bug:
17321422
Change-Id: I3df1be4fcda44f2097c49af44508ac1fce72a24b
Selim Cinek [Tue, 2 Sep 2014 15:37:05 +0000 (15:37 +0000)]
Merge "Fixed a bug in the notification touch selection." into lmp-dev
Christoph Studer [Tue, 2 Sep 2014 15:22:15 +0000 (15:22 +0000)]
Merge "SysUI: Ignore group children when summary is present" into lmp-dev
Robin Lee [Mon, 1 Sep 2014 15:52:47 +0000 (16:52 +0100)]
Delete locksettings files for toplevel users only
Fixes an issue created by change:
I7941707ca66ac25bd122fd22e5e0f639e7af697e
Bug:
16233206
Change-Id: Ia905d153e94303acd611178333adc77c68933711
Jorim Jaggi [Tue, 2 Sep 2014 15:07:36 +0000 (15:07 +0000)]
Merge "Fix expanded notifications on lockscreen" into lmp-dev
Jorim Jaggi [Tue, 2 Sep 2014 14:31:19 +0000 (16:31 +0200)]
Fix expanded notifications on lockscreen
Bug:
17340086
Change-Id: I388f859cea1ad5daf195590512ee684e88b9299c
Selim Cinek [Tue, 2 Sep 2014 11:46:00 +0000 (13:46 +0200)]
Fixed a bug in the notification touch selection.
This lead to the wrong notification being selected and
therefore the longpress listener would not be triggered.
Also added some logging for cases where the longpress
listener would not fire.
Bug:
17332879
Change-Id: I9a5cd9bfe3108ca3e366711d34d1e218f1d520cf
Selim Cinek [Tue, 2 Sep 2014 11:48:27 +0000 (11:48 +0000)]
Merge "Fixed crash with notification guts" into lmp-dev
Selim Cinek [Tue, 2 Sep 2014 11:47:46 +0000 (11:47 +0000)]
Merge "Fixed LTR and RTL naming confusion in navigation bar" into lmp-dev
Selim Cinek [Tue, 2 Sep 2014 10:51:31 +0000 (12:51 +0200)]
Fixed crash with notification guts
Bug:
17350166
Change-Id: I4b5eb19b30e57486f48fa8c397e7450426f36464
Christoph Studer [Tue, 2 Sep 2014 09:49:19 +0000 (11:49 +0200)]
SysUI: Ignore group children when summary is present
This is an optimization to avoid inflating Views for notifications
we're not going to show and free up memory ASAP. No behavioral changes
expected.
Bug:
16302692
Change-Id: I5fa03dcc9ad9cae4afc7cd6102d7ea8bfbdcbfd5
Jae Seo [Tue, 2 Sep 2014 07:30:01 +0000 (00:30 -0700)]
TIF: Fix the Singapore content ratings
It is not that Singapore has two different rating systems. There is just one
rating system from Board of Film Censors but each broadcaster uses a different
subset of ratings. For example, Free-To-Air uses PG and PG13 while Pay TV uses
NC16 and M18 ratings in addition to the PG and PG13.
Bug:
17330613
Change-Id: I5a5e47706e7415f13a5e7dc9c00cc2c3c3763965
Jae Seo [Tue, 2 Sep 2014 06:49:00 +0000 (23:49 -0700)]
TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
Bug:
17331873
Change-Id: Idabeb056ae2105125174d7392dbe4fae614752fc
Yuncheol Heo [Tue, 2 Sep 2014 05:59:15 +0000 (14:59 +0900)]
Disable the debug flag in HdmiLogger.
The flag was enabled by mistake in the previous CL.
And this can cause the log-spam on HdmiCec.
Change-Id: Ie705eba8718e9dfe1750726278b6dce6bd872eb9
Yuncheol Heo [Tue, 2 Sep 2014 04:57:30 +0000 (04:57 +0000)]
Merge "Reallocate the logical address on the hotplug event." into lmp-dev
Wonsik Kim [Tue, 2 Sep 2014 02:52:44 +0000 (02:52 +0000)]
Merge "TIF: add SystemApi's for ITvInputHardware related methods" into lmp-dev
Wonsik Kim [Mon, 1 Sep 2014 02:52:28 +0000 (11:52 +0900)]
TIF: add SystemApi's for ITvInputHardware related methods
Bug:
17322530
Change-Id: I813d865bc9a77d1d381e52188afac5c5c75a2968
Yuncheol Heo [Tue, 2 Sep 2014 01:36:04 +0000 (10:36 +0900)]
Reallocate the logical address on the hotplug event.
Bug:
17337451
Change-Id: I4117638e96c64eabd64edfef3359a0f12cf110f6
Jinsuk Kim [Tue, 2 Sep 2014 02:27:22 +0000 (02:27 +0000)]
Merge "CEC: Fixes bugs in routing control" into lmp-dev
Svet Ganov [Tue, 2 Sep 2014 02:06:33 +0000 (19:06 -0700)]
Magnification bounds not always animated on a looper thread.
In display manigfication mode we are showing a frame around the
magnified region. Showing and hiding this frame is animated. In
some cases the code calling into the display magnifier is not
running on a looper thread which leads to a crash when interacting
with the property animator. Now the animation is explicitly handled
in a dedicated handler that runs on the window manager's handler
looper thread.
bug:
15506701
Change-Id: I3fada775c9fac8820599dd31ac80720021c70cb3
Baligh Uddin [Tue, 2 Sep 2014 02:06:59 +0000 (02:06 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Tue, 2 Sep 2014 02:06:50 +0000 (02:06 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Jinsuk Kim [Tue, 2 Sep 2014 01:30:10 +0000 (10:30 +0900)]
CEC: Fixes bugs in routing control
1) HdmiControlService#inInDeviceList was passed the parameters in
a wrong order. Fixed here. Turned the method to private as well.
2) Passed path not port to Routing control when handling active
path removal to update the active path correctly.
3) adb dumpsys hdmi_control outputs the status of the connected
CEC devices for debugging.
Bug:
17344892
Bug:
17346869
Change-Id: I289d980a2534a6159b12286dd43f159e1b4134d4
Baligh Uddin [Tue, 2 Sep 2014 00:49:05 +0000 (17:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2b9e0d60ed4cba16ad90621dafd7c41ad377f76
Auto-generated-cl: translation import
Baligh Uddin [Tue, 2 Sep 2014 00:29:48 +0000 (17:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7fab5997699dba037e40150ea6484993efe6577f
Auto-generated-cl: translation import
ztenghui [Tue, 2 Sep 2014 00:19:51 +0000 (17:19 -0700)]
Fix the (0,0) vector case for extra vertices computation
TODO: Figure out why we have collided vertices from input polygon.
b/
17340792
Change-Id: I6636ff957ef17514bd11cf290ccc0a2c302aca0b
Winson Chung [Mon, 1 Sep 2014 23:58:23 +0000 (16:58 -0700)]
Fixing build (adding missing animations).
Winson Chung [Fri, 29 Aug 2014 03:57:16 +0000 (20:57 -0700)]
Providing a more seamless transition to Home (Bug.
17012456)
- Fixing landscape N7 transition issue
Change-Id: I968d6fd4db693359d520664b1444e699d7ee30ee
Christoph Studer [Mon, 1 Sep 2014 21:55:08 +0000 (21:55 +0000)]
Merge "NoMan: Disable SQLite stats DO NOT MERGE" into lmp-dev
Selim Cinek [Mon, 1 Sep 2014 21:53:43 +0000 (23:53 +0200)]
Fixed LTR and RTL naming confusion in navigation bar
Bug:
15280748
Change-Id: Ibc985374b8c4e6787abd80324add1213c9db727e
Selim Cinek [Mon, 1 Sep 2014 21:30:31 +0000 (21:30 +0000)]
Merge "Fixed a bug with the appear animation of the notifications" into lmp-dev
Selim Cinek [Mon, 1 Sep 2014 21:30:20 +0000 (21:30 +0000)]
Merge "Stabilized the animation when going back from the locked shade" into lmp-dev
Baligh Uddin [Mon, 1 Sep 2014 21:25:59 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 1 Sep 2014 21:25:57 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 1 Sep 2014 21:25:56 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 1 Sep 2014 21:25:42 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 1 Sep 2014 21:25:38 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Selim Cinek [Mon, 1 Sep 2014 21:08:39 +0000 (23:08 +0200)]
Fixed a bug with the appear animation of the notifications
Bug:
17346264
Change-Id: I0c830c1661342eb0885da5e8dec385d0775f146b
Selim Cinek [Mon, 1 Sep 2014 20:33:25 +0000 (22:33 +0200)]
Stabilized the animation when going back from the locked shade
Now, independant of the notifications the shade correctly animates
back from the shade locked when clicking on the bottom.
Bug:
17345758
Change-Id: I40f6cc65d4ceb4357f648192287c08acddffdcd9
Adrian Roos [Mon, 1 Sep 2014 21:13:11 +0000 (21:13 +0000)]
Merge "Trust: Look at the security unlock method of the right user" into lmp-dev
Adrian Roos [Mon, 1 Sep 2014 14:24:32 +0000 (16:24 +0200)]
Trust: Look at the security unlock method of the right user
Follow up to Ic9e93862c722ebc529f5b2010b9cea941f569ce7.
Bug:
17107213
Change-Id: I8f3c19aedeaca3f265c98a4fb60ab74b115fca47
Selim Cinek [Mon, 1 Sep 2014 19:40:07 +0000 (19:40 +0000)]
Merge "Fixed several bugs where the dismissview was not reachable." into lmp-dev
Christoph Studer [Mon, 1 Sep 2014 19:26:55 +0000 (19:26 +0000)]
Merge "Notification: Reset view params for re-use" into lmp-dev
Selim Cinek [Mon, 1 Sep 2014 17:41:54 +0000 (19:41 +0200)]
Fixed several bugs where the dismissview was not reachable.
Also fixes a bug where the maxExpandHeight was not correctly updated
and where notifications were wrongfully generated.
Finally it fixes an issue where initially the height of the panel was
not correct.
Bug:
17096130
Change-Id: I0f4a05187f31eef5cbbe364bfceb8806b5092cdf
Selim Cinek [Mon, 1 Sep 2014 19:16:23 +0000 (19:16 +0000)]
Merge "Notification guts have now the actualHeight of the notifications" into lmp-dev
Selim Cinek [Mon, 1 Sep 2014 13:11:28 +0000 (15:11 +0200)]
Notification guts have now the actualHeight of the notifications
Before it just had the height of the notification leading to bugs
in cornercases during animations and swiping.
Also updated to colors to use system colors.
Bug:
17333457
Change-Id: I00d87820595a789006632c582e8c35759a61969d
Christoph Studer [Mon, 1 Sep 2014 16:21:18 +0000 (18:21 +0200)]
Notification: Reset view params for re-use
Since RemoteViews are reapplied in SysUI, reset potentially
modified view params before configuring it.
Bug:
17175860
Change-Id: I0eceb1522461f8302e69af1a995a8d036951d1ed
Jorim Jaggi [Mon, 1 Sep 2014 15:13:36 +0000 (17:13 +0200)]
Fix clipped off text on second line for QS tiles
Bug:
16480978
Change-Id: I401845fc888c5a0263ba60f486db91f75f285935
Jorim Jaggi [Mon, 1 Sep 2014 15:52:01 +0000 (15:52 +0000)]
Merge "Media notification updates" into lmp-dev
Jorim Jaggi [Fri, 29 Aug 2014 01:47:31 +0000 (03:47 +0200)]
Media notification updates
- Make text white.
- Adjust padding & metrics to redlines.
- Use different narrow layout when 3 or less notifications with big
picture.
- Update action ripples.
- Fix progress bar size & fix color for indeterminate progress bar.
- Apply default background in SystemUI when no color is set, so we
don't end up with white text on white background.
Bug:
15437369
Bug:
16625746
Bug:
15147533
Change-Id: Ie8bd5ad0bbca972685adb50034fff88ea97456bd
Jorim Jaggi [Mon, 1 Sep 2014 14:54:20 +0000 (14:54 +0000)]
Merge "Fix RTL handling for Keyguard affordances" into lmp-dev
Adrian Roos [Mon, 1 Sep 2014 14:46:24 +0000 (14:46 +0000)]
Merge "Keyguard: Register user specific broadcasts correctly" into lmp-dev
Jorim Jaggi [Mon, 1 Sep 2014 14:44:08 +0000 (16:44 +0200)]
Fix RTL handling for Keyguard affordances
Bug:
17328362
Change-Id: Ieb076c46379085e043b0c16755355d4c3018bd7d
Yohei Yukawa [Mon, 1 Sep 2014 14:31:53 +0000 (14:31 +0000)]
Merge "Get rid of one redundant comparison of #mComposingTextStart" into lmp-dev
Adrian Roos [Mon, 1 Sep 2014 12:59:23 +0000 (14:59 +0200)]
Keyguard: Register user specific broadcasts correctly
Fixes the face unlock indicator only working for the
owner user. While we're at it, also fix other broadcasts
that should have been registered for all users and not just
the owner.
Bug:
17251445
Change-Id: I53cad656d7d1e1d312bff2eebfc0c23ea467e0b7
Selim Cinek [Mon, 1 Sep 2014 11:08:08 +0000 (11:08 +0000)]
Merge "Not enforcing a timeout anymore for talkback users" into lmp-dev
Christoph Studer [Mon, 1 Sep 2014 09:23:26 +0000 (11:23 +0200)]
NoMan: Disable SQLite stats DO NOT MERGE
Bug:
16777910
Change-Id: I3df8a147e07bf088420769d86bfb766885488506
Wonsik Kim [Mon, 1 Sep 2014 04:32:55 +0000 (04:32 +0000)]
Merge "Bind hardware TIS at startup" into lmp-dev
Ji-Hwan Lee [Mon, 1 Sep 2014 04:03:42 +0000 (04:03 +0000)]
Merge "Add missing checks for the current session callback" into lmp-dev
Yohei Yukawa [Mon, 1 Sep 2014 01:29:37 +0000 (18:29 -0700)]
Get rid of one redundant comparison of #mComposingTextStart
The code in question is not only redundant but also
harmful because it causes unnecessary integer boxing.
BUG:
17340578
Change-Id: Ife6e48889db80394d224297c53806105dc41d56e
Yohei Yukawa [Mon, 1 Sep 2014 00:32:55 +0000 (00:32 +0000)]
Merge "Fix illegal cast in a logging code" into lmp-dev
Baligh Uddin [Sun, 31 Aug 2014 23:22:33 +0000 (16:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d7de91479115c83cfca807b873e091985ad2ede
Auto-generated-cl: translation import
Baligh Uddin [Sun, 31 Aug 2014 23:14:23 +0000 (16:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ecd4e329e123af0ddd9c9eb9a2179adcdd86f96
Auto-generated-cl: translation import
Yohei Yukawa [Sun, 31 Aug 2014 23:10:05 +0000 (16:10 -0700)]
Fix illegal cast in a logging code
This is a follow up CL for I19ad8542659bc092b92ee13eb9,
which introduced a ClassCastException error in the logging code
of MSG_SET_USER_ACTION_NOTIFICATION_SEQUENCE_NUMBER handler.
With this CL, the protocol in question looks like:
- what: MSG_SET_USER_ACTION_NOTIFICATION_SEQUENCE_NUMBER
- arg1: sequence number to be passed to
#setUserActionNotificationSequenceNumber(int)
- arg2: not used
- obj: ClientState
BUG:
16238154
BUG:
7043015
Change-Id: I08d52d4564bae9e042a2eff359e92549a66e837b
Baligh Uddin [Sun, 31 Aug 2014 23:08:05 +0000 (16:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib3a6af2658ae965d3890b3750a44f3a3ea505742
Auto-generated-cl: translation import
George Mount [Sun, 31 Aug 2014 22:52:42 +0000 (22:52 +0000)]
Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev
George Mount [Sun, 31 Aug 2014 22:17:44 +0000 (22:17 +0000)]
Merge "Use optimized Keyframes for Path animations." into lmp-dev
Baligh Uddin [Sun, 31 Aug 2014 20:39:48 +0000 (13:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2e8d61b219485d45e8446750dc0b416a6e58a453
Auto-generated-cl: translation import
Baligh Uddin [Sun, 31 Aug 2014 19:38:19 +0000 (12:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I727035c5d02efd35eef5ed40f46daa167fe805f1
Auto-generated-cl: translation import
Ji-Hwan Lee [Sat, 30 Aug 2014 07:07:36 +0000 (16:07 +0900)]
Add missing checks for the current session callback
Bug:
17336320
Change-Id: I4676c4d76d1ed9d22bd476319098cbfcce52cd6d
Tyler Gunn [Sat, 30 Aug 2014 06:26:02 +0000 (06:26 +0000)]
Merge "Hiding videoState values in telecomm APIs. (1/3)" into lmp-dev
Amith Yamasani [Sat, 30 Aug 2014 04:37:27 +0000 (21:37 -0700)]
Make it possible to remove current user
Due to the async nature of switching users, it's not possible to
switch and remove immediately. So mark the switch target user as
soon as the user switch is requested, so that a remove will proceed
without failing at stopUserLocked().
Also, fix a similar problem with deleting the current guest and
switching to a new guest. It was attempting to remove the current
user which will result in a failed stopping of the user.
Added a way to mark the current guest
for deletion so that a new one can be created, switched to and the
old one deleted. If runtime fails, old guest is already marked for
deletion and will be cleaned up on restart.
Bug:
17321533
Change-Id: I4be0fb956227e0bb95588b5b1f2867fb1e655c0d
Wonsik Kim [Sat, 30 Aug 2014 03:55:10 +0000 (12:55 +0900)]
Bind hardware TIS at startup
Bug:
17336654
Change-Id: Ia1354305ee83c7c15afb7647f000c8b023c4648d
Yorke Lee [Sat, 30 Aug 2014 01:39:16 +0000 (18:39 -0700)]
Add lookup key to callerInfo
Bug:
16825519
Change-Id: I71c4b2366caa3351b1f2cedd1c341f9ac909b7ea
Rachad [Sat, 30 Aug 2014 01:11:34 +0000 (01:11 +0000)]
Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev
Jae Seo [Sat, 30 Aug 2014 00:51:18 +0000 (00:51 +0000)]
Merge "TIF: Fix comment on TvContentRating" into lmp-dev
Jeff Sharkey [Sat, 30 Aug 2014 00:45:27 +0000 (00:45 +0000)]
Merge "More API lint checks." into lmp-dev
Jeff Sharkey [Sat, 30 Aug 2014 00:41:43 +0000 (17:41 -0700)]
More API lint checks.
When offering a helper Service, etc, all platform provided methods
should be marked final. Otherwise, if available for developer to
override, they should follow onFoo() style naming.
Catch anyone returning concrete collections types, and look for
overlapping flags.
Change-Id: I29d95f3dff78a4da968a46f10be89eada509648c
Ruben Brunk [Sat, 30 Aug 2014 00:27:43 +0000 (00:27 +0000)]
Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev
Alan Viverette [Sat, 30 Aug 2014 00:19:50 +0000 (00:19 +0000)]
Merge "Fix disappearing ripple background, treat active ripple separately" into lmp-dev
Jeff Sharkey [Fri, 29 Aug 2014 23:41:37 +0000 (16:41 -0700)]
Ships passing in the night!
Fix build breakage.
Change-Id: I37e20b7e6838cb95cfd30efb52d68e81b346f8eb
Jae Seo [Fri, 29 Aug 2014 23:13:07 +0000 (16:13 -0700)]
TIF: Fix comment on TvContentRating
Bug:
17332911
Change-Id: Ia2d76b2c6ecf6b804f8b6aa8cec78a243b70e966