Commit Graph

249252 Commits

Author SHA1 Message Date
Chong Zhang
9eef46b66f Merge "Don\'t include removed window when counting interesting windows" into nyc-dev
am: 18ef543102

* commit '18ef5431026365dd3b53a505fc57f538cf8dd48e':
  Don't include removed window when counting interesting windows

Change-Id: Iea9bc7a6c2ae5043aaea6b9d48fbb1dfd49d5fc7
2016-05-23 19:08:04 +00:00
Chris Wren
ec2e36a485 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
  Don't throw RemoteException from new NLS APIs

Change-Id: I8a89c5e4b800baf8c810eb24b0b5435fa63b1378
2016-05-23 19:01:27 +00:00
Chong Zhang
18ef543102 Merge "Don't include removed window when counting interesting windows" into nyc-dev 2016-05-23 18:59:04 +00:00
TreeHugger Robot
28d9ef8112 Merge "Don't throw RemoteException from new NLS APIs" into nyc-dev 2016-05-23 18:54:20 +00:00
Victor Chang
b3e08e0363 Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev
am: 7c527bf76d

* commit '7c527bf76dcdcda414f10ed829999310f46161e7':
  Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: I49885b9bffb4c16f52f7ed471b1019dfb7fe85f4
2016-05-23 18:49:23 +00:00
Chong Zhang
e292eb3d4d Don't include removed window when counting interesting windows
Also do not give input focus to window that's already marked for removal.
The input channel is already disposed and input manager will treat these
as null focus.

bug: 28797800

Change-Id: I3cb2d514a7286847f1ad6af3f629d04c303d3cbd
2016-05-23 11:46:04 -07:00
Victor Chang
7c527bf76d Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev 2016-05-23 18:42:09 +00:00
Philip P. Moltmann
4a3b323d3c Merge "Correct height of add printer list separator" into nyc-dev
am: 80c18bcc3a

* commit '80c18bcc3a52dee62eec4b95de1ebfbf3c7d397f':
  Correct height of add printer list separator

Change-Id: Ib3b93ec7f2bd12b077353b3ac3f671a68bf97d34
2016-05-23 18:37:47 +00:00
Winson
db7ef9378a Removing extra haptic feedback.
am: 7660bca509

* commit '7660bca5099b1a568e025345f1ba0aa68793e15a':
  Removing extra haptic feedback.

Change-Id: If87dfc0227eee3246eb145c566851057912b4588
2016-05-23 18:30:54 +00:00
Philip P. Moltmann
80c18bcc3a Merge "Correct height of add printer list separator" into nyc-dev 2016-05-23 18:27:14 +00:00
Winson
7660bca509 Removing extra haptic feedback.
- ag/923796 changed the logic to always return true, so these extra 
  calls are no longer needed.

Bug: 28867314
Change-Id: I07a4f6ac772a1444bba1950b2f27aa4be58a8419
2016-05-23 18:24:49 +00:00
Wale Ogunwale
3f8b2621a4 Merge "Fixed flicker when docking task from recents." into nyc-dev
am: bc0a5cb2f8

* commit 'bc0a5cb2f8b5cac550196b535d91e07bb586f647':
  Fixed flicker when docking task from recents.

Change-Id: I6b1715f666f0085dc9b43f557493d16655bf0297
2016-05-23 18:13:13 +00:00
Suprabh Shukla
f598369c15 Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev
am: 653e7bedb4

* commit '653e7bedb4ea95f69c109d54ddd0b7a49e6530c6':
  Fixing isOpRestricted in AppOpsService

Change-Id: Id2088da325739336bfc628da2ddd4850d0d2e6fb
2016-05-23 18:03:35 +00:00
TreeHugger Robot
bc0a5cb2f8 Merge "Fixed flicker when docking task from recents." into nyc-dev 2016-05-23 18:01:13 +00:00
TreeHugger Robot
653e7bedb4 Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev 2016-05-23 17:57:50 +00:00
Chris Wren
688ebc6f75 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev
am: 0a9ccf2619

* commit '0a9ccf26192bc5a6fd74afb7afd4834b08230299':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I0e4bd4aaf4c6513c289ca948f63c5bc5c3c7ed02
2016-05-23 17:47:29 +00:00
Chris Wren
0a9ccf2619 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 2016-05-23 17:44:16 +00:00
Tony Mak
741e0b14cf Merge "Remove PROPERTY_WORK_CALL" into nyc-dev
am: 5ee420c0d5

* commit '5ee420c0d562e9ff55fe9bf03c746bc76fd40d5e':
  Remove PROPERTY_WORK_CALL

Change-Id: I038ac8c085d5f6590cf8dfa0abc0864da3dd89e2
2016-05-23 17:23:51 +00:00
Winson
5e04aeb328 Catching all exceptions when docking.
am: f60a4af047

* commit 'f60a4af04779174b39b7d3d277de88ed1204d024':
  Catching all exceptions when docking.

Change-Id: I6f7d31e267686de5f9b12161469ca1490de23b15
2016-05-23 17:23:47 +00:00
Tony Mak
5ee420c0d5 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev 2016-05-23 17:17:27 +00:00
Winson
f60a4af047 Catching all exceptions when docking.
- Catch all exceptions thrown when docking an activity (similar to when
  we start an activity) to allow us to gracefully handle the failure and
  animate the task back into the stack.

Bug: 28867188
Change-Id: I3f80d261343c0161c5cbfd08a05a1fc6157f653e
2016-05-23 17:12:33 +00:00
Philip P. Moltmann
8aa4856f22 Correct height of add printer list separator
Do not use listPreferredItemHeightSmall a height for list separator.

Fixes: 28907033
Change-Id: Ibe9744f28e7bd17fb5a298fa3cff0e3d403de10f
2016-05-23 09:54:39 -07:00
Victor Chang
12753ded44 Fix Certificate authority installed notification is gone when turning off and on the work mode.
cause: Work mode is turned on before entering USER_STOPPED state.
Thus, BOOT_COMPLETED broadcast is not sent, but the notification has been dismissed.

use USER_STARTED + USER_UNLOCKED because both are foreground.

Bug: 28864104
Change-Id: I4796b61586e194d8367b9e52a9c56f858cbcbe7d
2016-05-23 17:41:01 +01:00
Wale Ogunwale
8c09c7dd7a Fixed flicker when docking task from recents.
Regression introduced by ag/1044640 where we don't want recents to the
visible if it's stack isn't fullscreen or focused. However, it is
possible for switching the home stack to not-fullscreen to prolonged
while transitioning to split-screen mode from recents. We now check
for if the docked stack exists which is a better indicator we are in
split-screen mode regardless of if the stask is fullscreen.

Bug: 28882948
Bug: 28246419
Change-Id: I54c02cc1486e7b5bf6a20dd0706c9bfe3f40a953
2016-05-23 09:10:24 -07:00
Bill Yi
5745dc0e45 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 6a983faab3  -s ours

* commit '6a983faab35cc4f22611b0cb8041f4dcbac545dc':
  Import translations. DO NOT MERGE

Change-Id: Ibafdfdf355699c6a8d8461928400639e692500b2
2016-05-23 16:03:30 +00:00
Bill Yi
f2475c29e1 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 7d1246e95d  -s ours

* commit '7d1246e95d0815424e6654af4ef613a7726551b1':
  Import translations. DO NOT MERGE

Change-Id: I8fb493e8cd0005c0269c86209a48cd5e31179f81
2016-05-23 16:03:27 +00:00
Bill Yi
0b9b896202 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 05be3b4541  -s ours

* commit '05be3b454134afc73ae44cda88af10bead5324a6':
  Import translations. DO NOT MERGE

Change-Id: Ibdb1ab97fd2995e507cec35a52a30063e91c5ff9
2016-05-23 16:03:23 +00:00
TreeHugger Robot
6a983faab3 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:49:55 +00:00
Bill Yi
ddf0507239 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: fa65d11a21  -s ours

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

Change-Id: I16981cd6000b92784f640ac979c373a60c59e839
2016-05-23 15:49:19 +00:00
TreeHugger Robot
7d1246e95d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:48:15 +00:00
TreeHugger Robot
05be3b4541 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:48:00 +00:00
TreeHugger Robot
fa65d11a21 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:35:53 +00:00
Bill Yi
ea28bc9461 Import translations. DO NOT MERGE
Change-Id: I6a67ee6c7f1c034eaea3885f13884f6c7add477d
Auto-generated-cl: translation import
2016-05-23 06:21:44 -07:00
Victor Chang
1e93177121 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
am: d86ac8116b

* commit 'd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I3fe13c51d5d33f5689f0b4130a33cf3a2777e186
2016-05-23 11:58:41 +00:00
Victor Chang
d86ac8116b Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev 2016-05-23 11:51:56 +00:00
Lorenzo Colitti
38aff6828d Merge "Only actually log the DNS events we have." into nyc-dev
am: cb98809657

* commit 'cb988096570de8af4883ae3bdea06c88f8fd235a':
  Only actually log the DNS events we have.

Change-Id: I6fa83369e45fbf0a33c0519cc47e5d3f21321463
2016-05-23 09:10:55 +00:00
TreeHugger Robot
cb98809657 Merge "Only actually log the DNS events we have." into nyc-dev 2016-05-23 09:01:45 +00:00
Bill Yi
88a2eff6cb Import translations. DO NOT MERGE
Change-Id: I23d94944484c50e6fae32f95b34406055078299e
Auto-generated-cl: translation import
2016-05-23 01:53:03 -07:00
Bill Yi
a5c77a4738 Import translations. DO NOT MERGE
Change-Id: I7c447305120cc398cbd0e7a98b8226ee7c632059
Auto-generated-cl: translation import
2016-05-23 01:42:41 -07:00
Bill Yi
cdf7b067d0 Import translations. DO NOT MERGE
Change-Id: I22fbf5ac36b91251a267bbf1863ca1b1e914d032
Auto-generated-cl: translation import
2016-05-23 01:20:28 -07:00
Lorenzo Colitti
c304a15751 Only actually log the DNS events we have.
DnsEventListenerService#logAndClear was always logging 100 DNS
events regardless of how many were actually logged. The rest of
the events were either all zero or previously-recorded events.

Bug: 28204408
Change-Id: I9da3b07a2e7b7512397a3eb6568a877815eb3312
2016-05-23 16:39:18 +09:00
Chad Brubaker
76d3d8590d Merge "Use an attribute for the network security config resource" into nyc-dev
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260
2016-05-23 02:32:19 +00:00
TreeHugger Robot
6812bdf387 Merge "Use an attribute for the network security config resource" into nyc-dev 2016-05-23 02:23:26 +00:00
Baligh Uddin
d2e1791807 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 917ead578b  -s ours

* commit '917ead578baa6fba7e8e45756c67c879bb912364':
  Import translations. DO NOT MERGE

Change-Id: I5359b0ee4ae342ed910fa7b888f1dcd621c4fd35
2016-05-22 23:34:39 +00:00
Baligh Uddin
d07ea5440b Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 7533f3260e  -s ours

* commit '7533f3260e888c6edc709b02eafdb5722172ecc2':
  Import translations. DO NOT MERGE

Change-Id: I1eeeb4510ca635af93a97af9950dc2b54914199b
2016-05-22 23:34:36 +00:00
Baligh Uddin
cdd880f96c Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 41a1d11f98  -s ours

* commit '41a1d11f98d170ed41935d35fc1a3ed4af2c59fd':
  Import translations. DO NOT MERGE

Change-Id: I2e0d39f64f0ebd738cad7d7676eb809f1fe88db7
2016-05-22 23:34:33 +00:00
Baligh Uddin
c6bc849b33 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 83378cb136  -s ours

* commit '83378cb13689fa73be349a9ce4b0802ed64fc935':
  Import translations. DO NOT MERGE

Change-Id: Id406199ec77f14e947db6f7c65a2f3b65795374d
2016-05-22 23:34:29 +00:00
Baligh Uddin
938d8da54f Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 23b665d65c  -s ours

* commit '23b665d65cd06c38a3ffb8301f4b47ca00eaa5a3':
  Import translations. DO NOT MERGE

Change-Id: Ie2e6a2515d39cd5284946abba39f9800d020d32b
2016-05-22 23:32:35 +00:00
Baligh Uddin
7458bdbe4a Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 97360f90ce  -s ours

* commit '97360f90ce2015f56b860692dabe0aa82786a888':
  Import translations. DO NOT MERGE

Change-Id: Iae715670385932f22208abd984b7add31c1a0084
2016-05-22 23:32:29 +00:00
Baligh Uddin
e235b490de Merge "Import translations. DO NOT MERGE" into nyc-dev
am: a4bfd03cd5  -s ours

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

Change-Id: I2bba6312b1aa23a3768fb2a72529ac0d9351cb12
2016-05-22 23:32:22 +00:00