OSDN Git Service
Lajos Molnar [Wed, 1 Jun 2016 23:44:11 +0000 (23:44 +0000)]
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
am:
9061b26f1e
* commit '
9061b26f1ecba936f6f912398a9238c21dfa789c':
media: avoid NPE in CodecCapabilities.createFromProfileLevel
Change-Id: I04a42c8f40c8802eeba3ca9e2acc9ef87d4be403
TreeHugger Robot [Wed, 1 Jun 2016 23:29:48 +0000 (23:29 +0000)]
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
Jeff Sharkey [Wed, 1 Jun 2016 23:28:06 +0000 (23:28 +0000)]
Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev
am:
9bdf289f0a
* commit '
9bdf289f0a1874d151684497cb3acd8f96fbd58d':
Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.
Change-Id: I70e69653da834c1ef0e8160cb75826043fffe9e6
TreeHugger Robot [Wed, 1 Jun 2016 23:15:19 +0000 (23:15 +0000)]
Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev
Annie Chin [Wed, 1 Jun 2016 23:13:59 +0000 (23:13 +0000)]
Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev
sreevanis [Wed, 1 Jun 2016 23:03:58 +0000 (23:03 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am:
2d6015b18b am:
441209abc7
am:
82c9562d3c
* commit '
82c9562d3c35df6569fcb04e7cd999fdc11d5d99':
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Change-Id: I5642adf704dec6f6c8522d638504da68c0a80bb0
David Sehr [Wed, 1 Jun 2016 23:03:50 +0000 (23:03 +0000)]
Merge "Installer connection support for dump_profiles" into nyc-dev
am:
7c5bcfc21a
* commit '
7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
Installer connection support for dump_profiles
Change-Id: I6cf3d4fe88577ef1d149c3c4b1c3ee7160d9c7e6
Jeff Sharkey [Wed, 1 Jun 2016 23:03:38 +0000 (23:03 +0000)]
Merge "Release AssetManagers when ejecting storage." into nyc-dev
am:
380f3b12a4
* commit '
380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
Release AssetManagers when ejecting storage.
Change-Id: I54282cfcf53279f87e66cc1263ae9663fe94bc04
Sreevani Sreejith [Wed, 1 Jun 2016 22:54:06 +0000 (22:54 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am:
2d6015b18b
am:
441209abc7
* commit '
441209abc78b8c6bcbcc6b1eb08d2f41219ce344':
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Change-Id: I761a39db759030d4f07cb6e77326fc45db215677
sreevanis [Wed, 1 Jun 2016 22:46:44 +0000 (22:46 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs
am:
2d6015b18b
* commit '
2d6015b18ba0bf52ebe402503c7c66ddae23d8bd':
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Change-Id: I76168738a10e3f379134a88a89667a63d818323d
Makoto Onuki [Wed, 1 Jun 2016 22:44:09 +0000 (22:44 +0000)]
Merge "ShortcutManager: API rename" into nyc-mr1-dev
Chia-I Wu [Wed, 1 Jun 2016 22:31:01 +0000 (22:31 +0000)]
Merge "Fix clipRect transform rounding errors" into nyc-dev
am:
2957d9d604
* commit '
2957d9d604a1d6cda9be33ba75ba1ad7d7185a22':
Fix clipRect transform rounding errors
Change-Id: I61a04e944d607f2271f5184de7504ed04867ef7f
Alex Klyubin [Wed, 1 Jun 2016 22:29:49 +0000 (22:29 +0000)]
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
am:
7fe19060cf
* commit '
7fe19060cfaf09e8756f6488c5f2d6c7bbdd92ea':
Use correct cert chain from PKCS#7 SignedData block.
Change-Id: Ieb7d6d212fe26ffa61aa6714ed8315b2c98bfe3d
David Sehr [Wed, 1 Jun 2016 22:16:03 +0000 (22:16 +0000)]
Merge "Installer connection support for dump_profiles" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 22:14:56 +0000 (22:14 +0000)]
Merge "Release AssetManagers when ejecting storage." into nyc-dev
Chia-I Wu [Wed, 1 Jun 2016 22:11:37 +0000 (22:11 +0000)]
Merge "Fix clipRect transform rounding errors" into nyc-dev
Sreevani Sreejith [Wed, 1 Jun 2016 21:58:20 +0000 (21:58 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs
Alex Klyubin [Wed, 1 Jun 2016 21:55:04 +0000 (21:55 +0000)]
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
Jeff Sharkey [Wed, 1 Jun 2016 21:51:19 +0000 (15:51 -0600)]
Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.
When FLAG_WILL_BE_FOREGROUND is set on a job (such as a download), we
need to treat the job as if it had a foreground service running so
it can continue making forward progress. We already ignore the device
idle state when offering to start the job, so this just avoids the
hiccup of stopping the job only to restart it a minute later.
Bug:
26571724
Change-Id: I348903dd3a7dd7104b0c1bf4310e2a48655d2588
Ta-wei Yen [Wed, 1 Jun 2016 21:49:45 +0000 (21:49 +0000)]
Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev
sreevanis [Wed, 1 Jun 2016 19:37:12 +0000 (12:37 -0700)]
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Bug:
29071043
Change-Id: Iac88710234277210997150e2a6725322928276c3
Jeff Sharkey [Thu, 26 May 2016 17:56:57 +0000 (11:56 -0600)]
Release AssetManagers when ejecting storage.
When ejecting a storage device, the system process needs to rapidly
release any open FDs to prevent itself from being killed by vold.
This change examines all ResourceImpls cached inside the system
process and evicts any that reference the storage device being
ejected. (ResourcesManager will gladly recreate any evicted entries
when asked again in the future.)
Also replace broken use of WeakHashMap, since we want the values to
be weak references, not the keys.
Bug:
28867548
Change-Id: Ib9cfc66497149b6d3f8d49213e9779408a331d2a
Julia Reynolds [Wed, 1 Jun 2016 20:46:09 +0000 (20:46 +0000)]
Merge "Only call finish on operations that have started." into nyc-dev
am:
6df8a9a89f
* commit '
6df8a9a89fc87649595926592bf895768c861b68':
Only call finish on operations that have started.
Change-Id: I59f9c9a74cf2beba8f14906820b65ae8d22ed8ce
Erik Wolsheimer [Wed, 1 Jun 2016 20:39:44 +0000 (20:39 +0000)]
Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev
Julia Reynolds [Wed, 1 Jun 2016 20:37:07 +0000 (20:37 +0000)]
Merge "Only call finish on operations that have started." into nyc-dev
Ta-wei Yen [Wed, 1 Jun 2016 19:38:10 +0000 (12:38 -0700)]
Add support for source-specific VVM state in VoicemailContract
Negative values of the field CONFIGURATION_STATE, DATA_CHANNEL_STATE,
NOTIFICATION_CHANNEL_STATE is reserved to voicemail source for its'
specific errors. SOURCE_TYPE can be set to help interpret the error
codes.
Typically the OMTP visual voicemail source will set SOURCE_TYPE to the
same value of visual voicemail type set with
CarrierConfigManager.KEY_VVM_TYPE_STRING, such as "vvm_type_omtp".
For example, the OMTP visual voicemail source could set
CONFIGURAITON_STATE to -5 and SOURCE_TYPE to "vvm_type_foo", and the
client can find -5 for "vvm_type_foo" means "PIN is not set by the user"
+ Field SOURCE_TYPE
+ Docs to specify negative values are reserved for the source
- Removed hidden helper method SetStatus() and SetQuota(). The 'ignore'
value is conflicting with reserved values.
Bug:
26944391
Change-Id: I0930f684dadd25ae94e3ea68a7658c7ae423e3e3
Adrian Roos [Wed, 1 Jun 2016 19:59:13 +0000 (19:59 +0000)]
Merge "Fix DirectReply bug when reapply fails" into nyc-dev
am:
6510bdeada
* commit '
6510bdeada8b670b1c9863fdb7b518e161105c09':
Fix DirectReply bug when reapply fails
Change-Id: Ie8e1df9485816e4ae11f1de37d352efd466eafd2
Annie Chin [Wed, 1 Jun 2016 19:52:21 +0000 (19:52 +0000)]
Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev
Chong Zhang [Wed, 1 Jun 2016 19:47:30 +0000 (19:47 +0000)]
Merge "Do not sanitize override config for fullscreen" into nyc-dev
am:
65f1973ba9
* commit '
65f1973ba9f91c6727a7131b31b6c563cd880ee0':
Do not sanitize override config for fullscreen
Change-Id: I65d2c03274f8b78d9a041ff1306f33ee88b9942b
Adrian Roos [Wed, 1 Jun 2016 19:41:46 +0000 (19:41 +0000)]
Merge "Fix DirectReply bug when reapply fails" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 19:37:43 +0000 (19:37 +0000)]
Merge "Fix issue #
29058724: Improve JobScheduler API demo" into nyc-dev
am:
61721ee3d7
* commit '
61721ee3d7b7d55a0535584449b49143b1c2e039':
Fix issue #
29058724: Improve JobScheduler API demo
Change-Id: Icbee904b90fe52afaa8074b3165e4618d1fae526
Dianne Hackborn [Wed, 1 Jun 2016 19:36:46 +0000 (19:36 +0000)]
Merge "Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev
am:
3e05055af7
* commit '
3e05055af775f9539d832b1191ae2ee9bc4acf21':
Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController
Change-Id: I724497be1fca40530f4c7841cf1f5392b582ca4f
Chong Zhang [Wed, 1 Jun 2016 19:34:02 +0000 (19:34 +0000)]
Merge "Do not sanitize override config for fullscreen" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 19:29:41 +0000 (19:29 +0000)]
Merge "Fix issue #
29058724: Improve JobScheduler API demo" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 19:26:07 +0000 (19:26 +0000)]
Merge "Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev
Adrian Roos [Wed, 1 Jun 2016 18:34:58 +0000 (11:34 -0700)]
Fix DirectReply bug when reapply fails
RemoteInputView failed to notice updates where the
reapply failed, causing it to reopen upon success.
Change-Id: I4fdd4d3240da6e38878d281fbf8c654ee9a682c3
Fixes:
29057180
Chong Zhang [Wed, 1 Jun 2016 19:20:10 +0000 (12:20 -0700)]
Do not sanitize override config for fullscreen
bug:
29063336
Change-Id: I65c5d635133a6b3791ce1aef63547f8d38ca24b5
Selim Cinek [Wed, 1 Jun 2016 19:15:29 +0000 (19:15 +0000)]
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev
am:
42621023cf
* commit '
42621023cfac084b8c74fd4d362bc2c64d61674e':
Fixes a few bugs on the keyguard with font density changes
Change-Id: Ia5ab8a7269eb3bfcb88bdfc98926bdbd0bff0af8
Selim Cinek [Wed, 1 Jun 2016 19:03:40 +0000 (19:03 +0000)]
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev
Felipe Leme [Wed, 1 Jun 2016 18:59:23 +0000 (18:59 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev
am:
31e3b14d6a
* commit '
31e3b14d6a613934a8c44223fd77aff2ecc5c5a5':
Move DownloadsManager to permanent whitelist.
Change-Id: Ia13db0b6db0995047353a9453d9132bcb4e9b34b
Jorim Jaggi [Wed, 1 Jun 2016 18:50:23 +0000 (18:50 +0000)]
Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev
am:
13d534e7f2
* commit '
13d534e7f2419219e3e26e582b1f6f5ae79be408':
Don't crash activity manager when supplying invalid URI
Change-Id: I1f87d39822fe9a938b511a2b55fda2338311290e
TreeHugger Robot [Wed, 1 Jun 2016 18:49:41 +0000 (18:49 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev
Julia Reynolds [Wed, 1 Jun 2016 18:17:58 +0000 (14:17 -0400)]
Only call finish on operations that have started.
Change-Id: I77d10913a68be529ea2c5a3f2a53ad91a4a41f47
Fixes:
29069613
TreeHugger Robot [Wed, 1 Jun 2016 18:37:34 +0000 (18:37 +0000)]
Merge "Don't crash activity manager when supplying invalid URI" into nyc-dev
Eric Schmidt [Wed, 1 Jun 2016 18:36:44 +0000 (18:36 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am:
8ef79a9246 am:
51500a1c5a
am:
28ed18877b
* commit '
28ed18877bc9cc040e8cea678f7a7782426c1dc9':
docs: Fixed 'MessageStyle' typo
Change-Id: I784af12e3d721d4af9fa747e794677c17b7434f6
Adrian Roos [Wed, 1 Jun 2016 18:27:55 +0000 (18:27 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev
am:
b4cd4650cf
* commit '
b4cd4650cfd634df75e9e23f9585a756823bd012':
AppError: Change "close" to "close app"
Change-Id: I8d4a7a2517321551a057776ecf30dc35c6168e4d
Eric Schmidt [Wed, 1 Jun 2016 18:25:35 +0000 (18:25 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am:
8ef79a9246
am:
51500a1c5a
* commit '
51500a1c5ad6ce1bde1f8966f9835b42d9419a95':
docs: Fixed 'MessageStyle' typo
Change-Id: I87addb7b46d0985b2cbfc92e6f0f9a7d44ce8963
Kevin Hufnagle [Wed, 1 Jun 2016 18:19:48 +0000 (18:19 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am:
d5368b8185 am:
f5250c5b37
am:
b04f86acae
* commit '
b04f86acae9f5a0101e997a2dde08342c92b180f':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: Id72cdfad947a1a8d15cd190de8604f76fbf5a866
Eric Schmidt [Wed, 1 Jun 2016 18:16:17 +0000 (18:16 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs
am:
8ef79a9246
* commit '
8ef79a9246eba129c22e5d54654ecb85414edf22':
docs: Fixed 'MessageStyle' typo
Change-Id: Ie9bfc94d89f388763e360841ae129d214156d6d2
Adrian Roos [Wed, 1 Jun 2016 18:14:41 +0000 (18:14 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev
Kevin Hufnagle [Wed, 1 Jun 2016 18:10:43 +0000 (18:10 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am:
d5368b8185
am:
f5250c5b37
* commit '
f5250c5b372ce3246bdc1e67212dc1fc7ca468ad':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: I55b4b106e27d642878f8c1050c82594a21ff4574
Julia Reynolds [Wed, 1 Jun 2016 18:07:18 +0000 (18:07 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev
am:
d05a7b5972
* commit '
d05a7b5972cb06f711cc8cfa66efa9f0f6d901a5':
Radio buttons belong in a radio group.
Change-Id: If12173e67797ba105ea40475e3ad9e3061d592f9
Eric Schmidt [Wed, 1 Jun 2016 18:04:55 +0000 (18:04 +0000)]
Merge "docs: Fixed 'MessageStyle' typo" into mnc-io-docs
Kevin Hufnagle [Wed, 1 Jun 2016 18:02:22 +0000 (18:02 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest.
am:
d5368b8185
* commit '
d5368b81857a04879ed55be2a67f034cce4e5094':
cherry-pick: docs: Added note that <application> at end of manifest.
Change-Id: Ie8343e36136e7f3829bf92d7ac26488faf01b489
TreeHugger Robot [Wed, 1 Jun 2016 18:01:34 +0000 (18:01 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 17:55:13 +0000 (10:55 -0700)]
Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController
Make sure the core parts of JobSchedulerService are initialized
before we start creating the controllers.
Change-Id: I497df12f7e6fbd93581291ec691c4b45104d67d0
Ian Rogers [Wed, 1 Jun 2016 17:54:22 +0000 (17:54 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev
am:
748620e9f0
* commit '
748620e9f03dd66bfed38d91d32b35d79684173b':
Fix call to equals that could never succeed.
Change-Id: I82af33ea3b93c4017c845b1f791ebee403bffe21
Dianne Hackborn [Wed, 1 Jun 2016 17:48:43 +0000 (10:48 -0700)]
Fix issue #
29058724: Improve JobScheduler API demo
We can now include it in the java docs!
Change-Id: I46b4f58e6220347e4f3f12139c9484d1b964c6a2
TreeHugger Robot [Wed, 1 Jun 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:37:49 +0000 (17:37 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
am:
4215ae0100
* commit '
4215ae01002f1217587698d24636870ace4a50f5':
QS: Fix single expanded frame from layout
Change-Id: Id3571cce3d2b4ecd01e5ea8bf1f093e08952a757
Jason Monk [Wed, 1 Jun 2016 17:27:21 +0000 (17:27 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
am:
1ceef7c0fa
* commit '
1ceef7c0fab15af522f56ade3e08abf559622181':
QS: Followup to scroll fixes
Change-Id: I0d013329236b9c2ac1a6aa76fba20bcd7e79a4a1
Jason Monk [Wed, 1 Jun 2016 17:26:52 +0000 (17:26 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 17:20:55 +0000 (17:20 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am:
d579be0cf2
* commit '
d579be0cf234a35273f79676c102b8bd80e071dc':
Fix deadlock when showing subtitles MediaPlayer
Change-Id: Ib1c57040e723d534df8243ad48479e9b554a74d1
Jason Monk [Wed, 1 Jun 2016 17:20:16 +0000 (17:20 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
Robert Shih [Wed, 1 Jun 2016 17:16:59 +0000 (17:16 +0000)]
Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 17:14:59 +0000 (17:14 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am:
93193135b1
* commit '
93193135b184a2f1c7518d8beeff7c51b2880606':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: I1eddbe894b3f4a2583973a98f3dc0d8adf8af16c
Jason Monk [Wed, 1 Jun 2016 17:14:54 +0000 (17:14 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev
am:
8768f68713
* commit '
8768f687138510b90dd997e41720ad7d88637b49':
QS: Only put visible tiles in listening state
Change-Id: I437e2841841d6b54ba5c747052a885109b7e8bc4
Jason Monk [Wed, 1 Jun 2016 17:14:50 +0000 (17:14 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev
am:
7b945d8d30
* commit '
7b945d8d30a6e3978b50d5952539279a71148eca':
QS: Protect against crash with no icon
Change-Id: I6e4fedcad9d788fcb2b8c803e905671bfff3f561
Adrian Roos [Wed, 1 Jun 2016 17:14:47 +0000 (17:14 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
am:
ff39d3ec2f
* commit '
ff39d3ec2fa773a50bbd069a40570767c80fd404':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: I96b1992f69d94f24a63784c1c2d954b91ab9570d
Benjamin Franz [Wed, 1 Jun 2016 17:13:14 +0000 (17:13 +0000)]
Merge "Add an intent extra to force master clear" into nyc-mr1-dev
Makoto Onuki [Wed, 1 Jun 2016 00:04:34 +0000 (17:04 -0700)]
ShortcutManager: API rename
The words "title" and "text" implies that "text" is a secondary label
that's shown with the title, but it turned out the launcher would show
only one of those depending on how much space it has.
So now we change them to "shortLabel" and "longLabel"
Note we're only changing the API surface -- in order to mimimize
the impact to the code, internally we'll keep using the old names.
- Also remove "shortcutRank" while I'm here -- it should be implied
from the order of the XML elements.
Bug
29057378
Change-Id: I3203f63b0318c7462c1c61fef43cf9755fa8c008
Mady Mellor [Wed, 1 Jun 2016 17:06:26 +0000 (17:06 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
am:
0d7dbb0f28
* commit '
0d7dbb0f282afb43ec2a6a81789379749b2ab054':
Adds alpha to dimmed backgrounds
Change-Id: I1ae5d761387b9eb9b9eb42c1eea65275b63eed64
Brian Carlstrom [Wed, 1 Jun 2016 17:06:19 +0000 (17:06 +0000)]
Merge "PackageManager: Don't clear app profiles during system upgrades." into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:04:24 +0000 (17:04 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:04:20 +0000 (17:04 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev
Annie Chin [Tue, 31 May 2016 17:14:23 +0000 (10:14 -0700)]
Add createAssistManager() method to SystemUIFactory
Bug:
29045300
Change-Id: Ic912066944e3aed377fcc6af223b585c5ba3840c
TreeHugger Robot [Wed, 1 Jun 2016 17:01:58 +0000 (17:01 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
fionaxu [Wed, 1 Jun 2016 16:55:51 +0000 (16:55 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev
am:
c16bc88fc9
* commit '
c16bc88fc99a6446c77d0b075f242c042bb31ded':
trim and strip html tags for load safe label name
Change-Id: Ic79f077813fcf2124fe1cbf031cb4e0770a02a51
Mady Mellor [Wed, 1 Jun 2016 16:53:49 +0000 (16:53 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
Chen Xu [Wed, 1 Jun 2016 16:47:17 +0000 (16:47 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev
Selim Cinek [Tue, 31 May 2016 22:28:28 +0000 (15:28 -0700)]
Fixes a few bugs on the keyguard with font density changes
The reinflation of the system icons was not working correctly
and all the paddings were of.
Also the affordance icons were outdated and had to be reloaded.
Change-Id: I3cf338d33a82c8be94d01561d7b7d9a37a563ad9
Fixes:
28968657
Fixes:
28672410
Dianne Hackborn [Wed, 1 Jun 2016 16:38:12 +0000 (16:38 +0000)]
Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev
am:
438693dd6c
* commit '
438693dd6cc4e3fe2ffb336d551c0d69e9546102':
Work on issue #
28942589: Tune job scheduler
Change-Id: I8264ce4204762358ccbf893e7846434eed258a22
Julia Reynolds [Wed, 1 Jun 2016 15:37:29 +0000 (11:37 -0400)]
Radio buttons belong in a radio group.
Fix for 'multiple buttons selected at once' issue.
Change-Id: Iec54eac699886ed1c7b8afd91382ff9b5750c696
Fixes:
27698976
Ian Rogers [Mon, 30 May 2016 22:16:30 +0000 (15:16 -0700)]
Fix call to equals that could never succeed.
Caught by Error Prone.
Bug:
29045331
Change-Id: I5901a3ca06e0cc85620f596cfa4178f5ad61d1a7
(cherry picked from commit
edf2f5747b9adc3399b59eb478c94641b1021222)
Dianne Hackborn [Wed, 1 Jun 2016 16:27:04 +0000 (16:27 +0000)]
Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 14:18:14 +0000 (15:18 +0100)]
PackageManager: Don't clear app profiles during system upgrades.
They don't need to be cleared and will remain valid as long as
the application itself hasn't changed.
bug:
28998083
bug:
29067239
Change-Id: I2e4a4ee1b168da81073b8e70b12918db592fe691
Bill Yi [Wed, 1 Jun 2016 15:35:03 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a007e877f2 -s ours
* commit '
a007e877f2ed32bd51d6c03e94e20eac94ef4081':
Import translations. DO NOT MERGE
Change-Id: Ic0ab9aacb14fb341186d8c204f8595cd4087ae6a
Bill Yi [Wed, 1 Jun 2016 15:34:50 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
f9a6f33091 -s ours
* commit '
f9a6f33091772b847cf1580021530cdf5004c035':
Import translations. DO NOT MERGE
Change-Id: I19a2537c01efc8b4e47d64778d675bbed498b782
Bill Yi [Wed, 1 Jun 2016 15:34:37 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
072150db89 -s ours
* commit '
072150db89de9fda26bd2150242ab31f9309ec70':
Import translations. DO NOT MERGE
Change-Id: Ic78cdd6faee5831d7fa1a62d3cca0c49f1e0ad1a
TreeHugger Robot [Wed, 1 Jun 2016 15:26:42 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:52 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:34 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:14 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
David Sehr [Tue, 24 May 2016 22:25:23 +0000 (15:25 -0700)]
Installer connection support for dump_profiles
Bug:
28748264
Change-Id: I22322b5a0716a030d9873edcc6dfd7f3ef2d3bca
Jason Monk [Wed, 1 Jun 2016 15:19:26 +0000 (11:19 -0400)]
QS: Fix single expanded frame from layout
During animation it was resetting the QS expansion on layout which
made a frame of fully expanded appear.
Bug:
28008271
Change-Id: I6ac44cb918bdf53da0653332eabf0f4e96779cff
TreeHugger Robot [Wed, 1 Jun 2016 15:16:49 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:15:57 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Benjamin Franz [Thu, 26 May 2016 13:24:29 +0000 (14:24 +0100)]
Add an intent extra to force master clear
Currently, if a priv-app sends ACTION_MASTER_CLEAR, whilst
DISALLOW_FACTORY_RESET is set, the factory reset is blocked. This CL
introduces a new extra for master clear that let's the priv-app bypass
the user restriction.
Bug:
28689894
Change-Id: I4bf979a3826454e977f1abff4562f85c8d0eec4a
Jason Monk [Wed, 1 Jun 2016 14:25:01 +0000 (10:25 -0400)]
QS: Protect against crash with no icon
Change-Id: I65d594c9bf15190418d96cc6d2c426df00fed212
Fixes:
28941131
Chris Banes [Wed, 1 Jun 2016 13:53:58 +0000 (13:53 +0000)]
Fix action mode animation on recreations - framework edition
am:
e65b3fbb63
* commit '
e65b3fbb63b4b6937fede2e4b889c0a51a881358':
Fix action mode animation on recreations - framework edition
Change-Id: I19274b7ede1fae09deb915807c35a478caf939ee