Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
281,383 Commits 3 Branches 0 Tags
ae5df0544a5fb2eadd28851469ed7113fd00a6d8
Commit Graph

281383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manu Cornet
ae5df0544a Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev 
am: 5ee87b5b6a

Change-Id: I4ae207701f09d1a1723fca5fb237968ba5905574
 2017-01-13 00:28:26 +00:00
Manu Cornet
bc6bdb3ef8 2D Recents: Use a different task dismiss animation 
am: 5df7667edb

Change-Id: Ib6186c663057d7a3c8d44ec13254f6c8b76ce3de
 2017-01-13 00:28:19 +00:00
Manu Cornet
5ee87b5b6a Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev 2017-01-13 00:23:48 +00:00
Robert Greenwalt
907585c004 Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 
am: 503d8fbb26

Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
 2017-01-12 23:20:45 +00:00
Robert Greenwalt
503d8fbb26 Merge "Add support for FDN contact dial" am: 082b118641 
am: 24dea10375

Change-Id: I5091d35ff79eff952c57109ce120369c95309598
 2017-01-12 23:16:20 +00:00
Robert Greenwalt
24dea10375 Merge "Add support for FDN contact dial" 
am: 082b118641

Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc
 2017-01-12 23:12:23 +00:00
Robert Greenwalt
082b118641 Merge "Add support for FDN contact dial" 2017-01-12 23:07:00 +00:00
Andrew Sapperstein
b5571b1a18 Merge "Create a global registry for system message IDs" into nyc-mr2-dev 
am: 1f2769189d

Change-Id: I39320f591a7e67ac7af27bc533bdddd0b728ca68
 2017-01-12 21:23:16 +00:00
Chris Wren
99a16ab0ec Create a global registry for system message IDs 
am: 117d5b4f28

Change-Id: Iaa792c9dbffaae807bdf0a8cfb30e66aecb442d6
 2017-01-12 21:23:11 +00:00
Andrew Sapperstein
1f2769189d Merge "Create a global registry for system message IDs" into nyc-mr2-dev 2017-01-12 21:18:28 +00:00
Andrew Rossignol
6ebc52a950 Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev 
am: c65a010a39  -s ours

Change-Id: I39efaeb589830e7d448e208d37a079c798477224
 2017-01-12 18:59:56 +00:00
Andrew Rossignol
4fa95e7bbb Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black" 
am: 57edeef91a  -s ours

Change-Id: I4e4ed0215ad07f49101119c0f262d0dc5acbab8d
 2017-01-12 18:59:51 +00:00
Jiaquan He
97b832a438 Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev 
am: 5c4c5e1682

Change-Id: Ide8408c2d18740b4058c49a9c3b4f0912e7c5da9
 2017-01-12 18:56:34 +00:00
Jiaquan He
0cb857822e 2D Recents: Show shadows behind task views. 
am: 15fa3246d8

Change-Id: Ia2401df9750bb42a53ae214ed8998e1225499337
 2017-01-12 18:56:27 +00:00
TreeHugger Robot
c65a010a39 Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev 2017-01-12 18:52:42 +00:00
Jiaquan He
5c4c5e1682 Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev 2017-01-12 18:50:11 +00:00
Selim Cinek
8b36bbf0ea Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev 
am: c1c7d1f938

Change-Id: I58bf2fdd1b1b89d8b9b7b86110836ee1f6c56ffa
 2017-01-12 18:42:41 +00:00
Selim Cinek
97f14c47db Fixed a bug where notifications could stay expanded 
am: b2236108ae

Change-Id: I9c776321f0865f6971692008256cd80adbab5469
 2017-01-12 18:42:32 +00:00
Selim Cinek
c1c7d1f938 Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev 2017-01-12 18:37:07 +00:00
Bill Yi
04f8ba7bb7 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: 2f9af2aa69  -s ours

Change-Id: Ia26f0fd7cf8f1c0937fd5b42fed1c8aee22111e0
 2017-01-12 17:24:45 +00:00
Bill Yi
5aef5be20b Import translations. DO NOT MERGE 
am: 50a1d26ac0  -s ours

Change-Id: I3aa3b58828ce0d6363d0491b7b9acfd022db2b25
 2017-01-12 17:24:41 +00:00
Bill Yi
ae29fff572 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: 57988f49e6  -s ours

Change-Id: I9a01ac7789ba1cd8568ed286aa4e22676ae381b1
 2017-01-12 17:22:54 +00:00
Bill Yi
349e01836f Import translations. DO NOT MERGE 
am: 8c90b5ace0  -s ours

Change-Id: I8f1eb0d40376248db07c790386db738fa36220ae
 2017-01-12 17:22:50 +00:00
TreeHugger Robot
2f9af2aa69 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-12 17:19:04 +00:00
TreeHugger Robot
57988f49e6 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-12 17:17:50 +00:00
Andre Eisenbach
efb1bda2d6 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e am: 2d0ad3a9e7 
am: e81838f7e1

Change-Id: I62d424e92e10c1604938349e94ae38938557130c
 2017-01-12 16:48:15 +00:00
Andre Eisenbach
e81838f7e1 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e 
am: 2d0ad3a9e7

Change-Id: I9ba589e7b46bf48374b30975ccc9fedb6d740b01
 2017-01-12 16:44:42 +00:00
Andre Eisenbach
2d0ad3a9e7 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" 
am: 0b9a18d21e

Change-Id: I245966c53c49da6c0b95b73ec72754d85edcd627
 2017-01-12 16:27:03 +00:00
Selim Cinek
5736b1689a Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev 
am: c687aa08c1

Change-Id: I99ba4164acbb902f8037859fea4654691e834c81
 2017-01-12 16:14:47 +00:00
Selim Cinek
f6c9c21745 Allowing heads-up notifications now on the lock screen 
am: ab24dc9f29

Change-Id: I7677c513dba5d787e44bdd73b3cc5d9c004305f5
 2017-01-12 16:14:34 +00:00
Selim Cinek
85e481140c Introduced the visual stability manager 
am: add9526b1d

Change-Id: I4a8ff70995585461d84ce6a4a3976104e7465547
 2017-01-12 16:13:47 +00:00
Selim Cinek
fabd50de62 Removing notifications always immediately when swiping them away 
am: 5e018206e2

Change-Id: I09f3b3a2f793b10b7c9c39e96b26a89992a1314a
 2017-01-12 16:13:00 +00:00
Mark Salyzyn
ec7e2a164c Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b am: d1740f0f5b 
am: 6dacea63d9

Change-Id: Ife229cc450dbbb5f43941fcd1b08b86f0e41a779
 2017-01-12 15:59:48 +00:00
Andre Eisenbach
0b9a18d21e Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" 2017-01-12 15:58:37 +00:00
Andre Eisenbach
8b4838e5e3 Revert "Don't offer the BT sharing option to the user if BT is disallowed." 
Causes boot loop issue:

02-15 02:31:59.785   770   770 E System  : Caused by: java.lang.IllegalArgumentException: Unknown component: com.android.bluetooth/com.android.bluetooth.opp.BluetoothOppLauncherActivity
02-15 02:31:59.785   770   770 E System  : .at com.android.server.pm.PackageManagerService.setEnabledSetting(PackageManagerService.java:18500)
02-15 02:31:59.785   770   770 E System  : .at com.android.server.pm.PackageManagerService.setComponentEnabledSetting(PackageManagerService.java:18461)
02-15 02:31:59.785   770   770 E System  : .at android.app.ApplicationPackageManager.setComponentEnabledSetting(ApplicationPackageManager.java:2129)
02-15 02:31:59.785   770   770 E System  : .at com.android.server.BluetoothManagerService.updateOppLauncherComponentState(BluetoothManagerService.java:2036)



This reverts commit 77fe44ffb6.

Change-Id: Ia079bb2fcc91bb5979a3840ab50b9d9ddda1cf24
 2017-01-12 15:57:29 +00:00
Selim Cinek
c687aa08c1 Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev 
* changes:
  Allowing heads-up notifications now on the lock screen
  Introduced the visual stability manager
  Removing notifications always immediately when swiping them away
 2017-01-12 15:55:30 +00:00
Selim Cinek
b2236108ae Fixed a bug where notifications could stay expanded 
When expanding and locking the screen, the notification
could be stuck in a userlocked state and therefore look
expanded even on the lock screen.
Another case where this could happen was when there was
a race between locking the screen and collapsing a group.

Merged-In: I4f359d727013ee8c9e4174d2855896ba8d3d1a0b
Change-Id: I4f359d727013ee8c9e4174d2855896ba8d3d1a0b
Test: have group on locked shade, expand, click on middle space during expansion
Bug: 33614507
 2017-01-12 15:52:53 +00:00
Mark Salyzyn
6dacea63d9 Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b 
am: d1740f0f5b

Change-Id: I78430cd21cf1186ccc2b48ee4ee8a9b07decde5e
 2017-01-12 15:46:20 +00:00
Mark Salyzyn
d1740f0f5b Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" 
am: 2225a0640b

Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966
 2017-01-12 15:32:50 +00:00
Mark Salyzyn
2225a0640b Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" 2017-01-12 15:18:26 +00:00
Bill Yi
8c90b5ace0 Import translations. DO NOT MERGE 
Change-Id: I6119a209e99f4e301961a07b18b181b8069cfd3e
Auto-generated-cl: translation import
 2017-01-12 03:41:01 -08:00
Przemyslaw Szczepaniak
4103219402 Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a am: 3556fd53a2 
am: 95322ffdde

Change-Id: Ibc624034478689ad1208e5da15835a6acd2d796a
 2017-01-12 11:39:05 +00:00
Przemyslaw Szczepaniak
95322ffdde Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a 
am: 3556fd53a2

Change-Id: Idd321bad02683a94425fb2b6302f3f7621b6844f
 2017-01-12 11:33:15 +00:00
Bill Yi
50a1d26ac0 Import translations. DO NOT MERGE 
Change-Id: Ib976549750fe35328391038a3f7bf3e3e7f6f13b
Auto-generated-cl: translation import
 2017-01-12 03:29:23 -08:00
Przemyslaw Szczepaniak
3556fd53a2 Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" 
am: c0d71fa38a

Change-Id: I43d1e2241bfcb1dde53390e21c94c44054375901
 2017-01-12 11:27:32 +00:00
Treehugger Robot
c0d71fa38a Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" 2017-01-12 11:20:06 +00:00
Erik Kline
190d8591ce Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356 
am: 082263344a

Change-Id: I11af9d4b1810cce628e240f2d8b6980ea55cd40a
 2017-01-12 10:43:26 +00:00
Martijn Coenen
cfc4e21899 Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9 
am: eed50c1809

Change-Id: Ia89700ddb0300b931e11b3f4dc5f31c4234d7076
 2017-01-12 10:38:28 +00:00
Erik Kline
082263344a Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b 
am: cbd3d8b356

Change-Id: I845443ae243429847e0a42b3be5bec6276a216c0
 2017-01-12 10:33:24 +00:00
Martijn Coenen
eed50c1809 Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb 
am: aa4d6f1be9

Change-Id: I5153b688467f4d06da701eaa34bfa19c7904e33d
 2017-01-12 10:31:35 +00:00