Commit Graph

15236 Commits

Author SHA1 Message Date
Jason Monk
1fafb3113c Merge "Fix QS header size after landscape inflation" into nyc-dev am: 9ff0083647
am: 76ecc4a166

* commit '76ecc4a166b89f66e5d39195e32749ed01642938':
  Fix QS header size after landscape inflation

Change-Id: Ibfb32b2dde5329c2d7025b79801ea1da34d4dc28
2016-05-04 21:41:52 +00:00
Sid Soundararajan
39c4e387fa Merge "Add a null check for the thumbnail image for transition" into nyc-dev am: 2ff157c027
am: 6c0b20446a

* commit '6c0b20446a5140ce36db7314df78ad7e81fa079b':
  Add a null check for the thumbnail image for transition

Change-Id: If8e3fbf4d4dd67838d4c3eed02bc3ea1129d1900
2016-05-04 21:38:56 +00:00
Julia Reynolds
e3b7833e67 Merge "Uncheck unselected radio buttons." into nyc-dev am: 69e0d82994
am: 25e83b4065

* commit '25e83b40655df99383ef72d924dcec0133d683a1':
  Uncheck unselected radio buttons.

Change-Id: I0e75b4421d47f8ec2d526c5b1d22fe0ae6c7741a
2016-05-04 21:38:34 +00:00
Jason Monk
76ecc4a166 Merge "Fix QS header size after landscape inflation" into nyc-dev
am: 9ff0083647

* commit '9ff00836473dca5e91bccf109902246458b44adc':
  Fix QS header size after landscape inflation

Change-Id: I97ba6feebc4282e4dcef71e805cf06c9bd2eba55
2016-05-04 20:22:16 +00:00
Jason Monk
9ff0083647 Merge "Fix QS header size after landscape inflation" into nyc-dev 2016-05-04 20:11:56 +00:00
Jason Monk
cd4e382bd0 Fix QS header size after landscape inflation
Change-Id: Ic735462d0af2437ed9e74a960ff0dc12126c30f2
Fixes: 28306834
2016-05-04 16:08:08 -04:00
Sid Soundararajan
6c0b20446a Merge "Add a null check for the thumbnail image for transition" into nyc-dev
am: 2ff157c027

* commit '2ff157c027cb3eb5eddefa39617ec49aeb75a139':
  Add a null check for the thumbnail image for transition

Change-Id: I149beb8615e78677e25b07cbf137152165ae38b9
2016-05-04 17:30:27 +00:00
Julia Reynolds
25e83b4065 Merge "Uncheck unselected radio buttons." into nyc-dev
am: 69e0d82994

* commit '69e0d8299460afeea1d33619b341937914a42839':
  Uncheck unselected radio buttons.

Change-Id: Ide0a1270da222aadf343829f54074636e7823fc5
2016-05-04 17:30:24 +00:00
Sid Soundararajan
2ff157c027 Merge "Add a null check for the thumbnail image for transition" into nyc-dev 2016-05-04 17:14:19 +00:00
TreeHugger Robot
69e0d82994 Merge "Uncheck unselected radio buttons." into nyc-dev 2016-05-04 17:09:52 +00:00
Felipe Leme
78cf9fe068 Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev am: b5cc6af44f
am: 93d4e7b116

* commit '93d4e7b116c92dfcf90da5a8f78f6afa393f1e4f':
  Don't display 1st-time dialog when disabling Data Saver.

Change-Id: I902bc6bd23af517773331f2eb4731e9687ac3cb4
2016-05-04 13:45:57 +00:00
Baligh Uddin
ce7d13e9e6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:45:09 +00:00
Felipe Leme
93d4e7b116 Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev
am: b5cc6af44f

* commit 'b5cc6af44ff69200c1693975c76d094bd46adb69':
  Don't display 1st-time dialog when disabling Data Saver.

Change-Id: I841f4577ca6e0d2dfe5e3628ee281e92a33d260a
2016-05-04 13:37:34 +00:00
Felipe Leme
e3f016fb4e Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev
am: b5cc6af44f

* commit 'b5cc6af44ff69200c1693975c76d094bd46adb69':
  Don't display 1st-time dialog when disabling Data Saver.

Change-Id: I22204829f07d4f430d48b243f3db53c454c2d50e
2016-05-04 13:37:29 +00:00
Julia Reynolds
617a7804bb Uncheck unselected radio buttons.
Fixes: 28518097
Change-Id: I22cce7837802a97f15af4170f8991db1685ee121
2016-05-04 09:31:56 -04:00
TreeHugger Robot
b5cc6af44f Merge "Don't display 1st-time dialog when disabling Data Saver." into nyc-dev 2016-05-04 13:24:13 +00:00
Ricky Wai
5a76ee9cd5 Merge "Make notification reply can response to work challenge" into nyc-dev
am: 92d0e9a4ed

* commit '92d0e9a4ede2c1b8132d9d980d1e51b2e5558ffb':
  Make notification reply can response to work challenge

Change-Id: Ie684a58e8598bcaf9763d282f7624ce81817d6d8
2016-05-04 10:41:38 +00:00
Ricky Wai
2a551110e6 Merge "Make notification reply can response to work challenge" into nyc-dev am: 92d0e9a4ed
am: 36a5898a02

* commit '36a5898a021d7ad5a6906bab2df3815c3b6e3aa6':
  Make notification reply can response to work challenge

Change-Id: Id261953e771217238e36aca2bfd8de87ea1ce1d8
2016-05-04 10:30:25 +00:00
Ricky Wai
36a5898a02 Merge "Make notification reply can response to work challenge" into nyc-dev
am: 92d0e9a4ed

* commit '92d0e9a4ede2c1b8132d9d980d1e51b2e5558ffb':
  Make notification reply can response to work challenge

Change-Id: I4bba668aeff039729bbe74483b742c220907903f
2016-05-04 10:24:50 +00:00
Ricky Wai
92d0e9a4ed Merge "Make notification reply can response to work challenge" into nyc-dev 2016-05-04 10:11:21 +00:00
Baligh Uddin
a7558df310 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: Ic96e78c740e77efbccaee8718e981d6fb9a1da58
2016-05-04 00:06:46 -07:00
Felipe Leme
ac0dbbbb8a Don't display 1st-time dialog when disabling Data Saver.
BUG: 28098106
Change-Id: Iec6deb45a881fab2896463a59cbc7a96a9e5c811
2016-05-03 15:58:35 -07:00
Sid Soundararajan
841fa8ad94 Add a null check for the thumbnail image for transition
This is needed since apps will send a null thumbnail for when
some content they do not want screenshotted is playing.

BUG: 28343440
Change-Id: Ie1edc78bf16c8ea014a982a115faf9395c9ccab3
2016-05-03 15:17:47 -07:00
Winson Chung
9814d5e68b Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev am: bd1708a19d
am: 221240d75d

* commit '221240d75d1139a450fec4bf0d04a6bb0b6d8ea7':
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.

Change-Id: Ic08dc6e203a2661db6d8178523e95492bed3bbb7
2016-05-03 22:03:48 +00:00
Winson
221240d75d Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev
am: bd1708a19d

* commit 'bd1708a19da3ae205c4da3f22d0682c9bd1f76fe':
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.

Change-Id: Ib97a145fc6ff4e761a7220979913ed5be9e8fb71
2016-05-03 22:01:30 +00:00
Winson
4f60ba2480 Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev
am: bd1708a19d

* commit 'bd1708a19da3ae205c4da3f22d0682c9bd1f76fe':
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.

Change-Id: Ifa1b2865dfc7035152864f1b63c4c83946fc5e89
2016-05-03 22:01:26 +00:00
Winson Chung
bd1708a19d Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev
* changes:
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.
2016-05-03 21:57:03 +00:00
Chris Wren
6733edfa51 Merge "copy auto-group decisions to updates" into nyc-dev am: facdf19313
am: 126d28b51c

* commit '126d28b51c868579ee5eff1d12ddc0962746ca29':
  copy auto-group decisions to updates

Change-Id: Id71b58586780e1076311db2edea57052bacc2a17
2016-05-03 20:15:37 +00:00
Chris Wren
963b1da018 Merge "copy auto-group decisions to updates" into nyc-dev
am: facdf19313

* commit 'facdf193139ab32582cf642a6648261bd873268a':
  copy auto-group decisions to updates

Change-Id: Iaeb0f80afda4b51633785fe2cad6f870587b4561
2016-05-03 20:12:49 +00:00
Chris Wren
126d28b51c Merge "copy auto-group decisions to updates" into nyc-dev
am: facdf19313

* commit 'facdf193139ab32582cf642a6648261bd873268a':
  copy auto-group decisions to updates

Change-Id: I69a8305427176e7f5a998a7bde7b19dc6adfc00e
2016-05-03 20:12:45 +00:00
TreeHugger Robot
facdf19313 Merge "copy auto-group decisions to updates" into nyc-dev 2016-05-03 20:08:03 +00:00
Jason Monk
49f49c4c4d Merge "Merge "QS Edit: clean up tile adapter" into nyc-dev am: cbcefaf85c" into nyc-mr1-dev
am: c57dfea12f

* commit 'c57dfea12fddc73d2094d576d74d3ef2c8afa92c':
  QS Edit: clean up tile adapter

Change-Id: If35eea6319fd0294cbd061369d56cc8c9c6d509d
2016-05-03 16:39:30 +00:00
Android Build Merger (Role)
c57dfea12f Merge "Merge "QS Edit: clean up tile adapter" into nyc-dev am: cbcefaf85c" into nyc-mr1-dev 2016-05-03 16:37:17 +00:00
Jason Monk
aecf9510b3 Merge "QS Edit: clean up tile adapter" into nyc-dev
am: cbcefaf85c

* commit 'cbcefaf85c20cbbb2723544461ddcd221e06b0a7':
  QS Edit: clean up tile adapter

Change-Id: I472ccb6aba74e5cda1ffe67748ce047545e5fd9f
2016-05-03 16:36:41 +00:00
Jason Monk
3a08f82d36 Merge "QS Edit: clean up tile adapter" into nyc-dev
am: cbcefaf85c

* commit 'cbcefaf85c20cbbb2723544461ddcd221e06b0a7':
  QS Edit: clean up tile adapter

Change-Id: I7cc42b3cf46b24f78ed1f16aa57d39fbee8bd505
2016-05-03 16:36:39 +00:00
Baligh Uddin
b26da96c2c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-03 16:32:18 +00:00
Baligh Uddin
96ee03daa0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-03 16:32:16 +00:00
Jason Monk
17d0399858 QS Edit: clean up tile adapter
Evidently it might be causing weird animation issues.

Change-Id: Ifbdd8f20a83fcab6fe9dfd448f9177f85c985d4c
Fixes: 28067638
2016-05-03 11:37:49 -04:00
Ricky Wai
cd35def3c3 Make notification reply can response to work challenge
When user clicks work notification reply button while work user has
challenge, it will bring you to work challenge, and click on the reply
button when work challenge is unlock.

Bug: 28036566
Change-Id: I7b8520c4e58c0c0f965e4770ab0c7b926d8fb39a
2016-05-03 12:18:31 +01:00
Baligh Uddin
3f49e3956f Import translations. DO NOT MERGE
Change-Id: Ica85710bc861bb345a865ab612cd4187ce60cc15
Auto-generated-cl: translation import
2016-05-02 21:08:19 -07:00
Baligh Uddin
61b00181e7 Import translations. DO NOT MERGE
Change-Id: I454fc75879dcba20d16b7151472e340fe517ece2
Auto-generated-cl: translation import
2016-05-02 20:48:50 -07:00
Winson
61560f065a Fixes several animation issues related to a dismissing task.
- Previously we did not properly cancel the animations when the user 
  interacted with the stack while a task was being dismissed.  Now, on 
  touch down, we only cancel the non-dismissing tasks, and in doing so,
  set their task override if there is a dismissing task (so that the 
  stack can scroll correctly), and update the surrounding task views
  if the dismiss update comes from the currently dismissing task.  
  (or in other words, the surrounding task animations will only be a 
  function of the current task being dismissed)

Bug: 28448670
Change-Id: If7b8ed3f1fe342114ae0f6dd9dbff0d48204f31e
2016-05-02 17:16:17 -07:00
Winson
aa0dea7a4a Pipe the dismiss button logic through the touch handler.
- This ensures that we perform the same dismiss animation when 
  dismissing via the button or via swipe.

Bug: 28443410
Change-Id: I309c38253e9c2dc78a5882dc663eec84a11619dd
2016-05-02 16:40:12 -07:00
Winson
95ee8736da Skip scroll-to animation when undocking and there are no tasks.
Bug: 28367678
Change-Id: Iafd064196cae43f60ff6d356843d1e431d15daea
2016-05-02 16:40:07 -07:00
Winson
9832f8f463 Fixing issue with docking being disallowed for secondary user.
- When a task is docked, the context is not correct for the given user.

Bug: 28195260
Change-Id: I59f73caf818d294c146d215c2bd31dbe1d4c7c5a
2016-05-02 16:40:00 -07:00
Jaewan Kim
3bf8ea2095 Merge "PIP: Show background scrim for PIP controls in Recents" into nyc-dev am: 28194523a4
am: 4deaaf83b8

* commit '4deaaf83b8a09cc0106671145a0b9e04b261c717':
  PIP: Show background scrim for PIP controls in Recents

Change-Id: Iad50ce36dcd6cc2cc8096af94dea41110cd8ecc6
2016-05-02 22:50:36 +00:00
Jaewan Kim
41506933a3 Merge "PIP: Show background scrim for PIP controls in Recents" into nyc-dev
am: 28194523a4

* commit '28194523a4f52fd50ce7f6e3d7d39c74f80b7bbf':
  PIP: Show background scrim for PIP controls in Recents

Change-Id: Ib42ba2b696fcd5834acd9c3a3c611d67eb4b4329
2016-05-02 22:45:56 +00:00
Jaewan Kim
4deaaf83b8 Merge "PIP: Show background scrim for PIP controls in Recents" into nyc-dev
am: 28194523a4

* commit '28194523a4f52fd50ce7f6e3d7d39c74f80b7bbf':
  PIP: Show background scrim for PIP controls in Recents

Change-Id: Ic07374d874506297d7e9cb20a79d982ade5f9639
2016-05-02 22:45:55 +00:00
Jaewan Kim
28194523a4 Merge "PIP: Show background scrim for PIP controls in Recents" into nyc-dev 2016-05-02 22:34:57 +00:00
Jaewan Kim
dded3aa8bd PIP: Show background scrim for PIP controls in Recents
Scrim will fade in after the PIP control's focus losing animation,
and will be gone immediately when PIP control gets focus.

Bug: 28041690
Change-Id: Ibb7fa0ce15ba1af13781a1bd5e87609fefa95cc0
2016-05-03 06:55:27 +09:00