OSDN Git Service
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
Alexandra Gherghina [Wed, 2 Jul 2014 17:07:16 +0000 (17:07 +0000)]
Merge "Adds per-user APIs required by the Settings app"
Alexandra Gherghina [Tue, 1 Jul 2014 14:14:11 +0000 (15:14 +0100)]
Adds per-user APIs required by the Settings app
Bug:
15466880
Change-Id: Ic99fbf074564901b04d32b08f3a7a38555f330b3
Eric Laurent [Wed, 2 Jul 2014 16:46:18 +0000 (16:46 +0000)]
Merge "audio: fixed channel count determination from channel mask"
Eric Laurent [Wed, 2 Jul 2014 01:56:30 +0000 (18:56 -0700)]
audio: fixed channel count determination from channel mask
Do not use popcount() to derive channel count from channel mask.
Bug:
15000850.
Change-Id: Id52fc517bedaf1c42b9cd59857e3d19c251b97bf
Narayan Kamath [Wed, 2 Jul 2014 12:07:39 +0000 (12:07 +0000)]
Merge "Fix native crashes when APKs can't be opened."
Narayan Kamath [Thu, 12 Jun 2014 16:19:43 +0000 (17:19 +0100)]
Fix native crashes when APKs can't be opened.
There was lax / incomplete error checking around the
construction of Apk handles. This change changes the ApkHandle
API and makes it throw IOException if the zipfile couldn't
be opened.
Additionally :
- Fix a resource leak in DefaultContainerService
- Report errors correctly during package moves.
bug:
15563874
(cherry picked from commit
ec4516470d7ce6e47769591d678c838bd3f6f388)
Change-Id: Ia35b464355467d0d36faf34fae85acbbab3f2896
Jinsuk Kim [Tue, 1 Jul 2014 21:16:36 +0000 (06:16 +0900)]
Add setOption for HdmiControlService
Bug:
15845304
Change-Id: I96b285ae3938aeecdd44b2c08a178def33bd2bf2
Yohei Yukawa [Wed, 2 Jul 2014 07:35:32 +0000 (07:35 +0000)]
Merge "Require coordinate transformation matrix if necessary"
Yohei Yukawa [Fri, 27 Jun 2014 07:16:47 +0000 (16:16 +0900)]
Require coordinate transformation matrix if necessary
With this CL, CursorAnchorInfo.Builder#build() raises
IllegalArgumentException when an application author attempts to
instantiate CursorAnchorInfo without the coordinate
transformation matrix but with specifying some positional
parameters such as composing character rectangle.
Since any other positional members in CursorAnchorInfo are
supposed to be specified in local coordinates, the application
author must provide the coordinate transformation matrix for
such positional data.
Change-Id: I2b0fd0f146a2b95fe4fa1324837d8cfee667208c
Winson Chung [Tue, 1 Jul 2014 01:04:55 +0000 (18:04 -0700)]
Fixing some bugs in Recents keyboard behaviour.
- Ensuring that we don't allow meta-tab to trigger Recents (since meta is a system key now)
- Adding dpad keys support to traverse stack
- Adding workaround for cases where tasks wouldn't be focused depending on how you launch Recents
Change-Id: I4101ced7e47e0d1659d5fa236214be5697c00560
Jungshik Jang [Tue, 1 Jul 2014 09:01:26 +0000 (18:01 +0900)]
Remove SystemAudioAutoInitiationAction when SystemAudioActionFromAvr started.
Bug:
15845309
Change-Id: I1eefeca3aab117f2def08fe9fbbea81987ef11a8
Roozbeh Pournader [Tue, 1 Jul 2014 22:36:56 +0000 (15:36 -0700)]
Update to extended Roboto fonts.
The new fonts have complete coverage of Latin, Greek, and Cyrillic
characters in Unicode 7.0, including combining marks and related
punctuations. Various phonetic transcriptions and romanization systems are
now supported, as well as several minority and historical langauges.
A visible .notdef glyph has also been added.
Bug:
2802862
Bug:
4673396
Bug:
6629748
Bug:
7503539
Bug:
10728157
Bug:
11199883
Bug:
14408876
Bug:
15734816
Change-Id: I7a4986bfbd710ec5cc80792a3f7598dae110e5f9
Eric Laurent [Wed, 2 Jul 2014 02:30:41 +0000 (02:30 +0000)]
Merge "AudioManager: add isVolumeFixed() API"
Eric Laurent [Fri, 16 May 2014 00:08:16 +0000 (17:08 -0700)]
AudioManager: add isVolumeFixed() API
Indicates if the device implements fixed volume policy.
In this case, volume control APIs are not operational.
Bug:
11430859.
Change-Id: Ia82bdfe5b38d6b2ce132f00a493e6a04cb794ea0
Dianne Hackborn [Tue, 1 Jul 2014 19:56:08 +0000 (12:56 -0700)]
Rework network stats to use proc state for fg/bg.
Switch to using the process state to determine whether a
process should be foreground or background, instead of the
boolean foreground given by the activity manager.
This is for battery save mode, where we can now allow more apps
to havenetwork access: everything whose process state is at
least IMPORTANT_FOREGROUND, which allows music playback
and other use-visible things to continue to have network
access.
Note this also impact the traditional background data disabled
state, where now we allow anything top or better to have
network access. This automatically includes all persistent
processes, the current top activity, and any other processes
hosting the top activity or being used by the top activity.
So it broadens the set of apps that get network access, but I
think this increases it to a reasonable set of things that may
actually be needed for the foreground app to work correctly.
Change-Id: Icb609a2cea280dc3fa3e83417f478ed77f3685aa
Adam Powell [Wed, 2 Jul 2014 01:13:08 +0000 (01:13 +0000)]
Merge "Fix checking for compatibility between window title features."
Adam Powell [Wed, 2 Jul 2014 00:37:48 +0000 (17:37 -0700)]
Fix checking for compatibility between window title features.
New features that have nothing to do with titles were tripping the,
"is this compatible with custom titles" feature check in
PhoneWindow. Define a better way of checking for this for when we
add new window features in the future.
Bug
13789588
Change-Id: Ie1cacffb113958dac5142a5a39f548df53b47299
Adam Powell [Wed, 2 Jul 2014 00:38:18 +0000 (17:38 -0700)]
Fix a copy/paste bug in Toolbar.
Bug
15868762
Change-Id: Ie2a0c492f9d7baa05d520cd2fee652245ab4b61b
Sailesh Nepal [Wed, 2 Jul 2014 00:25:37 +0000 (17:25 -0700)]
Make RemoteConnection.getState public
Change-Id: Iead485345d01d47e346da014fdb9979def25c372
Robert Ly [Wed, 2 Jul 2014 00:27:34 +0000 (00:27 +0000)]
am
2e3b9d30: am
9b3bfb10: docs: updated expandedtext_combo
* commit '
2e3b9d30d4e16ecc0b3e4a04252b23afe55dda8c':
docs: updated expandedtext_combo
Robert Ly [Wed, 2 Jul 2014 00:22:10 +0000 (00:22 +0000)]
am
9b3bfb10: docs: updated expandedtext_combo
* commit '
9b3bfb1085770e558a31f9c4b1a6f9e6e34c8bc1':
docs: updated expandedtext_combo
Robert Ly [Wed, 2 Jul 2014 00:00:58 +0000 (17:00 -0700)]
docs: updated expandedtext_combo
Change-Id: Ida3f08560710bf9d32fefd6797830f2258fed3c6
Robert Ly [Wed, 2 Jul 2014 00:00:59 +0000 (00:00 +0000)]
am
f077e7b7: Merge "docs: add more notification images" into klp-modular-dev
* commit '
f077e7b719419271b5fd666c22b7d19177d6c325':
docs: add more notification images
Brian Carlstrom [Tue, 1 Jul 2014 22:37:18 +0000 (22:37 +0000)]
am
8922ddba: am
a6e06889: Merge "Add profiler type options"
* commit '
8922ddbab1e394a59f957e8598fbbf88357e7838':
Add profiler type options
Brian Carlstrom [Tue, 1 Jul 2014 22:32:01 +0000 (22:32 +0000)]
am
a6e06889: Merge "Add profiler type options"
* commit '
a6e06889fce7fbf2049f421daef02b8986736f77':
Add profiler type options
Chris Craik [Tue, 1 Jul 2014 22:23:57 +0000 (15:23 -0700)]
Fix klp-modular-dev-plus-aosp build
Change-Id: I546dfef29b5875633de18f6a7e3f419a0d012faa
Nick Kralevich [Tue, 1 Jul 2014 21:16:14 +0000 (21:16 +0000)]
am
d172419e: am
9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit '
d172419e9a36f61af8c98d316ec2625e1f1304f6':
Allow different SELinux policies for third party apps.
Nick Kralevich [Tue, 1 Jul 2014 21:13:12 +0000 (21:13 +0000)]
am
9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit '
9b1a7d4570dd692cf86c385dfcdf057ad966fa57':
Allow different SELinux policies for third party apps.
Nick Kralevich [Tue, 1 Jul 2014 21:09:28 +0000 (21:09 +0000)]
Merge "Allow different SELinux policies for third party apps."
Robert Craig [Tue, 1 Jul 2014 20:53:11 +0000 (13:53 -0700)]
Allow different SELinux policies for third party apps.
Prior support forced all third party apps
to be resolved against the default stanza
of the mac_permissions.xml file when assigning
seinfo labels. This meant that all third party
apps, in effect, were untrusted regardless of
cert and therefore received the same selinux domain.
This also had the unfortunate side effect of forcing
certain third party apps into the wrong domains
because of shared userid requests among apps.
This patch removes that restriction and instead
allows all apps, regardless of location, to be
matched against the full mac_permissions.xml
policy file. This then allows all apps signed
with known good certs to receive the same selinux
domains of other apps with whom they share trust.
Change-Id: Iba569c046135c0e81140faf6296c5da26a243037
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Anish Athalye [Wed, 2 Jul 2014 01:03:35 +0000 (01:03 +0000)]
Merge "Fix line breaking for clusters in narrow views"
Marco Nelissen [Tue, 1 Jul 2014 18:21:41 +0000 (18:21 +0000)]
am
899c15ef: am
db816cef: Merge "Make sure we clean up"
* commit '
899c15ef2053f0cebfeda90b5211e80310e6f278':
Make sure we clean up
Marco Nelissen [Tue, 1 Jul 2014 18:15:28 +0000 (18:15 +0000)]
am
db816cef: Merge "Make sure we clean up"
* commit '
db816cef0dd1f1988fbcf3c70a66f9c4acf73358':
Make sure we clean up
Baligh Uddin [Tue, 1 Jul 2014 18:14:47 +0000 (18:14 +0000)]
am
b9246ef5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
b9246ef52c7f8ea7c4888c0f45005a49792a8614':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Jul 2014 18:14:40 +0000 (18:14 +0000)]
am
9846e4c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
9846e4c676e9b1b656081bab3f9cb304f8cc3cdf':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Jul 2014 18:14:36 +0000 (18:14 +0000)]
am
4a4fa0a3: (-s ours) Import translations. DO NOT MERGE
* commit '
4a4fa0a30a4d53816fcb56545054d624f3243cb6':
Import translations. DO NOT MERGE
Nicolas Prevot [Wed, 2 Jul 2014 11:24:37 +0000 (11:24 +0000)]
Merge "Returning badged icons for components of corporate apps."
Nicolas Prevot [Mon, 23 Jun 2014 14:59:38 +0000 (15:59 +0100)]
Returning badged icons for components of corporate apps.
So, corporate apps in disambiguation dialogs are badged.
And updating the way we show the icon of the personal space to this new design.
BUG:
14377051
Change-Id: Idc707773a64a8feb2d9d4df88c425d5100542636
Przemyslaw Szczepaniak [Wed, 2 Jul 2014 11:12:05 +0000 (11:12 +0000)]
Merge "Add support for audio session id in the TTS"
Przemyslaw Szczepaniak [Wed, 18 Jun 2014 10:35:52 +0000 (11:35 +0100)]
Add support for audio session id in the TTS
+ #playEarcon & #queueAudio respects request Volume/Pan settings.
Bug:
15432115
Change-Id: I136afef77afbc56c34810c64123f7be4b431d378
Narayan Kamath [Wed, 2 Jul 2014 10:11:12 +0000 (10:11 +0000)]
am
4161316f: am
94171212: am
104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '
4161316f256c9cc047405a902bcfc17b3738b659':
Fix broken assumptions in LocalePicker.
Narayan Kamath [Wed, 2 Jul 2014 10:11:00 +0000 (10:11 +0000)]
am
c61a7575: am
d62196cf: am
3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit '
c61a7575eb0e3d1788ce1946da81d6c5e6812b9c':
Remove bogus 2 char limit for locales and countries.
Narayan Kamath [Wed, 2 Jul 2014 09:54:22 +0000 (09:54 +0000)]
am
94171212: am
104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '
94171212431a45346e40fd97bbe72422e71f04be':
Fix broken assumptions in LocalePicker.
Narayan Kamath [Wed, 2 Jul 2014 09:51:54 +0000 (09:51 +0000)]
am
d62196cf: am
3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit '
d62196cfeffe5e4d725b5388fca57a18c154a44b':
Remove bogus 2 char limit for locales and countries.
Narayan Kamath [Wed, 2 Jul 2014 08:49:08 +0000 (08:49 +0000)]
am
104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '
104da1e495cbed81e7ebe66b80344bf916b02391':
Fix broken assumptions in LocalePicker.
Narayan Kamath [Wed, 2 Jul 2014 08:49:04 +0000 (08:49 +0000)]
am
3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit '
3fa99ec77ee52164575375c7709923c94d9693a6':
Remove bogus 2 char limit for locales and countries.
Narayan Kamath [Wed, 2 Jul 2014 08:09:01 +0000 (08:09 +0000)]
Merge "Fix broken assumptions in LocalePicker."
Narayan Kamath [Wed, 2 Jul 2014 08:08:36 +0000 (08:08 +0000)]
Merge "Remove bogus 2 char limit for locales and countries."
Baligh Uddin [Tue, 1 Jul 2014 17:47:53 +0000 (10:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1027a88bab0d00d223807bba87f9bbb75aef4d79
Auto-generated-cl: translation import
Anish Athalye [Fri, 27 Jun 2014 21:37:53 +0000 (14:37 -0700)]
Fix line breaking for clusters in narrow views
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.
Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
Julia Reynolds [Wed, 2 Jul 2014 16:35:27 +0000 (16:35 +0000)]
Merge "Apply ENSURE_VERIFY_APPS restriction to PackageManagerService."
Robert Greenwalt [Wed, 25 Jun 2014 23:45:57 +0000 (16:45 -0700)]
Simplify the network transition wakelock.
Make it all internal to ConnectivityService - we know when a network
is lost, so grab a wakelock then.
Moves the call out of WifiStateMachine which was grabbing at bad times
like every dhcp renewal or corp-network roam. These would always
go the full 1 minute and chew up battery.
bug:
15595155
Change-Id: I80157a818cc149072cc7706d78c1e79c6e679ab3
Niels Egberts [Wed, 2 Jul 2014 16:16:04 +0000 (17:16 +0100)]
First argument of playSilence is incorrect in javaDoc.
Change-Id: Icc059471e61fb6154108b74ea45cb06554d80631
Niels Egberts [Wed, 2 Jul 2014 15:41:34 +0000 (16:41 +0100)]
Forgot to deprecate a method in current.txt before merging earlier change.
Also includes a comment fix and line size changes in TextToSpeech.java.
Change-Id: Ia5842b694bca6cd9cae035164ffc605451e72d8b
Niels Egberts [Wed, 25 Jun 2014 14:30:44 +0000 (15:30 +0100)]
Support for CharSequences in the V1 API.
Two newly deprecated methods:
- TextToSpeech.speak (over TextToSpeech.speak with mandatory utteranceId)
- SynthesisRequest.getText (over SynthesisRequest.getCharSequenceText)
Change-Id: I8a75ed335c91074c72d6ef374ff8b9c79a7c208d
Adrian Roos [Wed, 2 Jul 2014 15:19:52 +0000 (17:19 +0200)]
Fix keyguard user switcher layering
Bug:
15822308
Change-Id: I4253a5f9ccb395b291696825923b251c4069c617
Julia Reynolds [Mon, 30 Jun 2014 20:04:12 +0000 (16:04 -0400)]
Apply ENSURE_VERIFY_APPS restriction to PackageManagerService.
Bug:
15986973
Change-Id: I9e8dae15cb866a3bb16e91fc49086fe1633f0bf8
Adrian Roos [Fri, 20 Jun 2014 23:10:14 +0000 (16:10 -0700)]
Add stable insets for stable system windows
Adds a new kind of inset that only accounts for stable system
windows like the system or navigation bar.
Bug:
15457292
Change-Id: I681b711f6f40a94c25b7acd3a44eb3539486afab
Jorim Jaggi [Wed, 2 Jul 2014 15:21:35 +0000 (15:21 +0000)]
Merge "Implement ability to fling to QS in empty space"
Jorim Jaggi [Tue, 1 Jul 2014 16:48:52 +0000 (18:48 +0200)]
Implement ability to fling to QS in empty space
Bug:
16009808
Change-Id: I0af174a4d97202dae767e4ae56f43599dbee4e05
Jorim Jaggi [Tue, 1 Jul 2014 16:13:24 +0000 (18:13 +0200)]
Start expanding QS directly when overscrolling to it.
This removes the janky transition from scrolling to flinging.
Change-Id: I691ac94ec06af7f7431ad162e07c21d2c753e99c
Jorim Jaggi [Tue, 1 Jul 2014 19:27:58 +0000 (21:27 +0200)]
Always load resources in SystemUI.
This fixes a bug where resources didn't get loaded after a SysUI
crash.
Change-Id: I3a679890d15ad3c1e13a017840b8258670a23ff8
Jorim Jaggi [Wed, 2 Jul 2014 15:16:06 +0000 (15:16 +0000)]
Merge "Start expanding QS directly when overscrolling to it."
Jorim Jaggi [Wed, 2 Jul 2014 14:53:33 +0000 (14:53 +0000)]
Merge "Fix "None" lock screen option"
Jorim Jaggi [Wed, 2 Jul 2014 14:46:27 +0000 (16:46 +0200)]
Fix "None" lock screen option
Now that we have a user switcher in quick settings, we don't need to
show the lockscreen if multi-user is enabled.
Bug:
15864584
Change-Id: I1a7ea69963fdd5a4f79584f565beff36612468f5
George Mount [Mon, 30 Jun 2014 23:47:34 +0000 (16:47 -0700)]
Ensure views have been laid out before capturing the epicenter.
Bug
15992706
Change-Id: If245040b756882bcc82f56ef2c4563ce25c24e9e
George Mount [Wed, 2 Jul 2014 14:24:09 +0000 (14:24 +0000)]
Merge "Reapply fix after bad merge."
George Mount [Wed, 2 Jul 2014 14:22:43 +0000 (07:22 -0700)]
Reapply fix after bad merge.
Bug
13745751
Change-Id: I8eda37bd0e083b7c7949935973330882f6f5f1dc
George Mount [Tue, 1 Jul 2014 22:27:07 +0000 (15:27 -0700)]
Fix hang when there is no shared element in activity transition.
Bug
15990826
Change-Id: Id494a51baf8694abd6c5207389cd8334db485d1a
John Reck [Wed, 2 Jul 2014 14:19:50 +0000 (14:19 +0000)]
Merge "Fixes to startDelay"
George Mount [Wed, 2 Jul 2014 13:49:37 +0000 (13:49 +0000)]
Merge "Stop temporary window from showing with activity transitions."
George Mount [Tue, 1 Jul 2014 23:33:45 +0000 (16:33 -0700)]
Stop temporary window from showing with activity transitions.
Bug
15424905
When creating a new process, a temporary window would show,
even when within the same task. This CL prevents the temporary
window from showing when using
ActivityOptions.makeSceneTransitionAnimation(...)
Change-Id: I93c40ba0b41ed90ebe6e9802d1236f8c81d60abe
John Reck [Tue, 1 Jul 2014 22:23:45 +0000 (15:23 -0700)]
Fixes to startDelay
Bug:
15991758
Don't update the UI thread with final value until after
startDelay
Change-Id: Ie8bffb5a3ace353ec1d82943a4efcbd01c42c28f
Jorim Jaggi [Tue, 1 Jul 2014 20:00:50 +0000 (22:00 +0200)]
Fix occasional jank when going to QS.
We change the listening state of the QS panel before the user
actually navigates there and when the animations are probably
not running (after expanding the panel).
Change-Id: Iad48b3459e7db09c423f6983a9fec17ec0088050
Adrian Roos [Wed, 2 Jul 2014 13:05:54 +0000 (13:05 +0000)]
Merge "Add flashlight to quick settings"
Jason Monk [Thu, 26 Jun 2014 16:52:18 +0000 (12:52 -0400)]
User restriction for disallowing window creation
Block any types of windows that could by used by apps to create
views on top of a locked app. This can be used by device admins
in conjunction with lock task mode.
Added a way for system (and priv apps) to bypass user restrictions
for specified op codes.
Bug:
15279535
Change-Id: I2381530ef6226a5bb32a99bb4030baafb39bf564
Adrian Roos [Mon, 30 Jun 2014 13:11:53 +0000 (15:11 +0200)]
Add flashlight to quick settings
Bug:
15934851
Change-Id: I86f61fa11fe64e76adb032391ce7e7170f59549d
Paul Jensen [Wed, 2 Jul 2014 14:14:25 +0000 (14:14 +0000)]
Merge "Make sure callback handler is in place before callbacks handled."
Paul Jensen [Fri, 27 Jun 2014 15:05:32 +0000 (11:05 -0400)]
Make sure callback handler is in place before callbacks handled.
When making Network requests in ConnectivityManager, make sure we install the
callback prior to a response from ConnectivityService arriving causing us to
search for the callback and inadvertently not find it.
bug:
15928097
Change-Id: Ie5feb9cc8f5effc19870f54dba07218b2e11d82a
George Mount [Wed, 2 Jul 2014 14:03:24 +0000 (14:03 +0000)]
Merge "Allow activity transitions to target nav and status bar colors."
George Mount [Tue, 1 Jul 2014 00:31:17 +0000 (17:31 -0700)]
Allow activity transitions to target nav and status bar colors.
Bug
15885062
Action bar can already be targeted via android:action_bar.
Navigation bar background is now android:navigation:background.
Status bar background is now android:status:background.
Change-Id: I4604906923f3473af3beec4f865463b2fe4a5316
Adrian Roos [Wed, 2 Jul 2014 14:02:52 +0000 (14:02 +0000)]
Merge "Fix layoutlib breakage due to I681b711f6f40a94c25b7acd3a44eb3539486afab"
Adrian Roos [Wed, 2 Jul 2014 14:00:30 +0000 (16:00 +0200)]
Fix layoutlib breakage due to I681b711f6f40a94c25b7acd3a44eb3539486afab
Change-Id: I141f49718c4d538875a68c00101c098fdd7e967b
Marco Nelissen [Tue, 1 Jul 2014 18:10:37 +0000 (18:10 +0000)]
Merge "Make sure we clean up"
Brian Carlstrom [Tue, 1 Jul 2014 22:25:58 +0000 (22:25 +0000)]
Merge "Add profiler type options"
Baligh Uddin [Tue, 1 Jul 2014 18:06:27 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 1 Jul 2014 17:45:41 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7ad5171c74ba22fff8602cf99b6a87f93f0f86a0
Auto-generated-cl: translation import
Andrew Lee [Wed, 2 Jul 2014 00:16:14 +0000 (00:16 +0000)]
Merge "Use proper name for method for setting paused image."
Andrew Lee [Tue, 1 Jul 2014 22:38:26 +0000 (15:38 -0700)]
Use proper name for method for setting paused image.
Change-Id: Ifc3ada4d3b88ae325c2e4edc0c0bdd1b9f836995
Ruben Brunk [Wed, 2 Jul 2014 00:13:34 +0000 (00:13 +0000)]
Merge "camera2: Update camera metadata with legacy mode enum."
Robert Ly [Wed, 2 Jul 2014 00:06:01 +0000 (00:06 +0000)]
am
024d08ec: am
f077e7b7: Merge "docs: add more notification images" into klp-modular-dev
* commit '
024d08ec126c52fc52fbb7242fc2384c13f3a8f6':
docs: add more notification images
Ruben Brunk [Tue, 1 Jul 2014 23:00:26 +0000 (16:00 -0700)]
camera2: Update camera metadata with legacy mode enum.
Bug:
15116722
- Adds enum for a device running in compatibility mode. When running
in compatibility mode, the Camera2 API is emulated using the
deprecated Camera API, and many capabilities will not be supported.
Change-Id: I94f31775699447a82d53b7f2a6f9fbdc0a5afb3f
Ruben Brunk [Mon, 30 Jun 2014 23:45:05 +0000 (16:45 -0700)]
camera2: Fix configured surface check in Legacy shim.
Bug:
15116722
- Switch to checking IBinder pointer when making sure
requested output surface has been configured (same as
the camera service).
- Needed to use TextureView in TestingCamera2.
Change-Id: If8831a9b2f9ec3e81cc8348e067a57cca2d46440
Martijn Coenen [Tue, 1 Jul 2014 23:47:33 +0000 (23:47 +0000)]
Merge "Add new IPC for direct Beam invoke."
Martijn Coenen [Tue, 1 Jul 2014 22:52:19 +0000 (15:52 -0700)]
Add new IPC for direct Beam invoke.
Used by BeamShareActivity when Beam is invoked
through the share menu. Also made these IPCs
one-way as they can run asynchronously.
Bug:
15939863
Change-Id: I7d048947c96c697e6b04bbda2ec3fbf28cccc29b
Sujith Ramakrishnan [Mon, 19 May 2014 22:32:13 +0000 (15:32 -0700)]
Add support for mouse-based text selection.
Incorporate patch from Logitech (donated under AOSP license) to the
framework to add mouse-based text selection to ArrowKeyMovementMethod.
Bug:
14652753
Change-Id: Iab264bb954b72ccedfada763eba8f13ef37a4578
Brian Carlstrom [Tue, 1 Jul 2014 22:47:41 +0000 (22:47 +0000)]
am
bd71bf18: am
8922ddba: am
a6e06889: Merge "Add profiler type options"
* commit '
bd71bf1814ffa484e56aafc1f7c155148eda773f':
Add profiler type options
Chris Craik [Tue, 1 Jul 2014 22:47:36 +0000 (22:47 +0000)]
am
86b55c52: (-s ours) Fix klp-modular-dev-plus-aosp build
* commit '
86b55c52c77bc11ebfe2372e6419a63a1a09be87':
Fix klp-modular-dev-plus-aosp build
Martijn Coenen [Tue, 1 Jul 2014 23:46:40 +0000 (23:46 +0000)]
Merge "Fix NPE in TaskRecord."