Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
237,222 Commits 3 Branches 0 Tags
fbf2544caead75ff67cce002f686b69ad0abc577
Commit Graph

8440 Commits

Author SHA1 Message Date
Jason Monk
c56640bc45 Merge "Add edit title to QS edit" into nyc-dev am: 4cabb1b91f 
am: 15e637dafd

* commit '15e637dafd5e995ce74d51c11a696ed1c1e6407d':
  Add edit title to QS edit
 2016-03-02 21:42:12 +00:00
Jason Monk
0f9fd3a2d0 Merge "Guard against monkey crash" into nyc-dev am: c04cf4baec 
am: a2549ca8dd

* commit 'a2549ca8dd2b86251951e9ffc304ed44ad3dfff6':
  Guard against monkey crash
 2016-03-02 21:39:11 +00:00
Jaewan Kim
59a3b5f200 Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev am: 19d7eeaedf 
am: 008d56918b

* commit '008d56918b534b7765db6fe77b16c30eb1fab3ca':
  PIP: Show recents again when PIP menu is closed
 2016-03-02 20:29:11 +00:00
Chong Zhang
a65c68cb3d Merge "Don\'t change resize mode if AM didn\'t dock the task as requested" into nyc-dev am: 5d9de3ab6f 
am: 20862420c2

* commit '20862420c23bab9a83d79ac5c81745e7aae24536':
  Don't change resize mode if AM didn't dock the task as requested
 2016-03-02 20:25:35 +00:00
Jason Monk
15e637dafd Merge "Add edit title to QS edit" into nyc-dev 
am: 4cabb1b91f

* commit '4cabb1b91fb32c8e07ce2649b2090518b6d2c7b9':
  Add edit title to QS edit
 2016-03-02 20:07:20 +00:00
Jason Monk
a2549ca8dd Merge "Guard against monkey crash" into nyc-dev 
am: c04cf4baec

* commit 'c04cf4baecfdfeaf82c8498203779d594c9b52a4':
  Guard against monkey crash
 2016-03-02 20:05:15 +00:00
Jason Monk
4cabb1b91f Merge "Add edit title to QS edit" into nyc-dev 2016-03-02 19:48:25 +00:00
Jason Monk
c04cf4baec Merge "Guard against monkey crash" into nyc-dev 2016-03-02 19:48:01 +00:00
Jason Monk
ae5bd03831 Guard against monkey crash 
Bug: 27448755
Change-Id: I8345a274c979bf8ca1b4041c14318dd73810f79a
 2016-03-02 14:38:31 -05:00
Chris Wren
973c7ea389 resolve merge conflicts of 8b6e1c888b to master 
Change-Id: I0fd6a92de5b0679a4b870968f0c298acdfc9eb0a
 2016-03-02 14:20:10 -05:00
Jason Monk
f923db5623 Add edit title to QS edit 
Bug: 27439419
Change-Id: I3807dc56a05b1ffafcd9b390dfdbc1da9a7ebcac
 2016-03-02 14:11:14 -05:00
Jaewan Kim
008d56918b Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev 
am: 19d7eeaedf

* commit '19d7eeaedf4c80ae1d191f201ab028adc88ac2cb':
  PIP: Show recents again when PIP menu is closed
 2016-03-02 18:46:55 +00:00
Chong Zhang
20862420c2 Merge "Don\'t change resize mode if AM didn\'t dock the task as requested" into nyc-dev 
am: 5d9de3ab6f

* commit '5d9de3ab6f768c9b9d5c4fa627ce019f74370531':
  Don't change resize mode if AM didn't dock the task as requested
 2016-03-02 18:42:42 +00:00
Dongwon Kang
19d7eeaedf Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev 2016-03-02 18:34:10 +00:00
Chong Zhang
5d9de3ab6f Merge "Don't change resize mode if AM didn't dock the task as requested" into nyc-dev 2016-03-02 18:30:00 +00:00
Jason Monk
e38191b91a Merge "Fix crash from battery detail" into nyc-dev am: 8326e38bf5 
am: 49f68ab466

* commit '49f68ab466277bf7dc1821c07017d4b978820a3a':
  Fix crash from battery detail
 2016-03-02 18:16:59 +00:00
Chris Wren
8b6e1c888b Merge "add all those great comments from the other file" into nyc-dev 
am: e83cd6147b

* commit 'e83cd6147be45afd57722e414239d2dd15e257c0':
  add all those great comments from the other file
 2016-03-02 18:03:08 +00:00
Jason Monk
49f68ab466 Merge "Fix crash from battery detail" into nyc-dev 
am: 8326e38bf5

* commit '8326e38bf51de2771dab65baee9a97fb6ae7ff1d':
  Fix crash from battery detail
 2016-03-02 17:51:51 +00:00
Chris Wren
e83cd6147b Merge "add all those great comments from the other file" into nyc-dev 2016-03-02 17:51:29 +00:00
Jaewan Kim
3ebc1e3f99 PIP: Show recents again when PIP menu is closed 
Framework enforces that an app cannot go back to Recents.
So launches the Recents again for the PIP menu.

Change-Id: I7526edfe7dd38c7eb1befe6a8b2b5f4ea30aa84e
 2016-03-02 09:51:07 -08:00
Jason Monk
6cb901268e Fix crash from battery detail 
Bug: 27417780
Change-Id: Ia63dd78a4b7b75470b57c8262bbc836180274bf5
 2016-03-02 12:40:43 -05:00
Fyodor Kupolov
ace9577f68 Merge "Restored switchTo method" into nyc-dev am: 5dbe1f30ef 
am: 80d150f441

* commit '80d150f44199d96e69dfd206c732763e7d4136a6':
  Restored switchTo method
 2016-03-02 06:54:45 +00:00
Selim Cinek
fb7e6ad69a Fixed a bug where the notification texts wouldn\'t animate am: 049f6adfb8 
am: bf964bb1aa

* commit 'bf964bb1aa8bdea287721a376f8b46e3b0f5e422':
  Fixed a bug where the notification texts wouldn't animate
 2016-03-02 06:42:11 +00:00
Fyodor Kupolov
3fa9f47147 Merge "Disable switching users if the user is in a call" into nyc-dev am: 285bec2641 
am: cef5ba5adc

* commit 'cef5ba5adc070e31fb1a568bd8c48b5d631f1cf4':
  Disable switching users if the user is in a call
 2016-03-02 06:03:15 +00:00
Michael Wright
63913784e6 Merge "Show error message when pairing fails in SUW." into nyc-dev am: a75c2a7819 
am: c0f49f7e70

* commit 'c0f49f7e70f7529453ded0d5327fe611447b4471':
  Show error message when pairing fails in SUW.
 2016-03-02 05:36:45 +00:00
Fyodor Kupolov
80d150f441 Merge "Restored switchTo method" into nyc-dev 
am: 5dbe1f30ef

* commit '5dbe1f30ef1feac24d2c8216e6bcbdbb3340e0cf':
  Restored switchTo method
 2016-03-02 02:49:35 +00:00
Fyodor Kupolov
caab2666bd Restored switchTo method 
It is current used in another branch. Restored to fix a breakage.

Change-Id: Iec98bf525b88b6b5b45bffb97a1f3e9b57c492dd
 2016-03-01 18:39:27 -08:00
Selim Cinek
bf964bb1aa Fixed a bug where the notification texts wouldn\'t animate 
am: 049f6adfb8

* commit '049f6adfb8fea4622af5cd3247514ec7a461bf46':
  Fixed a bug where the notification texts wouldn't animate
 2016-03-02 02:04:00 +00:00
Jason Monk
0ad4d8bea7 Merge "Fix difference in icon size for quick QS" into nyc-dev am: bbcdab6f01 
am: 2415bc4f0b

* commit '2415bc4f0b84e9622f6ad99d2ef324059957f7ac':
  Fix difference in icon size for quick QS
 2016-03-02 02:03:24 +00:00
Winson
7cd810ca06 Fixing regression in creating dismiss descriptions. am: 9da1885047 
am: 595e294628

* commit '595e294628c34d44ad9f2c7e17543590b4de0d8a':
  Fixing regression in creating dismiss descriptions.
 2016-03-02 01:50:20 +00:00
Winson
c0a08b8013 Merge "Skip animation in error case, log for further investigation." into nyc-dev am: 6b03ff8d57 
am: c331564972

* commit 'c331564972670686d8b8ef08029e0baca4d2cf31':
  Skip animation in error case, log for further investigation.
 2016-03-02 01:46:54 +00:00
Selim Cinek
049f6adfb8 Fixed a bug where the notification texts wouldn't animate 
If the texts were the same but one had an ellipsis and the
other didn't, things were not animating nicely.

Bug: 27419215
Change-Id: Iaa9611e1cf60b6fe71113b76f36ab5c24e461961
 2016-03-02 01:21:26 +00:00
Fyodor Kupolov
cef5ba5adc Merge "Disable switching users if the user is in a call" into nyc-dev 
am: 285bec2641

* commit '285bec2641292abc37c5ad230bd309cede754a70':
  Disable switching users if the user is in a call
 2016-03-01 23:33:32 +00:00
Fyodor Kupolov
285bec2641 Merge "Disable switching users if the user is in a call" into nyc-dev 2016-03-01 23:21:29 +00:00
Chong Zhang
e4fbd328f8 Don't change resize mode if AM didn't dock the task as requested 
AM may not docked the task as requested if the task is not resizeable.
Setting resizing in this case would cause unnecessary drag-resizing,
and the resize mode will go out of sync.

bug: 27390258
Change-Id: I72d671ac015f93fde5aaa025fbade93acd9d9ca7
 2016-03-01 14:52:58 -08:00
Michael Wright
c0f49f7e70 Merge "Show error message when pairing fails in SUW." into nyc-dev 
am: a75c2a7819

* commit 'a75c2a7819a5ecc3c797649b94eb64adf3c99d3e':
  Show error message when pairing fails in SUW.
 2016-03-01 22:47:18 +00:00
Jason Monk
2415bc4f0b Merge "Fix difference in icon size for quick QS" into nyc-dev 
am: bbcdab6f01

* commit 'bbcdab6f012d9d8043e35af8771fb9cc8a66645c':
  Fix difference in icon size for quick QS
 2016-03-01 22:34:15 +00:00
Winson
595e294628 Fixing regression in creating dismiss descriptions. 
am: 9da1885047

* commit '9da18850475505fc5c0dacd3100ae95128b9bd65':
  Fixing regression in creating dismiss descriptions.
 2016-03-01 22:26:28 +00:00
Winson
c331564972 Merge "Skip animation in error case, log for further investigation." into nyc-dev 
am: 6b03ff8d57

* commit '6b03ff8d57bd8c211eb3b3dc2abdb96a1bfa81dc':
  Skip animation in error case, log for further investigation.
 2016-03-01 22:24:44 +00:00
Chris Wren
7c5168457b add all those great comments from the other file 
also pick up some enum renaming

Bug: 27429645
Change-Id: Id26ddea46755b43e8db298b87b3a47b69be0f728
 2016-03-01 16:44:32 -05:00
Michael Wright
a75c2a7819 Merge "Show error message when pairing fails in SUW." into nyc-dev 2016-03-01 21:32:06 +00:00
Jason Monk
e31a5bd798 Merge "Handle density changes in QS" into nyc-dev am: e636afd901 
am: a2ad1706f0

* commit 'a2ad1706f011118d879c603c6c2b731e3faa0674':
  Handle density changes in QS
 2016-03-01 21:17:27 +00:00
Selim Cinek
a533e8989d Notification groups with only one child behave nicer when swiping am: a26ddbaf7b 
am: 237811fa92

* commit '237811fa921aff5661f4051e4e0c1fbc594e4269':
  Notification groups with only one child behave nicer when swiping
 2016-03-01 21:15:27 +00:00
Selim Cinek
91eb3b14fa Fixed a bug where children were not / incorrectly userlocked am: 8e0c498165 
am: 30224519ca

* commit '30224519ca1e5d0b55c06dce36af567c0769224d':
  Fixed a bug where children were not / incorrectly userlocked
 2016-03-01 20:54:10 +00:00
Jason Monk
a2ad1706f0 Merge "Handle density changes in QS" into nyc-dev 
am: e636afd901

* commit 'e636afd901a58ff54433c907a324ed56d4d33f9c':
  Handle density changes in QS
 2016-03-01 20:53:25 +00:00
Selim Cinek
cadaa4988c Expanding first child in a group now if it\'s the only one am: 898d173b92 
am: 1ec621e3f8

* commit '1ec621e3f85b88eda04cc32de47947029b4b5dc4':
  Expanding first child in a group now if it's the only one
 2016-03-01 20:50:20 +00:00
Selim Cinek
237811fa92 Notification groups with only one child behave nicer when swiping 
am: a26ddbaf7b

* commit 'a26ddbaf7b5dd642e95cb7be33137312a799546a':
  Notification groups with only one child behave nicer when swiping
 2016-03-01 20:49:42 +00:00
Selim Cinek
30224519ca Fixed a bug where children were not / incorrectly userlocked 
am: 8e0c498165

* commit '8e0c4981656a7def112b10c1bec8e9a00142aa52':
  Fixed a bug where children were not / incorrectly userlocked
 2016-03-01 20:46:31 +00:00
Selim Cinek
1ec621e3f8 Expanding first child in a group now if it\'s the only one 
am: 898d173b92

* commit '898d173b92fb78d56bce208da31808d0852c7762':
  Expanding first child in a group now if it's the only one
 2016-03-01 20:43:14 +00:00
Julia Reynolds
35efc022ca Merge "Fix app icon in notification guts." into nyc-dev am: 1c7cd0a882 
am: 6144df9712

* commit '6144df9712159adb8e561f622f32f7e4c72253ce':
  Fix app icon in notification guts.
 2016-03-01 20:15:18 +00:00