Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
242,748 Commits 3 Branches 0 Tags
1ab2cf9044c109867ea8a6dde8fad3daee9d2ca3
Commit Graph

63441 Commits

Author SHA1 Message Date
Yigit Boyar
1ab2cf9044 Merge "Multiple fixes in ScrollView and HorizontalScrollView" into nyc-dev am: 7de3b2d 
am: c337826

* commit 'c337826536acb05d7f913d65a868a9953b100fee':
  Multiple fixes in ScrollView and HorizontalScrollView

Change-Id: I9c89d5a896c0787126e2948572c0b4964232c403
 2016-03-30 18:07:21 +00:00
Yigit Boyar
c337826536 Merge "Multiple fixes in ScrollView and HorizontalScrollView" into nyc-dev 
am: 7de3b2d

* commit '7de3b2d89834028c88e7f6590e5682b02e96e32e':
  Multiple fixes in ScrollView and HorizontalScrollView

Change-Id: I00bd3b137343ffb461543beca8ea8d5c9ec1aebe
 2016-03-30 18:02:31 +00:00
Rubin Xu
29f23aaf2e Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev am: 5b7ca24 
am: 4b86800

* commit '4b8680005545101443e1fbbd3fc5d8a630ce6ae5':
  Add DevicePolicyManager API to install a client cert chain.

Change-Id: I0ff5173cc61f0c19ef5084c97b8fe34fdf9f78d5
 2016-03-30 18:02:08 +00:00
Rubin Xu
4b86800055 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev 
am: 5b7ca24

* commit '5b7ca24f14ae4d1189ca7683fdad1ec0e62b88b8':
  Add DevicePolicyManager API to install a client cert chain.

Change-Id: I499344fa3ae5d978bec6a4f8498f1ca037bd4505
 2016-03-30 17:57:50 +00:00
Yigit Boyar
7de3b2d898 Merge "Multiple fixes in ScrollView and HorizontalScrollView" into nyc-dev 2016-03-30 17:51:55 +00:00
Rubin Xu
5b7ca24f14 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev 2016-03-30 17:46:18 +00:00
Clara Bayarri
cc536fd307 Merge "Change default work challenge background color" into nyc-dev am: 30fb053 
am: 3fcd1e7

* commit '3fcd1e74f45fd6a5a0ba8ee44d1a8b41204bfaa9':
  Change default work challenge background color

Change-Id: Ie7e8dc153d2486c10cefcc004598cbb4009e6a31
 2016-03-30 16:32:13 +00:00
Clara Bayarri
3fcd1e74f4 Merge "Change default work challenge background color" into nyc-dev 
am: 30fb053

* commit '30fb0534492478a3f95f6953b31bbb666ced8fe5':
  Change default work challenge background color

Change-Id: Ib9b90a9d84c0502d37fc5b53ef4c83e830a8a822
 2016-03-30 16:24:03 +00:00
Makoto Onuki
4f1f7b0167 Merge "ShortcutManager: Support secondary text field." into nyc-dev am: ca0ee28 
am: a3d8cdc

* commit 'a3d8cdca997e0577bcb1d9091880a0267e2d3f38':
  ShortcutManager: Support secondary text field.

Change-Id: I5262a756c5fe50e498192aea8e247f46d5742edc
 2016-03-30 16:17:36 +00:00
Philip P. Moltmann
18f68dd466 Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev am: a393be9 
am: 7f5f0de

* commit '7f5f0de5c4f02c6463594c51b046a0d18d7de038':
  Add cancelation signal to OnRequestPrinterIcon.

Change-Id: I9319a8947be763f57ca607feb66cd1c74c8cebe0
 2016-03-30 16:16:58 +00:00
Alan Viverette
921889629e Merge "Pull weekday names directly from ICU" into nyc-dev am: a3a3f35 
am: f5d6b7f

* commit 'f5d6b7faf180e5037e4100527ed3e4c2012e83bc':
  Pull weekday names directly from ICU

Change-Id: Ic248b5b4ae03805217b32acf28f89ce6bc5e718f
 2016-03-30 16:16:23 +00:00
David Brazdil
dac7ce8efb Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev am: b67b5b9 
am: 72ecc75

* commit '72ecc752ce1cb3683a6671e2de25123bead2df83':
  Move OTA package update before fstrim, hide "Optimizing apps" dialog

Change-Id: Ic4d927f18f741bf81ad64882e5acc1665f13809e
 2016-03-30 16:16:09 +00:00
Andrei Stingaceanu
bbb3aee63a Merge "AfW custom lock screen message - API polish" into nyc-dev am: b70ba19 
am: f46e776

* commit 'f46e776b063c66a06aa1ccc263ea3b75da43e874':
  AfW custom lock screen message - API polish

Change-Id: Ic9fa7d92d7460dc710bb06338e629d74d533d184
 2016-03-30 16:15:39 +00:00
Chris Banes
6216b04d59 Merge "Re-dispatch nested scrolls if not implemented" into nyc-dev am: 6b69b12 
am: 75ff37e

* commit '75ff37ebed187f2a773aac6e459ca7955bf58fa8':
  Re-dispatch nested scrolls if not implemented

Change-Id: I569b2a582439d5b098d9ea6524551957f78e9b27
 2016-03-30 16:15:03 +00:00
Clara Bayarri
30fb053449 Merge "Change default work challenge background color" into nyc-dev 2016-03-30 16:13:00 +00:00
Andre Eisenbach
41ab3eea93 Always use Write Request for GATT descriptor writes am: 613f430 
am: 5e4e14c

* commit '5e4e14c4f18fcc0d8ed7d7ba790aedf10b0e14e7':
  Always use Write Request for GATT descriptor writes

Change-Id: Id49e9e549abfdcc35dcd2620c6606c45ea1a2bef
 2016-03-30 16:12:42 +00:00
Clara Bayarri
8d0bd7fa63 Change default work challenge background color 
Requested by UX

Bug: 27829562
Change-Id: I815c06784189e68b09e464e936521e82091c93c3
 2016-03-30 17:12:08 +01:00
Makoto Onuki
a3d8cdca99 Merge "ShortcutManager: Support secondary text field." into nyc-dev 
am: ca0ee28

* commit 'ca0ee285bb28ee5698d7cf2680e2fa6ca337cefd':
  ShortcutManager: Support secondary text field.

Change-Id: If7e3e8cfc14b1d7225a4167a4e8dac900c62b7e3
 2016-03-30 15:38:13 +00:00
Philip P. Moltmann
7f5f0de5c4 Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev 
am: a393be9

* commit 'a393be93196d89a53d53097941857b539f88da96':
  Add cancelation signal to OnRequestPrinterIcon.

Change-Id: I4a46ed1c0b9ab90edaae138ecbe0c15f82403794
 2016-03-30 15:30:29 +00:00
Makoto Onuki
ca0ee285bb Merge "ShortcutManager: Support secondary text field." into nyc-dev 2016-03-30 15:30:17 +00:00
Philip P. Moltmann
a393be9319 Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev 2016-03-30 15:18:32 +00:00
Alan Viverette
f5d6b7faf1 Merge "Pull weekday names directly from ICU" into nyc-dev 
am: a3a3f35

* commit 'a3a3f35e8d5cafcb0e872e014ec3749329202174':
  Pull weekday names directly from ICU

Change-Id: I035332c98c525f3c1aa3d672eec33b90ae48fe59
 2016-03-30 13:45:44 +00:00
Alan Viverette
a3a3f35e8d Merge "Pull weekday names directly from ICU" into nyc-dev 2016-03-30 13:35:18 +00:00
David Brazdil
72ecc752ce Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev 
am: b67b5b9

* commit 'b67b5b9f3c947fc6d835459f0e880eb5fcaad50b':
  Move OTA package update before fstrim, hide "Optimizing apps" dialog

Change-Id: I8dd098ffb1a28c4061135112690fd1bdfca9a1b8
 2016-03-30 12:51:29 +00:00
David Brazdil
b67b5b9f3c Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev 2016-03-30 12:41:06 +00:00
David Brazdil
f5c444ffd4 Move OTA package update before fstrim, hide "Optimizing apps" dialog 
This patch moves the updating of packages before performing fstrim,
which runs asynchronously anyway, and stops showing the UI dialog.

Bug: 27350503
Change-Id: I6fceda10d7696f9badb97978fb9dc7927d698a4b
 2016-03-30 13:39:14 +01:00
Andrei Stingaceanu
f46e776b06 Merge "AfW custom lock screen message - API polish" into nyc-dev 
am: b70ba19

* commit 'b70ba1971c29db87e405434161489e2450309050':
  AfW custom lock screen message - API polish

Change-Id: Id2ce5fced3d6b39ab2948cb6ab7ee5001fa534cf
 2016-03-30 12:35:38 +00:00
Andrei Stingaceanu
b70ba1971c Merge "AfW custom lock screen message - API polish" into nyc-dev 2016-03-30 12:23:56 +00:00
Rubin Xu
b436591708 Add DevicePolicyManager API to install a client cert chain. 
When installing a keypair the caller will have the option to specify a
certificate chain which will later be returned to whoever requests access
to the keypair via KeyChain.

Bug: 18239590
Change-Id: Id21ef026e31537db38d891cb9b712dd4fe7159c7
 2016-03-30 11:57:58 +01:00
Chris Banes
75ff37ebed Merge "Re-dispatch nested scrolls if not implemented" into nyc-dev 
am: 6b69b12

* commit '6b69b122025631290380f4350f7bd0074bad10dd':
  Re-dispatch nested scrolls if not implemented

Change-Id: Ibb88f89e0c77b2eef7dfda72c023fc19f27d77a0
 2016-03-30 08:49:00 +00:00
Chris Banes
6b69b12202 Merge "Re-dispatch nested scrolls if not implemented" into nyc-dev 2016-03-30 08:43:40 +00:00
Andre Eisenbach
5e4e14c4f1 Always use Write Request for GATT descriptor writes 
am: 613f430

* commit '613f43017736580a1625cda3c5a3ed1ea7c79238':
  Always use Write Request for GATT descriptor writes

Change-Id: Ibec3a7d44146b678f31a2c898f5be376d2a5e1a1
 2016-03-30 06:52:52 +00:00
Andre Eisenbach
613f430177 Always use Write Request for GATT descriptor writes 
According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used used
for this sub-procedure".

Change-Id: I86e4e1d3a8bfd7d78dfed8419f8abd2d7e89b2bc
 2016-03-30 06:48:58 +00:00
Andre Eisenbach
4485ecd680 Fix log spam in getCharacteristicById() am: 1591d36 
am: 6fbbf9f

* commit '6fbbf9f7acfaefc178769e208cfea136d63104f8':
  Fix log spam in getCharacteristicById()

Change-Id: I74a4554a83a98c8941b2073547fd7aad7b27089a
 2016-03-30 03:41:13 +00:00
Andre Eisenbach
6fbbf9f7ac Fix log spam in getCharacteristicById() 
am: 1591d36

* commit '1591d368d3275276b35161810d42c6a5d9e8b43f':
  Fix log spam in getCharacteristicById()

Change-Id: I7ce3de2609c7c6bca09ad6866e6d904aeb416535
 2016-03-30 03:37:35 +00:00
Andre Eisenbach
1591d368d3 Fix log spam in getCharacteristicById() 
Bug: 27744135
Change-Id: I43f6358484729dedd85eb52432ad9805a66ff81e
 2016-03-30 03:27:20 +00:00
Pierre Imai
ec1f9ac708 Merge "Move connectivity events to frameworks/base." into nyc-dev am: bc786b7 
am: 132ffdc

* commit '132ffdcfd3d54e6be106b464bf05acaffc6435d2':
  Move connectivity events to frameworks/base.

Change-Id: Ibb7b6bd844f848db96994b8c8ee9032b35ae67b0
 2016-03-30 01:26:49 +00:00
Winson
e2a98cd878 Merge changes Ie59ed72c,Ie763a2a6,I7f830e5c,Ife637438 into nyc-dev am: fe1886f 
am: 843fcb0

* commit '843fcb079ec1d3aae6a431af57530dfa2d385552':
  Should not update initial state at all on resize.
  Adding logging to track down bitmap issues.
  Moving the background to the window.
  Adding clear-all button.

Change-Id: I27ed2e95a43b77e45aa15a7ae1de9c54c4a0d78e
 2016-03-30 01:26:47 +00:00
Pierre Imai
132ffdcfd3 Merge "Move connectivity events to frameworks/base." into nyc-dev 
am: bc786b7

* commit 'bc786b74759470e52f3f5e80c3f4b5b1c0a52636':
  Move connectivity events to frameworks/base.

Change-Id: Ie6e22bf85a4c0330826f8200fc51c90717d93a33
 2016-03-30 01:23:27 +00:00
Winson
843fcb079e Merge changes Ie59ed72c,Ie763a2a6,I7f830e5c,Ife637438 into nyc-dev 
am: fe1886f

* commit 'fe1886f8b82330315a62e10d6dd27b0aa7c045cb':
  Should not update initial state at all on resize.
  Adding logging to track down bitmap issues.
  Moving the background to the window.
  Adding clear-all button.

Change-Id: I18865c7e916863138a3e8ab36b5e594ed92bc666
 2016-03-30 01:23:25 +00:00
Pierre Imai
bc786b7475 Merge "Move connectivity events to frameworks/base." into nyc-dev 2016-03-30 01:16:59 +00:00
Winson Chung
fe1886f8b8 Merge changes Ie59ed72c,Ie763a2a6,I7f830e5c,Ife637438 into nyc-dev 
* changes:
  Should not update initial state at all on resize.
  Adding logging to track down bitmap issues.
  Moving the background to the window.
  Adding clear-all button.
 2016-03-30 01:15:21 +00:00
Winson
e8a4eff9d9 Moving the background to the window. 
- Make sure to remove the background from the DecorView while
resizing, so we don't draw it twice.

Bug: 27869246
Change-Id: I7f830e5c825749fdf2b5bbda7af92239702b70ad
 2016-03-29 17:58:54 -07:00
Siyamed Sinir
6d2efef5cd Merge "Revert "TextView setText/append methods set movement method"" into nyc-dev am: d225f87 
am: 7709c89

* commit '7709c892bc6ac834aeef20d5fec10233e6de9359':
  Revert "TextView setText/append methods set movement method"

Change-Id: Ib6368fc2ebd75aa2cbb18d29b32712a14e378045
 2016-03-30 00:29:32 +00:00
Robert Carr
05bf752d31 Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev am: ffe3098 
am: d4c85e1

* commit 'd4c85e182add4c0972f1d79163acd7281efa9f49':
  Ensure we change SurfaceView size from UI thread.

Change-Id: I6385721821ee4fa7984be316c409c52fe94b80cc
 2016-03-30 00:29:23 +00:00
Jeff Sharkey
0732743d4d Merge "AccessibilityNodeInfo shouldn\'t touch extras." into nyc-dev am: af64f63 
am: 21b1b0d

* commit '21b1b0d937ebfec6880900655effb55a8298cbd6':
  AccessibilityNodeInfo shouldn't touch extras.

Change-Id: Icc50a8924830abc942f87fa835b1ae715c86382a
 2016-03-30 00:29:18 +00:00
Makoto Onuki
8fff90ca7c Merge "ShortcutManager: proper work profile support" into nyc-dev am: d5b745a 
am: 4fc3441

* commit '4fc34416fb8d389557934f3000dab7b6fbafb97c':
  ShortcutManager: proper work profile support

Change-Id: I1a708988b7e9c505370e2399572dca6caa9d5cef
 2016-03-30 00:29:13 +00:00
Siyamed Sinir
7709c892bc Merge "Revert "TextView setText/append methods set movement method"" into nyc-dev 
am: d225f87

* commit 'd225f87ebc55333c3d40295d1977ce8ac4a59c2d':
  Revert "TextView setText/append methods set movement method"

Change-Id: I29b1a0d197dc2df861d5e55eb91ba17410c42664
 2016-03-30 00:22:08 +00:00
Robert Carr
d4c85e182a Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev 
am: ffe3098

* commit 'ffe309816989457f71a39a84d22fb06fe5b6e8d5':
  Ensure we change SurfaceView size from UI thread.

Change-Id: I8e57aa126a601df935b6005b74ba7842f819c741
 2016-03-30 00:22:03 +00:00
Jeff Sharkey
21b1b0d937 Merge "AccessibilityNodeInfo shouldn\'t touch extras." into nyc-dev 
am: af64f63

* commit 'af64f6341bdbca93aff3d68264af48e74faa9e58':
  AccessibilityNodeInfo shouldn't touch extras.

Change-Id: I44ae8aebdbe0046a64971eb47c25b8720f7bfd36
 2016-03-30 00:22:00 +00:00