OSDN Git Service
Adrian Roos [Wed, 22 Oct 2014 20:45:26 +0000 (20:45 +0000)]
am
c19586a8: am
7b4a38b1: Delay discovery of system trust agents
* commit '
c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9':
Delay discovery of system trust agents
Christopher Tate [Wed, 22 Oct 2014 20:27:14 +0000 (20:27 +0000)]
Merge "Don't cancel scheduled jobs when packages are updated" into lmp-mr1-dev
Alan Viverette [Wed, 22 Oct 2014 20:03:45 +0000 (20:03 +0000)]
Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev
Christopher Tate [Mon, 20 Oct 2014 23:29:20 +0000 (16:29 -0700)]
Don't cancel scheduled jobs when packages are updated
Only cancel the app's jobs when it is fully uninstalled, not when
it's being updated to a newer version.
Bug
18059252
Change-Id: I6cf617013ec8e9e9abd90e366d7a6ab0711790de
Christopher Tate [Wed, 22 Oct 2014 17:36:42 +0000 (10:36 -0700)]
Fix settings db update sequence
The 'global' table only exists in the owner-user db instance; make
sure to apply global-setting update steps only when bringing up that
instance.
Bug
18069830
Change-Id: I843eabe710d9487de94690921d61adb181b45ed2
John Spurlock [Wed, 22 Oct 2014 16:44:28 +0000 (16:44 +0000)]
Merge "PowerUI: Post/cancel notification as UserHandle.ALL." into lmp-mr1-dev
Ye Wen [Wed, 22 Oct 2014 16:36:58 +0000 (16:36 +0000)]
Merge "Send HTTP status code back in case of MMS HTTP failure (1/3)" into lmp-mr1-dev
Geoff Mendal [Wed, 22 Oct 2014 15:49:32 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Wale Ogunwale [Wed, 22 Oct 2014 15:43:52 +0000 (15:43 +0000)]
Merge "Fix issue #
17674789: Recents icon resets if persist mode is 'persistNever'" into lmp-mr1-dev
Geoff Mendal [Wed, 22 Oct 2014 15:41:58 +0000 (08:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1a02d1751579ede64ab9d736fd1450dd0b449bfd
Auto-generated-cl: translation import
John Spurlock [Wed, 22 Oct 2014 13:05:51 +0000 (09:05 -0400)]
PowerUI: Post/cancel notification as UserHandle.ALL.
- Post power-related notifications for all users.
- Update the pending intent actions on user switch.
- Listen for the intent actions for all users.
Bug:
17300571
Change-Id: I956f09ecf5395f31ae1c1ec0409ee251839fcef4
John Reck [Wed, 22 Oct 2014 14:18:19 +0000 (14:18 +0000)]
Merge "Fix memory corruption in test" into lmp-mr1-dev
Geoff Mendal [Wed, 22 Oct 2014 13:20:08 +0000 (06:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9d15256733ff57735cfe6a07855a6633d732464c
Auto-generated-cl: translation import
Craig Mautner [Wed, 22 Oct 2014 03:01:40 +0000 (03:01 +0000)]
Merge "Debug for bug
18017409" into lmp-mr1-dev
Leon Scroggins III [Wed, 22 Oct 2014 02:00:46 +0000 (02:00 +0000)]
am
e463bc38: am
3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev
* commit '
e463bc388e7f5d83f864b320dde400e390ef5817':
Report that a JavaInputStreamAdaptor is at end.
Robin Lee [Wed, 22 Oct 2014 02:00:38 +0000 (02:00 +0000)]
am
fc567900: am
e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
* commit '
fc56790085463ab410a5f407a4930b42509ad5f7':
DevicePolicy: Restore CA warning to K behaviour
Dongwon Kang [Wed, 22 Oct 2014 01:46:31 +0000 (01:46 +0000)]
Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev
Craig Mautner [Wed, 22 Oct 2014 01:09:54 +0000 (18:09 -0700)]
Debug for bug
18017409
Log adding and removing windows. Log activity state changes.
Change-Id: I544be89ff9af6b13ffde70dedec291793b46a420
Alan Viverette [Wed, 22 Oct 2014 00:35:28 +0000 (00:35 +0000)]
Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev
Alan Viverette [Wed, 22 Oct 2014 00:05:07 +0000 (17:05 -0700)]
Format ListPreference summary with empty string if entry is null
Adding serif-monospace and sans-serif-monospace font families bumped
out the previous monospace, which left the summary as %s. Returning
an unformatted summary is never correct, and we should simply return
a summary populated with an empty string.
BUG:
17666124
Change-Id: Ic22dc5dc87d9ba3ad6f6b92ee059f5c98cbf103a
Wale Ogunwale [Tue, 21 Oct 2014 23:29:51 +0000 (16:29 -0700)]
Fix issue #
17674789: Recents icon resets if persist mode is 'persistNever'
Changed TaskPersister worker thread to not delete task information on disk
for tasks that are in recents but not persistable.
Also, changed logic that writes tasks information (excluding thunmbnail)
to disk to not write information for tasks that are not persistable.
Bug:
17674789
Change-Id: Iff7c5d24677f8a75157bb6be504fc2d9d6bcc098
Adrian Roos [Tue, 21 Oct 2014 21:43:05 +0000 (21:43 +0000)]
am
7b4a38b1: Delay discovery of system trust agents
* commit '
7b4a38b197ce43cb286d80fc6c4e9713b2807f13':
Delay discovery of system trust agents
Adam Powell [Tue, 21 Oct 2014 21:41:18 +0000 (21:41 +0000)]
Merge "Intent chooser callback" into lmp-mr1-dev
Andrew Lee [Tue, 21 Oct 2014 21:08:45 +0000 (21:08 +0000)]
Merge "Add video calling setting to TelephonyManager." into lmp-mr1-dev
John Reck [Tue, 21 Oct 2014 20:59:51 +0000 (20:59 +0000)]
Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev
Andrew Lee [Fri, 17 Oct 2014 22:37:54 +0000 (15:37 -0700)]
Add video calling setting to TelephonyManager.
We want to add a user setting to enable/disable video calling. This
is a telephony-level setting which the user sets using Telephony's
Call Settings, and applies universally to video calls.
But this setting needs to be accessible in places such as Dialer,
so these changes are to support storing the setting in
TelephonyManager (to be implemented in PhoneInterfaceManager) and
providing access to the setting for applications like Dialer
through TelephonyManager.
+ Add function definitions to ITelephony.
+ Add function wrapper implementations in TelephonyManager.
Bug:
16014284
Change-Id: I1dce8bf5ae4f0ee115698ce9627ba8fc424dd855
John Reck [Tue, 21 Oct 2014 17:09:36 +0000 (10:09 -0700)]
Surface:lockHardwareCanvas
Bug:
17440886
Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
Andrew Lee [Tue, 21 Oct 2014 20:02:18 +0000 (20:02 +0000)]
Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev
Alan Viverette [Tue, 21 Oct 2014 19:21:32 +0000 (12:21 -0700)]
Check MenuItem.isVisible() for keyboard shortcuts
Parity with support-v7 change.
BUG:
18021345
Change-Id: I583b586d451a21bbd207d2b0584a396e1125ee59
Adam Powell [Thu, 9 Oct 2014 19:50:14 +0000 (12:50 -0700)]
Intent chooser callback
Let an app specify an IntentSender as an extra for ACTION_CHOOSER that
will be notified of the user's chosen target. Apps can use this to
implement things like one-touch last used affordances without
implementing their own one-off chooser UI.
Bug
17363684
Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
John Spurlock [Tue, 21 Oct 2014 19:16:16 +0000 (15:16 -0400)]
VolumeDialog: Restore default-selection logic.
Bug:
18066513
Change-Id: Ie72189edf9b59fd8d192d882aaadf1ac05dcb359
John Spurlock [Tue, 21 Oct 2014 18:39:18 +0000 (18:39 +0000)]
Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev
Alan Viverette [Tue, 21 Oct 2014 18:25:00 +0000 (18:25 +0000)]
Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev
John Spurlock [Tue, 21 Oct 2014 18:23:24 +0000 (14:23 -0400)]
Settings: Make SeekBarVolumizer more null-resilient.
Now that the instances are reusable, ensure all "post" methods
do a handler check, and ensure they are all internal.
Bug:
18063070
Change-Id: Idc478c636686f666f5656f3d07bf2738ba3e9a5a
John Spurlock [Tue, 21 Oct 2014 18:16:46 +0000 (18:16 +0000)]
Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-dev
Alan Viverette [Tue, 21 Oct 2014 18:16:24 +0000 (18:16 +0000)]
Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev
Alan Viverette [Tue, 21 Oct 2014 18:14:49 +0000 (18:14 +0000)]
Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev
Alan Viverette [Tue, 21 Oct 2014 18:04:04 +0000 (11:04 -0700)]
Fix gradient drawable radius when specified as float, dimension
BUG:
18070756
Change-Id: I991ff792c376c9695a007f8f1187390ab5ff6e3c
Ye Wen [Tue, 21 Oct 2014 17:47:36 +0000 (10:47 -0700)]
Send HTTP status code back in case of MMS HTTP failure (1/3)
We need this in SMS app so that we can treat 404 specially
b/
17520290
Change-Id: Ifae1c1b323411143c740fb589c2b978b5ff9bc4e
Andrew Lee [Tue, 21 Oct 2014 17:32:49 +0000 (10:32 -0700)]
Fire onConferenceChanged after reseting conference.
Bug:
17423848
Change-Id: Ic53f40e806f2bfd5b49bff2caad64bb93b290bad
John Spurlock [Tue, 21 Oct 2014 16:15:28 +0000 (12:15 -0400)]
Sysui: Include shared prefs in service dump.
Also:
- Remove obsolete Prefs helper.
- Use common file for zen-mode prefs.
Bug:
18062541
Change-Id: I9a6a4733eac0ec1c55da5d359c996cb5fe3bb8af
Adrian Roos [Tue, 21 Oct 2014 15:07:39 +0000 (17:07 +0200)]
Delay discovery of system trust agents
Waits for BOOT_COMPLETED when enabling system trust agents.
This fixes an issue where no agents were discovered because the
packages were not ready after an OTA.
Bug:
18065140
Change-Id: Ibff9948e1536e07f868d6b29f432923a137091e6
Leon Scroggins III [Tue, 21 Oct 2014 13:56:42 +0000 (13:56 +0000)]
am
3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev
* commit '
3c8bde5534d81518f5baf3795989f367373f7dfd':
Report that a JavaInputStreamAdaptor is at end.
Leon Scroggins III [Tue, 21 Oct 2014 13:52:29 +0000 (13:52 +0000)]
Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev
Robin Lee [Tue, 21 Oct 2014 11:58:38 +0000 (11:58 +0000)]
am
e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
* commit '
e1c9489cc40542bfa2adbb84b6fb77cff4ab8570':
DevicePolicy: Restore CA warning to K behaviour
Robin Lee [Tue, 21 Oct 2014 11:54:50 +0000 (11:54 +0000)]
Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
Geoff Mendal [Mon, 20 Oct 2014 23:43:33 +0000 (23:43 +0000)]
am
deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
deddb38462389823c194559052c4d64ee6c3b467':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:39:57 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 23:21:14 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idcc94d2f5b04a7eea17b530c4a8ff7f8b76fff38
Auto-generated-cl: translation import
Jinsuk Kim [Mon, 20 Oct 2014 22:50:36 +0000 (22:50 +0000)]
Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev
Leon Scroggins III [Thu, 16 Oct 2014 20:50:41 +0000 (16:50 -0400)]
Report that a JavaInputStreamAdaptor is at end.
This prevents a naive caller from continuing to attempt to read.
BUG:
17419670
BUG:
17873145
Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
RoboErik [Mon, 20 Oct 2014 22:19:54 +0000 (22:19 +0000)]
am
f0a28411: am
2fa604fc: Merge "Add missing break to switch statement" into lmp-dev
* commit '
f0a284115a8fb089806eb87db1a20468dd55ecd3':
Add missing break to switch statement
Amit Mahajan [Mon, 20 Oct 2014 22:17:38 +0000 (22:17 +0000)]
Merge "Add a constant for invalid profile id value" into lmp-mr1-dev
Jinsuk Kim [Mon, 20 Oct 2014 22:14:46 +0000 (07:14 +0900)]
CEC: Add missing protections for some HdmiControlService API
A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.
Bug:
17408780
Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
RoboErik [Mon, 20 Oct 2014 22:14:10 +0000 (22:14 +0000)]
am
2fa604fc: Merge "Add missing break to switch statement" into lmp-dev
* commit '
2fa604fc59ded63a416066a0bc66f63069cae7f3':
Add missing break to switch statement
RoboErik [Mon, 20 Oct 2014 22:08:06 +0000 (22:08 +0000)]
Merge "Add missing break to switch statement" into lmp-dev
RoboErik [Mon, 20 Oct 2014 21:56:32 +0000 (14:56 -0700)]
Add missing break to switch statement
the skip to queue item case was falling through when it shouldn't.
bug:
18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
Griff Hazen [Mon, 20 Oct 2014 21:46:12 +0000 (21:46 +0000)]
am
aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev
* commit '
aec92e2eca4b4197ac45dcde265e2797c7ea9133':
Disable zen log printouts by default
Wei Wang [Mon, 20 Oct 2014 21:46:08 +0000 (21:46 +0000)]
am
33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
* commit '
33bb6c2d3ca798c8275694d0fe700e9fb1fefe99':
Remove spammy log information for BLE scan.
smain@google.com [Mon, 20 Oct 2014 21:46:00 +0000 (21:46 +0000)]
am
ae6dc92c: am
21de5f3f: Doc change: misc changes to highlights.
* commit '
ae6dc92c3d39862e97a778ea69943ee37a78e92b':
Doc change: misc changes to highlights.
Griff Hazen [Mon, 20 Oct 2014 21:43:15 +0000 (21:43 +0000)]
Merge "Disable zen log printouts by default" into lmp-sprout-dev
Alan Viverette [Mon, 20 Oct 2014 21:42:53 +0000 (14:42 -0700)]
Propagate state changes even when we don't change drawable index
Previously we could miss the state change if we were simply reversing the
current transition.
BUG:
17967405
Change-Id: I2cb396dedbff61b980741ef8c0d931be6abe129c
Wei Wang [Mon, 20 Oct 2014 21:41:28 +0000 (21:41 +0000)]
Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
smain@google.com [Mon, 20 Oct 2014 21:40:11 +0000 (21:40 +0000)]
am
21de5f3f: Doc change: misc changes to highlights.
* commit '
21de5f3f12071458c2a1cf3dd39bb9271ee13e92':
Doc change: misc changes to highlights.
smain@google.com [Mon, 20 Oct 2014 21:33:00 +0000 (14:33 -0700)]
Doc change: misc changes to highlights.
Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
Wink Saville [Mon, 20 Oct 2014 21:24:27 +0000 (21:24 +0000)]
am
6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev
* commit '
6bacccbfbcdc7952bac7e25c3e3f2d6a6151a215':
Radio Capability Support.
Wink Saville [Mon, 20 Oct 2014 21:17:28 +0000 (21:17 +0000)]
Merge "Radio Capability Support." into lmp-sprout-dev
Adam Lesinski [Mon, 20 Oct 2014 21:05:04 +0000 (21:05 +0000)]
am
73a8c596: am
3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
* commit '
73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c':
AAPT: Fix path for final generated resources on Windows
Griff Hazen [Mon, 20 Oct 2014 21:02:59 +0000 (14:02 -0700)]
Disable zen log printouts by default
Bug:
18056528
Change-Id: I77359476ff2f67027383fcdb91d2843d040533c7
Adam Lesinski [Mon, 20 Oct 2014 21:00:23 +0000 (21:00 +0000)]
am
3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
* commit '
3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
AAPT: Fix path for final generated resources on Windows
Adam Lesinski [Mon, 20 Oct 2014 20:55:48 +0000 (20:55 +0000)]
Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
Robin Lee [Mon, 20 Oct 2014 20:46:53 +0000 (21:46 +0100)]
DevicePolicy: Restore CA warning to K behaviour
Some tests rely on this being dismissible. Additionally it turns out
some users don't like having a hulking great notification follow them
around everywhere.
Bug:
17985258
Change-Id: If05a07b9eaa402a48f9a14647effc1df32c796e1
ztenghui [Mon, 20 Oct 2014 20:42:51 +0000 (20:42 +0000)]
am
a724d1ab: am
877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev
* commit '
a724d1ab4083f08958bd88e76e15b7c0af337bfc':
Make sure the bitmap from VD's cache is drawn using bi-linear filter.
ztenghui [Mon, 20 Oct 2014 20:35:58 +0000 (20:35 +0000)]
am
877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev
* commit '
877ce2c42b5d423719246f5458cd66fa9fddb317':
Make sure the bitmap from VD's cache is drawn using bi-linear filter.
ztenghui [Mon, 20 Oct 2014 20:29:15 +0000 (20:29 +0000)]
Merge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into lmp-dev
John Spurlock [Mon, 20 Oct 2014 20:15:36 +0000 (20:15 +0000)]
Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev
RoboErik [Mon, 20 Oct 2014 19:20:32 +0000 (19:20 +0000)]
am
26a43094: am
578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev
* commit '
26a4309492f5af6828738a469ad8f18f42c44a61':
Set the metadata rating correctly in RCC
Adam Lesinski [Mon, 20 Oct 2014 19:15:25 +0000 (12:15 -0700)]
AAPT: Fix path for final generated resources on Windows
Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92
RoboErik [Mon, 20 Oct 2014 19:13:20 +0000 (19:13 +0000)]
am
578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev
* commit '
578fbe898f1652b3166bd4e20647572dec9dfb14':
Set the metadata rating correctly in RCC
RoboErik [Mon, 20 Oct 2014 19:07:51 +0000 (19:07 +0000)]
Merge "Set the metadata rating correctly in RCC" into lmp-dev
Alan Viverette [Mon, 20 Oct 2014 19:00:35 +0000 (19:00 +0000)]
Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev
Hui Wang [Thu, 16 Oct 2014 19:22:20 +0000 (14:22 -0500)]
Add a constant for invalid profile id value
Change-Id: I0cac2e38572e4b04081fd3347be05e57cc899008
John Spurlock [Mon, 20 Oct 2014 17:37:48 +0000 (13:37 -0400)]
Qualify private outer call in MediaProjectionManagerService.
Change-Id: Ia4e09bdfe773a27107c0980a1aabf9b09e2b0a46
Libin.Tang@motorola.com [Thu, 7 Aug 2014 21:25:37 +0000 (16:25 -0500)]
change setProvisionedValue/setProvisionedStringValue to
return operation result.
Change-Id: I24f127280d4692633ede7e17a63ababee1b6c71f
Wink Saville [Fri, 17 Oct 2014 22:03:58 +0000 (15:03 -0700)]
Radio Capability Support.
New design of capability switch for L.
Add new RIL requests:
RIL_REQUEST_GET_RADIO_CAPABILITY
RIL_REQUEST_SET_RADIO_CAPABILITY
RIL_UNSOL_RADIO_CAPABILITY
These commands allow the framework to communicate what the Radio
Capabilities for each logical modem has or should be using.
It can support 2/3/4G switch and has flexible architecture to support
future technology.
Change-Id: Iedf7f608d2ba3c06a883500f2d85abb98e69d9c1
Dmitriy Ivanov [Mon, 20 Oct 2014 17:14:52 +0000 (17:14 +0000)]
Merge "Link sigchain to main executable" into lmp-mr1-dev
Geoff Mendal [Mon, 20 Oct 2014 17:08:30 +0000 (17:08 +0000)]
am
2f831575: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
2f831575253e4f5a9e329e857aad2cd816f47524':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 17:08:27 +0000 (17:08 +0000)]
am
1d5af7b7: (-s ours) am
00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
1d5af7b743fa32ca291d57a0b8b6998f7761c94d':
Import translations. DO NOT MERGE
smain@google.com [Mon, 20 Oct 2014 17:03:09 +0000 (17:03 +0000)]
am
dadc7d25: am
065b94c6: update workplace description in lollipop highlights bug:
18038081
* commit '
dadc7d25ea997792c8348f22b18238ab19c73756':
update workplace description in lollipop highlights bug:
18038081
Geoff Mendal [Mon, 20 Oct 2014 17:02:53 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 17:02:10 +0000 (17:02 +0000)]
am
00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
00831836cdeeb4a61ba10c724c3ca33280937b62':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 16:57:36 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
smain@google.com [Mon, 20 Oct 2014 16:57:22 +0000 (16:57 +0000)]
am
065b94c6: update workplace description in lollipop highlights bug:
18038081
* commit '
065b94c6a634e7a765f2674cff696a75e76f6425':
update workplace description in lollipop highlights bug:
18038081
Geoff Mendal [Mon, 20 Oct 2014 16:56:45 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
smain@google.com [Mon, 20 Oct 2014 16:41:08 +0000 (09:41 -0700)]
update workplace description in lollipop highlights
bug:
18038081
Change-Id: I612fc52392bc0fb71cc2e7b4c0da1fcaae6ac6fe
RoboErik [Mon, 20 Oct 2014 16:48:13 +0000 (09:48 -0700)]
Set the metadata rating correctly in RCC
We weren't setting the ratings in the new MediaMetadata from RCC.
This adds some code to set them correctly.
bug:
18051829
Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e
Geoff Mendal [Mon, 20 Oct 2014 16:44:01 +0000 (09:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id9f97226c8140113ba6f35b67b9a7855d591ff5e
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Oct 2014 16:38:16 +0000 (09:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33de2b927652754e951be07a19d6e27f7350de47
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Oct 2014 16:34:39 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3dd702947875349b8ca04edb813687588e4db689
Auto-generated-cl: translation import
Adrian Roos [Mon, 20 Oct 2014 15:19:13 +0000 (15:19 +0000)]
Merge "Fix issues with TrustDrawable" into lmp-mr1-dev