Commit Graph

246497 Commits

Author SHA1 Message Date
Adrian Roos
b4cd4650cf Merge "AppError: Change "close" to "close app"" into nyc-dev 2016-06-01 18:14:43 +00:00
Eric Schmidt
556dff9c73 docs: Fixed background optmizations code snippet
Bug: 28341003
Change-Id: I42b26f52ac6f17b684a8a9673b5acd9d9e647a7f
2016-06-01 11:13:57 -07:00
Kevin Hufnagle
b04f86acae 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
2016-06-01 18:10:43 +00:00
Julia Reynolds
88470b5ba2 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
2016-06-01 18:07:18 +00:00
Eric Schmidt
8ef79a9246 Merge "docs: Fixed 'MessageStyle' typo" into mnc-io-docs 2016-06-01 18:04:56 +00:00
Kevin Hufnagle
f5250c5b37 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
2016-06-01 18:02:22 +00:00
TreeHugger Robot
d05a7b5972 Merge "Radio buttons belong in a radio group." into nyc-dev 2016-06-01 18:01:35 +00:00
Dianne Hackborn
970e3f412d 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
2016-06-01 10:55:13 -07:00
Ian Rogers
e3cac08ec6 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
2016-06-01 17:54:22 +00:00
Dianne Hackborn
c43a7f89f7 Fix issue #29058724: Improve JobScheduler API demo
We can now include it in the java docs!

Change-Id: I46b4f58e6220347e4f3f12139c9484d1b964c6a2
2016-06-01 10:48:43 -07:00
TreeHugger Robot
748620e9f0 Merge "Fix call to equals that could never succeed." into nyc-dev 2016-06-01 17:46:03 +00:00
Jason Monk
023b338111 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
2016-06-01 17:37:49 +00:00
Jason Monk
947ef9a717 Merge "QS: Followup to scroll fixes" into nyc-dev
am: 1ceef7c0fa

* commit '1ceef7c0fab15af522f56ade3e08abf559622181':
  QS: Followup to scroll fixes

Change-Id: I0d013329236b9c2ac1a6aa76fba20bcd7e79a4a1
2016-06-01 17:27:21 +00:00
Jason Monk
4215ae0100 Merge "QS: Fix single expanded frame from layout" into nyc-dev 2016-06-01 17:26:53 +00:00
Narayan Kamath
0c4f066f0b 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
2016-06-01 17:20:55 +00:00
Jason Monk
1ceef7c0fa Merge "QS: Followup to scroll fixes" into nyc-dev 2016-06-01 17:20:17 +00:00
Robert Shih
d579be0cf2 Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev 2016-06-01 17:17:00 +00:00
Narayan Kamath
41846b0612 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
2016-06-01 17:14:59 +00:00
Jason Monk
e696c8465b 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
2016-06-01 17:14:54 +00:00
Jason Monk
a58c1a52ac 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
2016-06-01 17:14:50 +00:00
Adrian Roos
72bc1299f2 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
2016-06-01 17:14:47 +00:00
Benjamin Franz
3c826b160c Merge "Add an intent extra to force master clear" into nyc-mr1-dev 2016-06-01 17:13:15 +00:00
Makoto Onuki
eddbfecb8d 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
2016-06-01 10:09:10 -07:00
Mady Mellor
8c475d5b0a Merge "Adds alpha to dimmed backgrounds" into nyc-dev
am: 0d7dbb0f28

* commit '0d7dbb0f282afb43ec2a6a81789379749b2ab054':
  Adds alpha to dimmed backgrounds

Change-Id: I1ae5d761387b9eb9b9eb42c1eea65275b63eed64
2016-06-01 17:06:26 +00:00
Brian Carlstrom
93193135b1 Merge "PackageManager: Don't clear app profiles during system upgrades." into nyc-dev 2016-06-01 17:06:20 +00:00
Jason Monk
8768f68713 Merge "QS: Only put visible tiles in listening state" into nyc-dev 2016-06-01 17:04:26 +00:00
Jason Monk
7b945d8d30 Merge "QS: Protect against crash with no icon" into nyc-dev 2016-06-01 17:04:21 +00:00
Annie Chin
937a991be4 Add createAssistManager() method to SystemUIFactory
Bug: 29045300
Change-Id: Ic912066944e3aed377fcc6af223b585c5ba3840c
2016-06-01 10:03:41 -07:00
TreeHugger Robot
ff39d3ec2f Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev 2016-06-01 17:02:00 +00:00
fionaxu
36befb2dbc 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
2016-06-01 16:55:51 +00:00
Mady Mellor
0d7dbb0f28 Merge "Adds alpha to dimmed backgrounds" into nyc-dev 2016-06-01 16:53:50 +00:00
Chen Xu
c16bc88fc9 Merge "trim and strip html tags for load safe label name" into nyc-dev 2016-06-01 16:47:19 +00:00
Selim Cinek
6ebba59aad 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
2016-06-01 09:41:44 -07:00
Dianne Hackborn
0e443c1320 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
2016-06-01 16:38:12 +00:00
Julia Reynolds
656f98681e Radio buttons belong in a radio group.
Fix for 'multiple buttons selected at once' issue.

Change-Id: Iec54eac699886ed1c7b8afd91382ff9b5750c696
Fixes: 27698976
2016-06-01 12:37:13 -04:00
Ian Rogers
3e4885d333 Fix call to equals that could never succeed.
Caught by Error Prone.
Bug: 29045331

Change-Id: I5901a3ca06e0cc85620f596cfa4178f5ad61d1a7
(cherry picked from commit edf2f5747b)
2016-06-01 16:27:28 +00:00
Dianne Hackborn
438693dd6c Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev 2016-06-01 16:27:06 +00:00
Narayan Kamath
34a6258b2a 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
2016-06-01 16:12:23 +00:00
Bill Yi
ed0e749092 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: a007e877f2  -s ours

* commit 'a007e877f2ed32bd51d6c03e94e20eac94ef4081':
  Import translations. DO NOT MERGE

Change-Id: Ic0ab9aacb14fb341186d8c204f8595cd4087ae6a
2016-06-01 15:35:03 +00:00
Bill Yi
54fd6701ca Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f9a6f33091  -s ours

* commit 'f9a6f33091772b847cf1580021530cdf5004c035':
  Import translations. DO NOT MERGE

Change-Id: I19a2537c01efc8b4e47d64778d675bbed498b782
2016-06-01 15:34:50 +00:00
Bill Yi
725ce2bc3f Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 072150db89  -s ours

* commit '072150db89de9fda26bd2150242ab31f9309ec70':
  Import translations. DO NOT MERGE

Change-Id: Ic78cdd6faee5831d7fa1a62d3cca0c49f1e0ad1a
2016-06-01 15:34:37 +00:00
TreeHugger Robot
a007e877f2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-01 15:26:43 +00:00
TreeHugger Robot
561ae1baca Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-01 15:25:53 +00:00
TreeHugger Robot
f9a6f33091 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-01 15:25:35 +00:00
TreeHugger Robot
713e725b1e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-01 15:25:16 +00:00
Jae Seo
750e48738c Fix documentation for channel types
Bug: 28747244
Change-Id: I492bdb94400b298d7f2e0ccf9054761e60c5a548
2016-06-01 08:24:18 -07:00
David Sehr
a877708286 Installer connection support for dump_profiles
Bug: 28748264
Change-Id: I22322b5a0716a030d9873edcc6dfd7f3ef2d3bca
2016-06-01 08:21:27 -07:00
Jason Monk
f50e88227d 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
2016-06-01 11:19:26 -04:00
TreeHugger Robot
8c228d05e3 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-01 15:16:50 +00:00
TreeHugger Robot
072150db89 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-01 15:15:58 +00:00