Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
280,601 Commits 3 Branches 0 Tags
bec5fee38d20f58bd5dd372f6b3449b22016dee8
Commit Graph

280601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manu Cornet
bec5fee38d 2D Recents: use a slightly darker scrim background 
am: 48de4e6afe

Change-Id: I33a961dbd1741d72fa86a0cde0b2e60b76271955
 2016-12-29 00:19:48 +00:00
Android Build Merger (Role)
31ebbf40bc Merge "Merge "Resue TaskView information." into nyc-mr2-dev am: 6335e35d51" into nyc-mr2-dev-plus-aosp 2016-12-29 00:00:25 +00:00
Android Build Merger (Role)
a1ac1af80f Merge "Resue TaskView information. am: 0a5e2d6b93" into nyc-mr2-dev-plus-aosp 2016-12-28 23:59:59 +00:00
Jiaquan He
e0133206d3 Merge "Resue TaskView information." into nyc-mr2-dev 
am: 6335e35d51

Change-Id: I6498fbdb0c948913da95a5beccaa9feeb5f8f1ed
 2016-12-28 23:58:54 +00:00
Jiaquan He
e6dd53291e Resue TaskView information. 
am: 0a5e2d6b93

Change-Id: I0d998b0e31dedb48ef284386811fe67fbda6c981
 2016-12-28 23:58:49 +00:00
Adrian Roos
0a4e1b7078 Merge "QS - Fix race condition in accessibility" am: 302efd6125 am: 3c0a8bba3c 
am: b12ed1e10f

Change-Id: I2f17f2bd2f293f2c68ba20fbfd6aa3e693f8b865
 2016-12-28 23:58:43 +00:00
Adrian Roos
b12ed1e10f Merge "QS - Fix race condition in accessibility" am: 302efd6125 
am: 3c0a8bba3c

Change-Id: I3e05c8c127c021dc321b0ef130159ff7a021a9e8
 2016-12-28 23:51:30 +00:00
TreeHugger Robot
6335e35d51 Merge "Resue TaskView information." into nyc-mr2-dev 2016-12-28 23:50:57 +00:00
Adrian Roos
3c0a8bba3c Merge "QS - Fix race condition in accessibility" 
am: 302efd6125

Change-Id: I13c4959fde96684c52124ff8809d6921fc404a42
 2016-12-28 23:43:46 +00:00
Adrian Roos
302efd6125 Merge "QS - Fix race condition in accessibility" 2016-12-28 23:29:59 +00:00
Andrew Solovay
eb609a3d0f Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc am: 897df2b5af 
am: 602c3c7073

Change-Id: I496cfe09a488f9bfc278e10e72423da3e2406c6f
 2016-12-28 20:45:39 +00:00
Andrew Solovay
3a623dcd7d [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33 am: 2891357f4d 
am: 23473e8851

Change-Id: Id8590431f317068e0f851f0b77862b825734eae6
 2016-12-28 20:44:32 +00:00
Andrew Solovay
75a9407af6 Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc am: 897df2b5af 
am: 563ca19747

Change-Id: I133647a253f62208c7ee6deb6cf15a955f09ec8e
 2016-12-28 20:38:40 +00:00
Andrew Solovay
88addedb34 [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33 am: 2891357f4d 
am: ff501e5e5f

Change-Id: I8e7bf9b66c92ed5db45007084075fca36ccaa0c8
 2016-12-28 20:37:36 +00:00
Andrew Solovay
602c3c7073 Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc 
am: 897df2b5af

Change-Id: I06cea8a7d84e02346047e0e0bf88cf30f9da4120
 2016-12-28 20:32:13 +00:00
Andrew Solovay
563ca19747 Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc 
am: 897df2b5af

Change-Id: I32b241e93caac5e38c54610b799c877365be75ff
 2016-12-28 20:32:03 +00:00
Andrew Solovay
23473e8851 [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33 
am: 2891357f4d

Change-Id: Id95f2f8c11a98b56f656b3688accd632fe6da43d
 2016-12-28 20:31:08 +00:00
Andrew Solovay
ff501e5e5f [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am: 40ba793b33 
am: 2891357f4d

Change-Id: I9b15c8787d6f6aa6c2d362de46ab06a583d3283c
 2016-12-28 20:31:02 +00:00
Andrew Solovay
897df2b5af Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev 
am: 61dad4b2fc

Change-Id: I1918b70ad644f7aded33d27bcc55e05478d9f773
 2016-12-28 20:24:34 +00:00
Andrew Solovay
2891357f4d [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. 
am: 40ba793b33

Change-Id: I5d15df8192fee8362dca8dcc53d84b75af29a13f
 2016-12-28 20:24:30 +00:00
Jeremy Joslin
7a93f7e661 Merge "Cleanup the evaluateBinding() method." am: c26aa87a2b am: b12af1b18a 
am: 3ba918c9d3

Change-Id: I72485ebbaed2b60b48d1b4694b0db56b9f2178ca
 2016-12-28 20:17:35 +00:00
Andrew Solovay
61dad4b2fc Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev 2016-12-28 20:16:30 +00:00
Jeremy Joslin
3ba918c9d3 Merge "Cleanup the evaluateBinding() method." am: c26aa87a2b 
am: b12af1b18a

Change-Id: I65d005aa303102b212c93b0b2702941bf554526d
 2016-12-28 20:10:35 +00:00
Jeremy Joslin
b12af1b18a Merge "Cleanup the evaluateBinding() method." 
am: c26aa87a2b

Change-Id: Iaac51cf5114ed6af55246b3580b9f5403a1bb3bd
 2016-12-28 20:03:05 +00:00
Treehugger Robot
c26aa87a2b Merge "Cleanup the evaluateBinding() method." 2016-12-28 19:52:42 +00:00
Jiaquan He
bec9df8060 Merge "Check split screen properly." into nyc-mr2-dev 
am: 632332c259

Change-Id: I2d69e69b9e00d076f2707a690137d5278fd2107c
 2016-12-28 19:20:06 +00:00
Jiaquan He
e3ecb097b0 Check split screen properly. 
am: 5fac212e8b

Change-Id: Ica99e37798a2447acdbddb7b29b6e67655870b1d
 2016-12-28 19:20:00 +00:00
Jiaquan He
632332c259 Merge "Check split screen properly." into nyc-mr2-dev 2016-12-28 19:12:27 +00:00
Jeremy Joslin
e3d260d4e9 Cleanup the evaluateBinding() method. 
Small refactor to remove 1 level of nesting.

Test: build, run.
Change-Id: Ic46a65036b207ff73fefced914e0928de2f2b500
Merged-In: I38836ca9d18c5fcd3c6edf5931b58de3b08614ee
 2016-12-28 10:18:55 -08:00
Jorim Jaggi
3b03622406 Merge "Change screen pinning back to old gesture" into nyc-mr2-dev 
am: 8812fb0695

Change-Id: I4a5ccf55bf02ba25d4ce652ac86cdba20814d661
 2016-12-28 17:12:38 +00:00
Jorim Jaggi
6f0236688f Change screen pinning back to old gesture 
am: 4e723e6087

Change-Id: I83dee36d5d3b16adbf740dd6495e7945bf0236ef
 2016-12-28 17:12:28 +00:00
Jorim Jaggi
8812fb0695 Merge "Change screen pinning back to old gesture" into nyc-mr2-dev 2016-12-28 17:01:22 +00:00
Jorim Jaggi
4e723e6087 Change screen pinning back to old gesture 
This makes the code a bit more complicated, but allows apps to
receive long-press back again and also makes the mode harder
to exit for toddlers.

Test: Without TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Test: With TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Merged-In: Icd7347aa9c60af00fdb0b3991baabb730552d097
Change-Id: Icd7347aa9c60af00fdb0b3991baabb730552d097
Fixes: 32440409
 2016-12-28 05:56:17 -08:00
Joe LaPenna
b84fd75bf4 Merge "Send RECOMMEND_NETWORKS action when binding to provider." am: 1471ad3ea7 am: ddff9e586c 
am: bef179f094

Change-Id: I4b8a42cb9499e9ba2beab0b39375485d1898b07c
 2016-12-28 03:03:33 +00:00
Joe LaPenna
bef179f094 Merge "Send RECOMMEND_NETWORKS action when binding to provider." am: 1471ad3ea7 
am: ddff9e586c

Change-Id: Ie86fbc9c427e3f238e0d83a03240fc7045a61e5e
 2016-12-28 02:56:34 +00:00
Joe LaPenna
ddff9e586c Merge "Send RECOMMEND_NETWORKS action when binding to provider." 
am: 1471ad3ea7

Change-Id: I9b052e48c067dc50111c6ce6bf1b200232676aa2
 2016-12-28 02:49:01 +00:00
Treehugger Robot
1471ad3ea7 Merge "Send RECOMMEND_NETWORKS action when binding to provider." 2016-12-28 02:36:23 +00:00
Adrian Roos
99a921a272 Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev 
am: 02f07cce35

Change-Id: I3890e276ab985977f7e02d77c91c403700c254d6
 2016-12-27 23:49:53 +00:00
Adrian Roos
dff956b0e0 Ambient Display: Fix race with coloring and redaction 
am: e5726a2082

Change-Id: I9c2c42692f01b7665fb11d6e0f47c707d3c630fc
 2016-12-27 23:49:46 +00:00
Jiaquan He
0a5e2d6b93 Resue TaskView information. 
In this commit we calculate all the TaskView information we need
during initialization, so that we don't need to calculate again
unless any configuration is changed.

Bug: 32101881
Change-Id: I433688d0a05c69064d0da5268b61340cecdbfe74
 2016-12-27 15:48:07 -08:00
Adrian Roos
02f07cce35 Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev 2016-12-27 23:37:00 +00:00
Adrian Roos
656f7e2090 Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev 
am: 52133e6916

Change-Id: I9fe96a428c918f1fc250b021ddd4d1c6fbdd061b
 2016-12-27 23:29:54 +00:00
Adrian Roos
c30dc190ba Keyguard: Don't lock on SIM removed during shutdown 
am: 1f8025adf2

Change-Id: I22b34aa27c6540bf661081950a51eb275894c032
 2016-12-27 23:29:47 +00:00
Adrian Roos
52133e6916 Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev 2016-12-27 23:20:47 +00:00
Joe LaPenna
9bc5effad5 Send RECOMMEND_NETWORKS action when binding to provider. 
Some services use action to disambiguate which binder to return in
onBind.

Test: built && installed && bound.
BUG: 33905890
Change-Id: I83ae41b472c597661b93f5467b64b258e9056f5f
Merged-In: I83ae41b472c597661b93f5467b64b258e9056f5f
 2016-12-27 14:56:54 -08:00
Jiaquan He
5fac212e8b Check split screen properly. 
This commit detacts split screen by checking whether there's
a docked task instead of multi window mode.

Bug: 33847223
Bug: 32101881
Change-Id: I23ee11e57ded7c5e81d51cfbfea05500a879945c
 2016-12-27 14:52:24 -08:00
Selim Cinek
cbffdfabea Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev 
am: cbb057d3da

Change-Id: I2c4f83b83dfa685c8b838b9206e26231a0b9aac0
 2016-12-27 19:22:10 +00:00
Selim Cinek
7e5cff0167 DO NOT MERGE Revert "Add Brightness setting for VR Mode." 
am: 966045d070

Change-Id: Ib1be78a47f5947f4fcc6eabc2f6af76523690ed9
 2016-12-27 19:22:04 +00:00
TreeHugger Robot
cbb057d3da Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev 2016-12-27 19:08:59 +00:00
Selim Cinek
966045d070 DO NOT MERGE Revert "Add Brightness setting for VR Mode." 
This reverts commit 84980c7a93.

Bug: 33895226
Bug: 30984614
Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f
 2016-12-27 18:28:40 +00:00