Commit Graph

6088 Commits

Author SHA1 Message Date
Narayan Kamath
3a00b69702 Remove unnecessary allocation+unboxing of objects.
am: a09b4d2

* commit 'a09b4d2a611a7606e8fc8c73a24bd941b6fc173f':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Idfffa8fad0f6bcffa954752910524bdc879d65b7
2016-04-18 10:31:37 +00:00
Narayan Kamath
a09b4d2a61 Remove unnecessary allocation+unboxing of objects.
Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
2016-04-18 09:55:59 +01:00
Jorim Jaggi
c6eca1da44 Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev
am: b3e26a9

* commit 'b3e26a9b414da986963bade0e18a80a20851c74a':
  Fix wrong transition when dock minimized and docked app launched

Change-Id: Ie1982a5e495794e8624c93e970896445579fa98f
2016-04-15 20:54:37 +00:00
Jorim Jaggi
681fc7b267 Fix wrong transition when dock minimized and docked app launched
When having an app docked and then going home, and then launching
the app from the homescreen, we had a wrong transition because
getTopMost task was already set to the launched app, because
getRunningTasks doesn't exclude the docked stack. Instead of adding
flags for getRunningTasks, which sounds risky, we just pass a "force"
value when we launch recents in this state.

Bug: 27154882
Change-Id: Iee4512fed13115dbbe8b74413ff1fa9b87afa0ef
2016-04-15 19:23:05 +00:00
Benjamin Franz
f1320d1d7f Merge "Maybe decrypt user when quiet mode is disabled" into nyc-dev
am: 2f4c229

* commit '2f4c2299c7ef4b9d604b9833c790a7afd2ed75af':
  Maybe decrypt user when quiet mode is disabled

Change-Id: I0d84934a978205c283b846b7412446a064aac01c
2016-04-15 14:58:54 +00:00
Benjamin Franz
f02420c5e1 Maybe decrypt user when quiet mode is disabled
When quiet mode is disabled for a user and that user is not currently
decrypted, we show a confirm credentials screen to trigger decryption
of that user. Only if that was successful, do we actually disable quiet
mode.

Bug: 27764124
Change-Id: Ib1f649194d89e225dad62c14f3ddba1fa3d79da2
2016-04-15 14:12:41 +01:00
Andrii Kulian
021af1800c Merge "Remember task which is being locked" into nyc-dev
am: 5981b8c

* commit '5981b8c2e8f6363d1f3bf09e7f1b3b5fb9a3846a':
  Remember task which is being locked

Change-Id: Id672304edaa6a02777e79fe6b4fcdd64e3c5f7e8
2016-04-15 04:37:48 +00:00
Andrii Kulian
5981b8c2e8 Merge "Remember task which is being locked" into nyc-dev 2016-04-15 04:32:57 +00:00
Andrii Kulian
0f051f5abd Remember task which is being locked
We need to remember task which requested to be locked
because we can accidentally lock another task after
user interacts with pinning request dialog.

Bug: 27876860
Change-Id: Ie8e607df4380dd33ea9b3474afc247b02e31de07
2016-04-14 19:26:18 -07:00
Joe Onorato
ef9bc11ddb Merge "Add support for null tag names from apps." into nyc-dev
am: 9a916e5

* commit '9a916e5602908f579ac846680270677c5a89e5a4':
  Add support for null tag names from apps.

Change-Id: Iff0ce8b4faeb935e70ce9bef6fba322707e5aa7d
2016-04-14 21:17:03 +00:00
Joe Onorato
9a916e5602 Merge "Add support for null tag names from apps." into nyc-dev 2016-04-14 21:10:16 +00:00
Oren Blasberg
672d0e762d Merge "Don\'t show icons in overlay popup menus." into nyc-dev
am: 203222e

* commit '203222ea6077c1e0155971fee1cb6917b8055117':
  Don't show icons in overlay popup menus.

Change-Id: I7abab9b6fb52ca17a811a0917f4955db9c9393e7
2016-04-14 20:46:36 +00:00
Oren Blasberg
203222ea60 Merge "Don't show icons in overlay popup menus." into nyc-dev 2016-04-14 20:34:54 +00:00
Amith Yamasani
bb541ffe5e Merge "Multi-window assist callback" into nyc-dev
am: 0d723a2

* commit '0d723a2a4d83db5f01aa5a21f3cbd9d2b608bced':
  Multi-window assist callback

Change-Id: I4a0564800bb4c7a19a415ff109836827c4feb0e7
2016-04-14 19:12:57 +00:00
Amith Yamasani
0d723a2a4d Merge "Multi-window assist callback" into nyc-dev 2016-04-14 19:06:40 +00:00
Joe Onorato
388fc336b3 Add support for null tag names from apps.
For Wakelocks and syncs there is no requirement that an app actually
supply a tag/name.  Jobs will always have system-supplied tags.

Bug: 26276001
Change-Id: Ie3b8e48a395de1506a2f15d5b9c9eab726bc6d0a
2016-04-14 11:46:56 -07:00
Oren Blasberg
3610d06239 Don't show icons in overlay popup menus.
This was a "regression" in CascadingMenuPopup specifically.
We now check for the overflow case and don't show icons.
This preserves the behavior from Marshmallow.

Bug: 28026351
Change-Id: Ifbc9a20b0dadd19ef7b727023b1b0cfa45ebf993
2016-04-14 11:14:09 -07:00
Alan Viverette
3b049bb17f Merge "Add scroll indicators to resolver list" into nyc-dev
am: 8bb7ad5

* commit '8bb7ad598560fda42ec256f02ba69cf54b433a85':
  Add scroll indicators to resolver list

Change-Id: I8b6dbcd2ff106bf83945084b1a4956c094234240
2016-04-14 01:49:33 +00:00
Alan Viverette
8bb7ad5985 Merge "Add scroll indicators to resolver list" into nyc-dev 2016-04-14 01:45:35 +00:00
Amith Yamasani
e8222e551f Multi-window assist callback
Introducing a new callback in VoiceInteractionSession to
provide assist data for additional activities in the
foreground in a multiwindow setup.

PIP, docked windows and free-form windows (top-most)
will be queried for assist data and passed through the
new API to the Voice Interaction service.

Bug: 27718385

Change-Id: Ib4427c304611b75c2078dcb54f1f7e47ae7d9cfa
2016-04-13 17:12:29 -07:00
Adrian Roos
69df48c446 Merge "StrongAuthTracker: Don\'t rely on USER_PRESENT" into nyc-dev
am: c142a8c

* commit 'c142a8c43fa7d1b6c9d797e044060755d9ecfcd6':
  StrongAuthTracker: Don't rely on USER_PRESENT

Change-Id: Id81115f8311e797f0b7d8a435226ea5862a9550a
2016-04-14 00:08:08 +00:00
TreeHugger Robot
c142a8c43f Merge "StrongAuthTracker: Don't rely on USER_PRESENT" into nyc-dev 2016-04-14 00:04:54 +00:00
Adrian Roos
4ab7e595a5 StrongAuthTracker: Don't rely on USER_PRESENT
USER_PRESENT is sent via the background queue. A delay
there can cause us not to recognize that the user has
unlocked and prompt for the credential again, when trust
or fingerprint would be sufficient.

Also removes an obsolete reference to USER_PRESENT from
TrustManagerService.

Change-Id: Ie8d1a180170df5f0c8f9e71660504fd71eeacd99
Fixes: 27830458
2016-04-13 15:38:18 -07:00
Henrik Engström
7d7a075ec9 Merge "Make ResolverActivity respect selector intent when making filters" into nyc-dev
am: 651e09f

* commit '651e09fdc1b4c26dc7661e1ab127276656ece041':
  Make ResolverActivity respect selector intent when making filters

Change-Id: I4bf1b16e6afb07c7c9bd0172539efa32dc14724e
2016-04-13 21:46:07 +00:00
Adam Powell
651e09fdc1 Merge "Make ResolverActivity respect selector intent when making filters" into nyc-dev 2016-04-13 21:35:33 +00:00
Wale Ogunwale
361124ef08 Merge changes Ieefeb843,Ic2a94b09 into nyc-dev
am: 3fb1c81

* commit '3fb1c81394f98b025b488774916b7580f9e31dab':
  Update surface insets on window elevation changes.
  Fixed bug with cropping out drop shadow for pinned stack.

Change-Id: If788ed4af5292b76576c7abd728633f20cc6eb93
2016-04-13 17:07:38 +00:00
Wale Ogunwale
3fb1c81394 Merge changes Ieefeb843,Ic2a94b09 into nyc-dev
* changes:
  Update surface insets on window elevation changes.
  Fixed bug with cropping out drop shadow for pinned stack.
2016-04-13 16:59:36 +00:00
Henrik Engström
3277cf1ea4 Make ResolverActivity respect selector intent when making filters
When the ResolverActivity makes a filter after an intent is chosen,
either for remembering last used or an "always use" choice for the
user it doesn't consider the selector in the intent if present.

This means that when a resolver activity is launched for an intent
with a selector, the selector is used for resolving preferred
activities, and for populating the list, but when the same intent
is sent again it doesn't match the filter created by the previous
ResolverActivity.

This in turn means that the user will get another ResolverActivity
even if "Always Use" was chosen the last time.

Bug: 28129216

Change-Id: I29be7010e7c890caf9789673b3c3f821ba362761
2016-04-13 08:45:29 -07:00
Alan Viverette
b0e22ecf7d Add scroll indicators to resolver list
Also reformats resolver list XML.

Bug: 27431395
Change-Id: I582448a01747b29fc6ac61dd80e27e6679507a81
2016-04-13 10:23:35 -04:00
Philip P. Moltmann
d516393865 Merge "Set label for links to resolver activities." into nyc-dev
am: d1b8d6d

* commit 'd1b8d6d342d049e00d9a304c291c6c024aa3c0a0':
  Set label for links to resolver activities.

Change-Id: Iaf7e59bdca4a25b347661bed7b927b8100dcac96
2016-04-13 00:17:54 +00:00
TreeHugger Robot
d1b8d6d342 Merge "Set label for links to resolver activities." into nyc-dev 2016-04-13 00:12:39 +00:00
Philip P. Moltmann
f8173ca8ac Set label for links to resolver activities.
Also: Add specific labels for capture-image-intent.

Fixes: 20134921
Change-Id: I3678def1089512a8340f19110645a03379c26cee
2016-04-12 15:44:00 -07:00
Joe Onorato
f35f061c50 Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev
am: 5dc3c67

* commit '5dc3c674a2635179d17e96af8fb248142e03b87e':
  Add some tests for procstats, and fix some bugs that the tests uncovered.

Change-Id: I53ee3334f58db4a0904370fc4f2f1b6b29365020
2016-04-12 22:22:52 +00:00
Andreas Gampe
0c322abb25 Frameworks/base: Add no-thread marking to zygote
am: 1ef8aef

* commit '1ef8aef260c19236be023c429b41a46e7f5da8b0':
  Frameworks/base: Add no-thread marking to zygote

Change-Id: I8ac948e3c107324ce18e44bdff74fce1bd97fc6c
2016-04-12 22:22:43 +00:00
Adrian Roos
28d6762456 Merge "Notification MessagingStyle: Add handset views" into nyc-dev
am: 4db2f1f

* commit '4db2f1f6020a82012bcd3141a22bd59e0baed1d5':
  Notification MessagingStyle: Add handset views

Change-Id: Ib1971c6c1d8aa07ef586073bf2316f2b3b18bfab
2016-04-12 22:22:15 +00:00
TreeHugger Robot
5dc3c674a2 Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev 2016-04-12 21:38:10 +00:00
Andreas Gampe
1ef8aef260 Frameworks/base: Add no-thread marking to zygote
Use ZygoteHooks code to mark zygote initialization to not be
allowed to create threads. This is helpful when new classes are
found to be used by apps but cannot be preloaded as they spawn
threads.

Bug: 27248115
Change-Id: I1dc3620d9e7d0054c672b993d89459fc4b353dfc
2016-04-12 21:04:35 +00:00
Joe Onorato
65adfeecd2 Add some tests for procstats, and fix some bugs that the tests uncovered.
Bug: 27045736
Change-Id: Ia910730c5a3a899c89aa63dd7ab48be62cf9cfef
2016-04-12 13:13:41 -07:00
Jorim Jaggi
90fde3948d Don\'t remove background when resizing
am: 971d8e6

* commit '971d8e6399d556302b52a92dd29abf44830a587c':
  Don't remove background when resizing

Change-Id: I145e0843c11bfbcd61952e24d5fb0fd81f42c2a1
2016-04-12 18:54:02 +00:00
Adrian Roos
c1a80b08f0 Notification MessagingStyle: Add handset views
Bug: 27250207
Change-Id: I499cf2beaeeb34f0f189815fc0911f3b8954bd50
2016-04-12 11:52:49 -07:00
Jorim Jaggi
971d8e6399 Don't remove background when resizing
This leads to flickers, as we should not draw in a translucent way
if we didn't specify that our window is translucent, because the
renderer has some about translucency.

Instead, we should clip the backdrop content by the inverse of the
content clip rect, which is not yet implemented.

Bug: 28009524
Change-Id: Ia3f54fb83997ace863e78ff1cbe45cfb64f92f26
2016-04-12 18:14:14 +00:00
Yuichi Biwa
5986b16057 Merge "Fix: ResolverActivity sometimes cannot update the last chosen activity" into nyc-dev
am: f763ea3

* commit 'f763ea3b0573a53543f0031a81bb48d99679977f':
  Fix: ResolverActivity sometimes cannot update the last chosen activity

Change-Id: I9a4fccdae9071de2b28a17408eb34c8103a01b78
2016-04-12 16:34:54 +00:00
Yuichi Biwa
66e495e647 Fix: ResolverActivity sometimes cannot update the last chosen activity
Symptom:
Calling startActivity() with an implicit intent,
ResolverActivity displays preferred activity candidates.
At first user selects one of them as "JUST ONCE".
And next, the last one is shown again on the top with "JUST ONCE" and
"ALWAYS".

But even if user selects another ones except top with "JUST ONCE".
Next time, the last one is not shown on the top.
Instead of that, first one still remain on the top.

It means that user can't select activities as "ALWAYS"
except first one.

Root cause:
The implicit intent has a URI but not MIME type.
In this case, Intent#resolveTypeIfNeeded returns "null".
So MIME type is not passed to PackageManagerService.
That's why this issue happens.

Change-Id: I87b6da9c5d8b47e071bbedf9f7d5f3ecea730875
2016-04-12 09:18:20 -07:00
Mihai Nita
e66546c268 Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev
am: e544d40

* commit 'e544d408c06fe3e6bc3b237f718b56f03f079f29':
  Use DisplayNameWithDialect only for some locales

Change-Id: I0611e41a010c6b5c4a937c8c5de501d3749cd438
2016-04-12 05:03:34 +00:00
Mihai Niță
e544d408c0 Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev 2016-04-12 04:56:05 +00:00
Mihai Nita
1b2e7adc88 Use DisplayNameWithDialect only for some locales
Although DisplayNameWithDialect seems to return friendlier, more
"casual" names (e.g. "American English"), the result was inconsistent,
and (at times) debatable. And since this setting affects not only
the language of the translation, but a locale, names like "Flemish"
kind of lost the whole "locale / location" idea.

So we revert to use DisplayName for all but a few selected locales
(that we verified are better with the "dialect" form).

Bug: 27704583
Change-Id: I587081da1293cccac3cdabcd188a9b8160c233ea
2016-04-11 16:13:54 -07:00
Yohei Yukawa
a8bee2d763 Merge "Shift+Meta+Space should reverse-rotate subtypes part 2." into nyc-dev
am: 9dd39f8

* commit '9dd39f8bcc7f6f12e2e65cf2fcdf27cd169b5268':
  Shift+Meta+Space should reverse-rotate subtypes part 2.

Change-Id: I2b4d2c4856b1182d374163b10a3f614112d4472d
2016-04-11 22:37:43 +00:00
Yohei Yukawa
b1e2f4fc3a Shift+Meta+Space should reverse-rotate subtypes part 2.
This CL adds JavaDoc to clarify what previous CL [1] wanted to do.
No behavior change is intended in this CL.

 [1]: I3694edd80be6dfe18b90360e24ae4d451b331928
      d39ae85482

Bug: 25753404
Bug: 28103839
Change-Id: I246223c0856382d68323f22987b998cd1613e98c
2016-04-11 13:38:36 -07:00
Alan Viverette
435d55e66b Merge "Revert "Add scroll indicators to resolver list layouts"" into nyc-dev
am: 76961cc

* commit '76961ccc52c5cb9d73336782be2d74c23600c5a3':
  Revert "Add scroll indicators to resolver list layouts"

Change-Id: If7517611b7130e1c0995f14ffb0fff052d23a2e1
2016-04-11 18:07:09 +00:00
Alan Viverette
76961ccc52 Merge "Revert "Add scroll indicators to resolver list layouts"" into nyc-dev 2016-04-11 17:57:59 +00:00