Daniel Sandler
aefdfa5721
Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev am: 3af45bd
...
am: 73a694b
* commit '73a694b486b8b37d7e61e5ad53b3c9b139b783e9':
Allow system apps to substitute a different app name in notifications.
Change-Id: Id47615712e65e8a11edd68dcd729824c9c37c85a
2016-04-14 19:29:49 +00:00
Jaewan Kim
db16ecdb3f
Merge "PIP: Fix runtime crash in System UI" into nyc-dev am: a6d383d
...
am: a6d0da0
* commit 'a6d0da0662258d66ee04bfd433872d8d528d7721':
PIP: Fix runtime crash in System UI
Change-Id: I4b7b03ecc2bb1021bb9d2624024f703639ed2661
2016-04-14 18:50:38 +00:00
Winson
c565c6164a
Reducing work on configuration change (Part 1) am: 670ea71
...
am: 5913a15
* commit '5913a156a2e88a259b7648a8515701d0bf3e744c':
Reducing work on configuration change (Part 1)
Change-Id: I102dfe3ad9f20489e6bf9959790da770b40065c2
2016-04-14 18:46:31 +00:00
Jaewan Kim
442f0910c6
Merge "PIP: Implement focus change animation in PIP control buttons" into nyc-dev am: 6309cab
...
am: b5948bd
* commit 'b5948bd877639f64ab4d9b3b2611729b0cb2665b':
PIP: Implement focus change animation in PIP control buttons
Change-Id: Ide2739cb58c391a6689387604aef1f999f8797f0
2016-04-14 18:44:11 +00:00
Winson
9f48a791ab
Fixing crash. am: f21c3dac
...
am: 5ab0315
* commit '5ab0315adc4310229e80e545e3129bc8ec4564cf':
Fixing crash.
Change-Id: I3f99324bbd0377c5d81ca1ee651ae553eab11a7e
2016-04-14 18:43:22 +00:00
Jaewan Kim
0218733f7d
Merge "PIP: Add PIP boundary" into nyc-dev am: 49d9c79
...
am: 4088fb2
* commit '4088fb2f98c8ba035f016fdea087bfae655313ee':
PIP: Add PIP boundary
Change-Id: I058c5a049fe99b7dbc189b205dbd745e1273c40d
2016-04-14 18:42:44 +00:00
TreeHugger Robot
560c988aca
Merge "Keep HUNs that have an active remote input" into nyc-dev am: e6036ad
...
am: d9d7085
* commit 'd9d70858b0e42a4b7ea1c64d5f4ebf2bfec62e44':
Keep HUNs that have an active remote input
Change-Id: I7287501646f7117feb2f3ac4d0ba0b9e046d42f9
2016-04-14 18:41:07 +00:00
TreeHugger Robot
71f8c4c475
Merge "StrongAuthTracker: Don\'t rely on USER_PRESENT" into nyc-dev am: c142a8c
...
am: 69df48c
* commit '69df48c44602f0ab64725dd82444fda23bc7f2bf':
StrongAuthTracker: Don't rely on USER_PRESENT
Change-Id: Idf437251b407c2682e6f52608031178aa1040eeb
2016-04-14 18:33:55 +00:00
Dan Sandler
73a694b486
Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev
...
am: 3af45bd
* commit '3af45bd2d06303bfaf8ba28324ca976e6f96ece3':
Allow system apps to substitute a different app name in notifications.
Change-Id: I5fc24757a4db46a499f5638c04922e131c79d1f9
2016-04-14 13:59:20 +00:00
Dan Sandler
732bd6cb27
Allow system apps to substitute a different app name in notifications.
...
This is a privileged permission and is only to be used by
the core OS and related packages whose names are confusing
or misleading when shown in notifications.
The user will always be able to see the true package name by
accessing the notification inspector (longpress or swipe
gesture on the notification row in SystemUI).
Fixes: 26517701
Change-Id: I2b021c9da0757b99df76399666af263668d88070
2016-04-14 13:48:03 +00:00
Jaewan Kim
a6d0da0662
Merge "PIP: Fix runtime crash in System UI" into nyc-dev
...
am: a6d383d
* commit 'a6d383d1028b8e44c54e58019540cb586a044a3e':
PIP: Fix runtime crash in System UI
Change-Id: I42d350c3d4ac82cf208d95298fcf83c682f4f69f
2016-04-14 06:36:07 +00:00
Jaewan Kim
2e27de2ea0
PIP: Fix runtime crash in System UI
...
Bug: 27677096
Change-Id: I182e29962b5da8355f729287a4abde1e73e66e42
2016-04-14 15:18:46 +09:00
Winson
5913a156a2
Reducing work on configuration change (Part 1)
...
am: 670ea71
* commit '670ea71f1b4ae59a0cd6608ae44b0fb78a1144c4':
Reducing work on configuration change (Part 1)
Change-Id: I42fad93826036aef60bbc2d182c13840bae57fa4
2016-04-14 03:56:57 +00:00
Winson
670ea71f1b
Reducing work on configuration change (Part 1)
...
- Don’t reinflate the header bar and dummy stack view
- Only update the header bar layout params when values change
Change-Id: I47bb699e35b10caea2ab8640be8d3f9a3d445c58
2016-04-13 20:51:37 -07:00
Jaewan Kim
b5948bd877
Merge "PIP: Implement focus change animation in PIP control buttons" into nyc-dev
...
am: 6309cab
* commit '6309cabcda6a6a3e2e397808f34ec6cc91b535aa':
PIP: Implement focus change animation in PIP control buttons
Change-Id: I0d5121aae90d5d39b4a2930a05419ac5806e0718
2016-04-14 01:44:35 +00:00
Jaewan Kim
6309cabcda
Merge "PIP: Implement focus change animation in PIP control buttons" into nyc-dev
2016-04-14 01:41:56 +00:00
Winson
5ab0315adc
Fixing crash.
...
am: f21c3dac
* commit 'f21c3dace89b168f5e5e4e96532d977b8b0a1cf5':
Fixing crash.
Change-Id: Ic5bec6333691edf57eb99387167f3e7dc00fa999
2016-04-14 01:37:16 +00:00
Jaewan Kim
4088fb2f98
Merge "PIP: Add PIP boundary" into nyc-dev
...
am: 49d9c79
* commit '49d9c79e318e4b623a711b3fe7bb710070b51aea':
PIP: Add PIP boundary
Change-Id: I83918c9573d48be33733840c66f94b39fa5be364
2016-04-14 01:37:15 +00:00
Winson
f21c3dace8
Fixing crash.
...
b/28179361
Change-Id: I5c6049efcd0c43f3b0e595648fd331c2a82d4d73
2016-04-14 01:34:57 +00:00
Jaewan Kim
49d9c79e31
Merge "PIP: Add PIP boundary" into nyc-dev
2016-04-14 01:32:43 +00:00
Adrian Roos
d9d70858b0
Merge "Keep HUNs that have an active remote input" into nyc-dev
...
am: e6036ad
* commit 'e6036ad09417edc2a0786237824eff306d1ca1bb':
Keep HUNs that have an active remote input
Change-Id: Ia4ebbfc9f2f1dc6ad45f89a5f0c60ff8893569c0
2016-04-14 01:25:14 +00:00
TreeHugger Robot
e6036ad094
Merge "Keep HUNs that have an active remote input" into nyc-dev
2016-04-14 01:23:06 +00: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
TreeHugger Robot
fc107db5a8
Merge "Dismiss keyguard when user button is tapped" into nyc-dev am: 819b9bc
...
am: 8f2d7678
* commit '8f2d7678a5cccf39bd210a3573740a74b29a78b2':
Dismiss keyguard when user button is tapped
Change-Id: I4a751e556fb1781c2ed4698bbb2043944b66f1a6
2016-04-13 21:42:50 +00:00
Jorim Jaggi
5645f3fb46
Refine long-press enter and exit animations am: 545c5c2
...
am: d79d1ba
* commit 'd79d1ba4bce52dd29a6b91657d56aa6d5c87b507':
Refine long-press enter and exit animations
Change-Id: Ia5e3566b3227676045bad0ea6bab677b08abf76d
2016-04-13 21:42:48 +00:00
Kaori Katou
8f2d7678a5
Merge "Dismiss keyguard when user button is tapped" into nyc-dev
...
am: 819b9bc
* commit '819b9bc9dbf31b8b6db999ff56477038ad95ffcf':
Dismiss keyguard when user button is tapped
Change-Id: I8c88b4067bd58adf66c86f5246ad3674f34784d3
2016-04-13 21:39:10 +00:00
Jorim Jaggi
d79d1ba4bc
Refine long-press enter and exit animations
...
am: 545c5c2
* commit '545c5c20d3b1f424b2f1917a262a5e8130dab6d0':
Refine long-press enter and exit animations
Change-Id: I229da9faaee36f491ee40ad00fea9273919e71a9
2016-04-13 21:39:08 +00:00
TreeHugger Robot
819b9bc9db
Merge "Dismiss keyguard when user button is tapped" into nyc-dev
2016-04-13 21:32:21 +00:00
Jorim Jaggi
545c5c20d3
Refine long-press enter and exit animations
...
Bug: 27154882
Change-Id: I13a1a6ea7eabdefc7e5c32ae0471d9fa14cc3f86
2016-04-13 21:27:32 +00:00
Jason Monk
6a150faa3b
Merge "QS: Add content description to page indicator" into nyc-dev am: 4db7675
...
am: 856577d
* commit '856577deede96da1885f032716ef9be98538c674':
QS: Add content description to page indicator
Change-Id: Ia27d98cb9b8153ed5bb7a0a4f0dc1434a7023ad9
2016-04-13 19:21:11 +00:00
Jason Monk
856577deed
Merge "QS: Add content description to page indicator" into nyc-dev
...
am: 4db7675
* commit '4db7675d8509039dd9cf5dc7231c5bca6330dcd3':
QS: Add content description to page indicator
Change-Id: Ibee90a16133577b59c90880b8f591c39bf6f0882
2016-04-13 19:17:33 +00:00
Jason Monk
4db7675d85
Merge "QS: Add content description to page indicator" into nyc-dev
2016-04-13 19:11:22 +00:00
Kaori Katou
ccf08d7c84
Dismiss keyguard when user button is tapped
...
When multi-user is disabled and user button is tapped
on the keyguard, the contact app is displayed behind the keyguard.
The keyguard should be dismissed when the contact app is launched.
Change-Id: I7daa0bec84b5172e78668cc71e51955f166ede0a
(cherry picked from commit 0a33405329 )
2016-04-13 11:05:41 -07:00
Jason Monk
2977ba2cd7
QS: Add content description to page indicator
...
Change-Id: I4e9bdfe803d681484eb4c8915c44e37be40d8aa2
Fixes: 27325720
2016-04-13 13:01:14 -04:00
Yongjiang Wu
859170f426
Merge "Fix: the label "customize" is not updated after changing language" am: b4c4e20 am: d5be2a2
...
am: a27376d
* commit 'a27376d836b7907a9990af21b4d0342a7e587c42':
Fix: the label "customize" is not updated after changing language
Change-Id: Ifebdd9c6c37a92f0208ea681c71444235bef37d5
2016-04-13 16:39:59 +00:00
Treehugger Robot
a27376d836
Merge "Fix: the label "customize" is not updated after changing language" am: b4c4e20
...
am: d5be2a2
* commit 'd5be2a2055b8e0f4067f00e8756fdf22c084e94d':
Fix: the label "customize" is not updated after changing language
Change-Id: I7bc30cf66b76b062468b443fd1ef965386c5761e
2016-04-13 16:36:11 +00:00
Jason Monk
db7ef96743
Merge "Remove color and appearance" into nyc-dev am: c2e8857
...
am: 6e8111c
* commit '6e8111c5df28ad3d9129d7e63988235862348492':
Remove color and appearance
Change-Id: Ie1f8620e8b64e107fc5fe61ab08afe5b52561e5a
2016-04-13 15:50:46 +00:00
Jason Monk
6e8111c5df
Merge "Remove color and appearance" into nyc-dev
...
am: c2e8857
* commit 'c2e8857a284433ea83006349bcba204bdd1897cc':
Remove color and appearance
Change-Id: I7650274e1c3b4167a699e5697aeabeba1ccc898c
2016-04-13 15:47:13 +00:00
Jason Monk
52c66d74d1
Remove color and appearance
...
Also fix crash.
Change-Id: I16abec61d63e2d503b07047c08664c2e96689c50
Fixes: 28163234
2016-04-13 11:01:19 -04:00
Treehugger Robot
b4c4e20960
Merge "Fix: the label "customize" is not updated after changing language"
2016-04-13 14:25:05 +00:00
Treehugger Robot
e3d556f785
Merge "Dismiss keyguard when user button is tapped"
2016-04-13 13:32:38 +00:00
Nicolas Prévot
29e216a675
Merge "Suspend work status bar icon should be removed when work profile is deleted." into nyc-dev am: eeef75b
...
am: d1261c5
* commit 'd1261c578e751ee4b04e44a3711f1f421fbd7c80':
Suspend work status bar icon should be removed when work profile is deleted.
Change-Id: I91f4ee3792e9f8e32aac9d976378836f5d5668dd
2016-04-13 11:10:56 +00:00
Nicolas Prevot
d1261c578e
Merge "Suspend work status bar icon should be removed when work profile is deleted." into nyc-dev
...
am: eeef75b
* commit 'eeef75b6266dee8127bb0bcd1c241059602ca791':
Suspend work status bar icon should be removed when work profile is deleted.
Change-Id: I6bc8d58071b4728e2142febc51120f0d68d88988
2016-04-13 11:07:43 +00:00
Nicolas Prévot
eeef75b626
Merge "Suspend work status bar icon should be removed when work profile is deleted." into nyc-dev
2016-04-13 11:00:02 +00:00
Nicolas Prevot
6c7b874557
Suspend work status bar icon should be removed when work profile is deleted.
...
BUG:26787011
Change-Id: Ifb3de2a670b1d5ac74200b8d344bb576f683ed61
2016-04-13 10:28:58 +01:00
Jaewan Kim
1cc1e339b1
PIP: Add PIP boundary
...
Bug: 28040141
Change-Id: Iebd1e2cce4b3103e322bb92113c61e644a35be72
2016-04-13 14:56:56 +09:00
TreeHugger Robot
a1cdc96faa
Merge "TRON refinements for multi-window" into nyc-dev am: a74888d
...
am: e203cde
* commit 'e203cdefa1cc34057230ad83fdc5ef172e96f080':
TRON refinements for multi-window
Change-Id: I2edd0f1e9b851234c21e42cd2e22e127a155e21f
2016-04-13 04:28:59 +00:00
Jorim Jaggi
e203cdefa1
Merge "TRON refinements for multi-window" into nyc-dev
...
am: a74888d
* commit 'a74888ddf6657b41aed28dff0b0b1d47a80f107f':
TRON refinements for multi-window
Change-Id: I8a1a6d26bc94eca1afde2a1de920b4a39cd5e7f9
2016-04-13 04:26:04 +00:00