Commit Graph

17171 Commits

Author SHA1 Message Date
Yoshinori Hirano
14ea407321 Merge "Don't include front most excluded task in Multi-Window mode" am: a8c2c229d7
am: 435db7e690

Change-Id: Iedb0b93fd599170132ddd545490a3564e575cdc0
2016-12-08 21:13:10 +00:00
Treehugger Robot
a8c2c229d7 Merge "Don't include front most excluded task in Multi-Window mode" 2016-12-08 20:52:15 +00:00
Jason Monk
99db203f29 resolve merge conflicts of 9600df0 to stage-aosp-master
am: f120cf3d88

Change-Id: Id2c5d4905fed661466929ed93e08e7b079c8c51d
2016-12-06 16:43:38 +00:00
Jason Monk
f120cf3d88 resolve merge conflicts of 9600df0 to stage-aosp-master
Change-Id: I139c64bb2440d64312d7e763e53bdb13dcb9f1aa
2016-12-06 11:34:12 -05:00
Jason Monk
9600df035b Merge "Fix Hotspot tile is shown on Guest user" 2016-12-06 15:11:19 +00:00
Yoshinori Hirano
7bccd43fa9 Don't include front most excluded task in Multi-Window mode
A front most excluded task is shown on Overview when changing font size
in Multi-Window mode. To fix this issue, RecentActivity should not reset
the config launch flags when it is restarted by configuration changes and
it should not reload the tasks which include a front most excluded task
when it is launched while docking a task.

Bug: 33031985
Test: manual - display app task excluded from Overview screen and then
               change font size in Multi-Window mode

Change-Id: Ic0c35cd06c14d9ed8d2dc46a01f2153738bad849
2016-12-06 19:48:21 +09:00
Baligh Uddin
b1df48d326 Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
Bug: 32849428

* goog/cw-f-dev: (98 commits)
  Revert "Catch KeyStoreException for setting profile lock"
  Fix createConfirmDeviceCredentialIntent for wear for CTS.
  Fix default dialog background colour for watch devices.
  Catch KeyStoreException for setting profile lock
  Add cross-links between FINE and COARSE location permissions. bug: 25371600
  Fixed a bug with the emergency affordance in multi user
  Zygote: Additional whitelists for runtime overlay / other static resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  colors: add missing accent_material_{700,50} resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
  ...

Change-Id: I63468da5bfa21ed9ac5985bbdbf3a61d4c389aa0
2016-11-22 17:19:45 -08:00
Bill Yi
a45b9aa91a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ic5781e21dceb885251e8ed7696a309e1844d9bd6
2016-11-20 14:43:23 -08:00
Selim Cinek
61e2ff5727 Merge "Share one receiver for CurrentUserTracker" am: 06d619ccfa
am: a84c7ea396

Change-Id: I54ca8022b6aeb15329d7a432300eaa758ea4b8ac
2016-11-18 19:57:20 +00:00
Selim Cinek
3212624a6b Merge "Brightness mirror - fix multi-touch issue" am: 1bfab3de31
am: 44857962dc

Change-Id: Ie5f7a865b3ed1d17444b5133ad530ae6191294a9
2016-11-18 19:56:27 +00:00
Selim Cinek
a84c7ea396 Merge "Share one receiver for CurrentUserTracker"
am: 06d619ccfa

Change-Id: I4b0dc5398b0be804663ebd633070a38cc51ec7de
2016-11-18 19:51:23 +00:00
Selim Cinek
44857962dc Merge "Brightness mirror - fix multi-touch issue"
am: 1bfab3de31

Change-Id: I5906d89a1c4e1343dbdbf99f328a5356b4f2be85
2016-11-18 19:50:27 +00:00
Selim Cinek
06d619ccfa Merge "Share one receiver for CurrentUserTracker" 2016-11-18 19:39:30 +00:00
dooyoung.hwang
e9556a89db Share one receiver for CurrentUserTracker
Each CurrentUserTracker has one receiver per one object.
This could cause unnecessary transaction as Tracker counts
increases. The idea of redcuing receiver is creating
one static receiver for CurrentUserTracker and share it
with all object.

Test: Check if Quicksetting order is changed properly
after switching user.

Change-Id: I8404829826391f8b315b42bbd0f50e77b783eeab
2016-11-17 09:47:28 +09:00
dooyoung.hwang
e4b841e757 Brightness mirror - fix multi-touch issue
The issue is that QSPanel get touch event while brightness mirros
is showing after density changes. This is because StatusBarWindowView
keeps the reference of detached brightness mirror view. We can refresh
it at onViewAdded function.

Test: manual(change device density > Check if can click QuickSettings
while dragging brightness slider.)

Change-Id: I646092abbc23b24bb91fc5c8525b12a143364b84
2016-11-16 08:59:23 +09:00
Akitaka Kimura
efd1c54a40 Fix Hotspot tile is shown on Guest user
Last tiles are cached in QSTileHost and they are re-used
for other users. But when the cached tile is added, QSTileHost
doesn't check whether it is available or not. So Hotspot tile
is shown on Guest user. To fix this issue, QSTileHost should
check whether the tile is available when it is added.

Bug: 32817349
Test: manual - add Hotspot tile to default tiles
               and switch to Guest user

Change-Id: I96d5876024f6d519bf72a462b5c79dcf41b253f9
2016-11-15 10:54:43 +00:00
Bill Yi
1b9fbcf993 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32766034
Change-Id: If37bb6852c438a2b3579f4af2045841d30be829e
2016-11-10 21:12:09 -08:00
Akira Oshimi
88ab92ce4c Merge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bacc3
am: 08978cd0fd

Change-Id: Ibd1b9ff4be577bf5ea5596342316ea2303d93b75
2016-11-10 20:12:34 +00:00
Akira Oshimi
08978cd0fd Merge "Add null check before finish SystemUI Tuner's activity"
am: 5bb91bacc3

Change-Id: I0e9d19f297c158ff0c6acd1aa6665e3459fa416b
2016-11-10 20:06:34 +00:00
Akira Oshimi
8fbcb7630a Add null check before finish SystemUI Tuner's activity
SystemUI Tuner's activity changes to null when Multi-window's state is
changed after confirmation dialog about removing SystemUI Tuner is
shown. Then NullPointerException occurs by trying to finish the
activity to tap "REMOVE" button on the confirmation dialog.
So add null check before finish the activity.

Bug: 32786029
Test: manual - remove System UI Tuner on Multi-Window mode

Change-Id: I455d17c0c600eeb05c9dfb7d609d40307de2f855
2016-11-10 09:09:25 +00:00
Bill Yi
aa451616c8 Import translations. DO NOT MERGE
Change-Id: Icd8a71ffdf6db4fcfa0a001ffded8b51a729b10d
Auto-generated-cl: translation import
2016-11-07 20:59:23 -08:00
Bill Yi
5ac1b67317 Import translations. DO NOT MERGE
Change-Id: Ie85b9335611ca2c49a71797d54ed80ee711cf423
Auto-generated-cl: translation import
2016-10-31 14:59:45 -07:00
Bill Yi
644a22437f Import translations. DO NOT MERGE
Change-Id: I70ad8db1fffca628251fbeaf6ef98882529a8210
Auto-generated-cl: translation import
2016-10-26 10:55:33 -07:00
Bill Yi
b3a6a7afe4 Import translations. DO NOT MERGE
Change-Id: I836ffcc309753e1688f29b62f6a3dc757c8be0b5
Auto-generated-cl: translation import
2016-10-24 16:04:03 -07:00
TreeHugger Robot
0cb41b80af Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-22 11:35:36 +00:00
Bill Yi
c27fdce39f Import translations. DO NOT MERGE
Change-Id: I7564aa066446c6332e6cca5868905a8f05850fcc
Auto-generated-cl: translation import
2016-10-21 19:45:18 -07:00
Jason Monk
7eef409c52 Fix vpn branded string usage am: 59474a40af
am: ec421cd433

Change-Id: I2dade8df4b700b244308e66d2d546b6d866a7260
2016-10-22 02:36:16 +00:00
Jason Monk
ec421cd433 Fix vpn branded string usage
am: 59474a40af

Change-Id: Ie6945d5978394024ae2f06edb29c38a18459e504
2016-10-22 02:30:51 +00:00
Jason Monk
59474a40af Fix vpn branded string usage
Change-Id: I42fdca60536425c757759414ac812b20e0b42823
Fixes: 32071681
2016-10-21 19:27:34 -04:00
Bill Yi
59d5ed7768 Import translations. DO NOT MERGE
Change-Id: Iaad30d2e0f0119cbb3213bea5948dab67785ec06
Auto-generated-cl: translation import
2016-10-19 22:35:19 -07:00
Selim Cinek
2cf7a75410 Fixed a grey flash when swiping away the last notification am: 54680901ed
am: 73595daf43

Change-Id: I2491c5104376715ccbe027e0da89262435732d4a
2016-10-20 02:41:48 +00:00
Selim Cinek
73595daf43 Fixed a grey flash when swiping away the last notification
am: 54680901ed

Change-Id: I050754c1f749b7c5fce81359a52b7eba2f7b7d67
2016-10-20 02:34:48 +00:00
Selim Cinek
54680901ed Fixed a grey flash when swiping away the last notification
Change-Id: I12edf673f29abad66fa6704004886124eee9978b
Fixes: 32289359
Test: have 1 notification, swipe it a way, observe no flashing in statusbar
2016-10-20 00:07:26 +00:00
Winson
a0e36bafad Skip getting transforms for ignored tasks. am: 448c0adb78
am: cfdbd7b2e2

Change-Id: I19181f3c3ffff3da30b864290a0ba45571bbb47f
2016-10-19 19:35:25 +00:00
Winson
cfdbd7b2e2 Skip getting transforms for ignored tasks.
am: 448c0adb78

Change-Id: Ie929c699ee466b1298acab07eefa68006a92cdb1
2016-10-19 19:18:26 +00:00
TreeHugger Robot
5f4169b5ea Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev 2016-10-19 18:45:26 +00:00
Winson
448c0adb78 Skip getting transforms for ignored tasks.
- If the stack does not contain the existing ignored task view on
  relayout, then we should not try and get the transform for it
  since it will be skipped.

Bug: 32001762
Change-Id: I23182c76ac41b036c25edf92374622191e9d4ce3
2016-10-19 09:53:59 -07:00
Jason Monk
9dce7cdf13 Merge "Hide QS customizer correctly" am: 03e4eb32fe
am: fb56958223

Change-Id: I62095e8b8c5bea7627e59cf166abce1cfa4ce2f1
2016-10-19 15:23:40 +00:00
Jason Monk
fb56958223 Merge "Hide QS customizer correctly"
am: 03e4eb32fe

Change-Id: I8c1998de76beee26b703781a6f883e9efd24bde3
2016-10-19 15:15:43 +00:00
Adrian Roos
102aa8b6f1 Separate ambient display triggers am: b7e4e10618
am: 59116440e7

Change-Id: I588f5541c73ae356b255ffa6b1e23c1fbcd1693e
2016-10-18 22:19:43 +00:00
Adrian Roos
59116440e7 Separate ambient display triggers
am: b7e4e10618

Change-Id: I575f96338cffa0f6e8adb1b9ff300dbd322398dc
2016-10-18 22:07:03 +00:00
Adrian Roos
52af7e0759 Merge "Separate ambient display triggers" into nyc-mr1-dev 2016-10-18 22:00:06 +00:00
Adrian Roos
b7e4e10618 Separate ambient display triggers
Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.

Bug: 32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work
2016-10-18 10:43:44 -07:00
Adrian Roos
4c4e0de5d5 DirectReply: fix lockscreen crash am: b22665db0c
am: dd8b2c943d

Change-Id: I30dd96b6b332fcd327fcaf81c8e082d7081781b2
2016-10-18 17:37:45 +00:00
Adrian Roos
dd8b2c943d DirectReply: fix lockscreen crash
am: b22665db0c

Change-Id: I88a689d4fee7bcddcecccb32f48c0fb83bac0072
2016-10-18 17:08:39 +00:00
TreeHugger Robot
fe7cab6042 Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev 2016-10-18 16:59:27 +00:00
Yoshinori Hirano
1dd7d07460 Hide QS customizer correctly
When users open and close QS customizer quickly, QSCustomizer#hide()
is not called because QSCustomizer#isCustomizing() returns false.
The isCustomizing() becomes true when the expand animation ends.
The hide() should be called even though the animation is ongoing.

Bug: 30545089
Test: manual - open and close QS customizer quickly

Change-Id: Ic483addfb6ae9da31c997fec7778e5acd718c353
2016-10-18 04:31:47 +00:00
Bill Yi
ad231bd2f8 Import translations. DO NOT MERGE
Change-Id: I551e9cc3ac74b6a488f0bcc32da9905b7d313f5f
Auto-generated-cl: translation import
2016-10-17 21:19:36 -07:00
Adrian Roos
b22665db0c DirectReply: fix lockscreen crash
Fixes a crash that happens when direct reply is triggered and
the view is detached between clicking and unlocking.

Change-Id: I647560a24f9a26a28e86df436b45d5f496454eb8
Fixes: 32171748
2016-10-17 15:08:15 -07:00
Bill Yi
5a05ce6409 Import translations. DO NOT MERGE
Change-Id: I7bd27211cd2cb24cae8bb2bc31404f66e2301f26
Auto-generated-cl: translation import
2016-10-17 14:13:52 -07:00