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

237222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
fbf2544cae Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev am: e4872f2a52 
am: 460af2050b

* commit '460af2050ba7ba60d809768cbdbf1772876de3bb':
  DevicePolicyManager#removeKeyPair- update contract
 2016-03-02 21:45:54 +00:00
Steve McKay
ec5c7015cc Merge "Don\'t show title in delete confirmation." into nyc-dev am: 8db100e4a3 
am: a1bdc55eb6

* commit 'a1bdc55eb64b6f765afebf925987cc3e1e3d0be3':
  Don't show title in delete confirmation.
 2016-03-02 21:43:48 +00:00
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
Ben Kwa
f60eb330c8 Merge "Tweak root item layouts." into nyc-dev am: f8d6fa2c5a 
am: fed032e1a8

* commit 'fed032e1a88a526895ba1659bb3b7a3f9c489d82':
  Tweak root item layouts.
 2016-03-02 20:41:17 +00:00
Alan Viverette
34b558750d Merge "Check process state when killing background processes for density" into nyc-dev am: 57ef138cb7 
am: dc6a05ec44

* commit 'dc6a05ec44bc68f37b8d688ae222e93800087aeb':
  Check process state when killing background processes for density
 2016-03-02 20:38:48 +00:00
Jim Kaye
322cdb3f0e Support keyboard entry of non-ASCII characters am: b57679e2e7 
am: d3a460233f

* commit 'd3a460233f85a431f6bf4ba608d3d6a8971a1b0b':
  Support keyboard entry of non-ASCII characters
 2016-03-02 20:36:59 +00:00
Chris Craik
05bf3bc840 Merge changes I4f72448f,I74b7233c into nyc-dev am: b67985f337 
am: eae0325eed

* commit 'eae0325eeda32411d98e9adda93aed275b50cbe1':
  Fix ripple positioning within scrolled node
  Clip projected ripples to outlines
 2016-03-02 20:34:24 +00:00
Steve McKay
24dd9ad0c0 Merge "Always show intern storage." into nyc-dev am: b4672ef6df 
am: 1788dfd223

* commit '1788dfd223c7c62005b8c1e98cd25737f685a912':
  Always show intern storage.
 2016-03-02 20:32:39 +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
Adam Lesinski
39b9c86629 Merge "AssetManager: Cache a pre-filtered list of configurations" into nyc-dev am: 1df152284d 
am: a8ae50b02d

* commit 'a8ae50b02d73d0f2a2375c904e9220423e9f3055':
  AssetManager: Cache a pre-filtered list of configurations
 2016-03-02 20:27:24 +00:00
Robin Lee
460af2050b Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev 
am: e4872f2a52

* commit 'e4872f2a52b1929b25e982e7cd050b0f95d73cc1':
  DevicePolicyManager#removeKeyPair- update contract
 2016-03-02 20:27:06 +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
Gus Prevas
9011dddff2 Merge "Removes swipe-to-dismiss from Wear window styles." into nyc-dev am: 27d68bb2df 
am: 0aca12d8c2

* commit '0aca12d8c2de831bfc82ff24b66b8cb0e2a855e0':
  Removes swipe-to-dismiss from Wear window styles.
 2016-03-02 20:23:37 +00:00
Fyodor Kupolov
14e071fb36 Merge "Added dump method to NetworkTimeUpdateService" into nyc-dev am: e3f400de60 
am: 3d746cc3be

* commit '3d746cc3be3b9626269e8fce5c4599545e46d0da':
  Added dump method to NetworkTimeUpdateService
 2016-03-02 20:21:39 +00:00
Yang Ni
0778ecd9c2 Merge "Set flags in RS JNI calls for rsObj creation" am: b21cb13010 am: 86feb01288 
am: 803cb9a7fa

* commit '803cb9a7fa1e484f02252ed3ac0da1549bf43b65':
  Set flags in RS JNI calls for rsObj creation
 2016-03-02 20:19:38 +00:00
Steve McKay
a1bdc55eb6 Merge "Don\'t show title in delete confirmation." into nyc-dev 
am: 8db100e4a3

* commit '8db100e4a3283d05fed2ff00b2931e073261487a':
  Don't show title in delete confirmation.
 2016-03-02 20:09:30 +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
Robin Lee
e4872f2a52 Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev 2016-03-02 20:05:41 +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
Steve McKay
8db100e4a3 Merge "Don't show title in delete confirmation." into nyc-dev 2016-03-02 19:56:21 +00:00
Robin Lee
8f617d40ab DevicePolicyManager#removeKeyPair- update contract 
May also return true if the keypair didn't exist in the first place
which is a small reduction in the amount of information leakage, but
more importantly lets a caller be sure about keystore state at the end
of their call.

Bug: 27335182
Change-Id: I5e6d4c599b74f031e3f6d17cb7540898ffaf2571
 2016-03-02 19:54:04 +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
Ben Kwa
fed032e1a8 Merge "Tweak root item layouts." into nyc-dev 
am: f8d6fa2c5a

* commit 'f8d6fa2c5a42b9adaa7a745bc9c9feaeb3800cc3':
  Tweak root item layouts.
 2016-03-02 19:45:05 +00:00
Ben Kwa
f8d6fa2c5a Merge "Tweak root item layouts." into nyc-dev 2016-03-02 19:39:06 +00:00
Jason Monk
ae5bd03831 Guard against monkey crash 
Bug: 27448755
Change-Id: I8345a274c979bf8ca1b4041c14318dd73810f79a
 2016-03-02 14:38:31 -05:00
Alan Viverette
dc6a05ec44 Merge "Check process state when killing background processes for density" into nyc-dev 
am: 57ef138cb7

* commit '57ef138cb7bfc24460369dc5aed70be8a8c49027':
  Check process state when killing background processes for density
 2016-03-02 19:26:40 +00:00
Alan Viverette
57ef138cb7 Merge "Check process state when killing background processes for density" into nyc-dev 2016-03-02 19:21:17 +00: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
Jim Kaye
d3a460233f Support keyboard entry of non-ASCII characters 
am: b57679e2e7

* commit 'b57679e2e7fb6f133f6fe373d8036b74866476d8':
  Support keyboard entry of non-ASCII characters
 2016-03-02 19:06:34 +00:00
Chris Craik
eae0325eed Merge changes I4f72448f,I74b7233c into nyc-dev 
am: b67985f337

* commit 'b67985f337e1592f621e1b85f525098887804ccd':
  Fix ripple positioning within scrolled node
  Clip projected ripples to outlines
 2016-03-02 19:04:26 +00:00
Steve McKay
1788dfd223 Merge "Always show intern storage." into nyc-dev 
am: b4672ef6df

* commit 'b4672ef6dfbaf416981539d515ad1489d7d0bc87':
  Always show intern storage.
 2016-03-02 19:02:19 +00:00
Jim Kaye
b57679e2e7 Support keyboard entry of non-ASCII characters 
Add characters to the keyboard mapping to allow them
to be entered into the AVD from the developer's PC
keyboard.

This mapping supports the non-ASCII keys that appear
on the "US International" keyboard. Most of the Latin-1
characters (but not all) appear on this keyboard.

This change does not remove support for any keys.

b.android.com/200042

Change-Id: I65d54eb36183382b171c388b26848941eb0ff8d9
(cherry picked from commit dac57966a9)
 2016-03-02 18:56:10 +00:00
Chris Craik
b67985f337 Merge changes I4f72448f,I74b7233c into nyc-dev 
* changes:
  Fix ripple positioning within scrolled node
  Clip projected ripples to outlines
 2016-03-02 18:52:35 +00:00
Steve McKay
b4672ef6df Merge "Always show intern storage." into nyc-dev 2016-03-02 18:49:28 +00:00
Chris Craik
a748c08241 Fix ripple positioning within scrolled node 
bug:27275799

Skip applying clip/matrix properties from projected node op, since we
don't want to respect the clip, and matrix is already baked into
transformFromCompositedAncestor.

This skips op clips in the new pipeline, and fixed a double application
of scroll on ripple backgrounds.

Change-Id: I4f72448fe0463ab666564ca538d8b6bf525d98de
 2016-03-02 10:48:15 -08:00
Steve McKay
7c4395804e Always show intern storage. 
Only show debug root when devel mode is enabled.
Remove all traces of "advanced".

Bug: 27297398

Change-Id: Ie7e8be282531bd245351d56ababa8ca625c10fd2
 2016-03-02 10:47:59 -08: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
Adam Lesinski
a8ae50b02d Merge "AssetManager: Cache a pre-filtered list of configurations" into nyc-dev 
am: 1df152284d

* commit '1df152284db991e63a81773824f270fa3aa99aec':
  AssetManager: Cache a pre-filtered list of configurations
 2016-03-02 18:44:15 +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
Gus Prevas
0aca12d8c2 Merge "Removes swipe-to-dismiss from Wear window styles." into nyc-dev 
am: 27d68bb2df

* commit '27d68bb2df0165149f81fc491d66aa55e33b9a13':
  Removes swipe-to-dismiss from Wear window styles.
 2016-03-02 18:40:28 +00:00
Fyodor Kupolov
3d746cc3be Merge "Added dump method to NetworkTimeUpdateService" into nyc-dev 
am: e3f400de60

* commit 'e3f400de602d257a921ceb5e36c915a6ac3e79bf':
  Added dump method to NetworkTimeUpdateService
 2016-03-02 18:38:54 +00:00
Yang Ni
803cb9a7fa Merge "Set flags in RS JNI calls for rsObj creation" am: b21cb13010 
am: 86feb01288

* commit '86feb01288306a730e92c8e5851547214400df4c':
  Set flags in RS JNI calls for rsObj creation
 2016-03-02 18:37:27 +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
Adam Lesinski
1df152284d Merge "AssetManager: Cache a pre-filtered list of configurations" into nyc-dev 2016-03-02 18:32:16 +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
Chris Craik
678ff81105 Clip projected ripples to outlines 
bug:27343928

Also fixes positioning of ripples to a scrolled projection receiver.

Change-Id: I74b7233c46d7c15839ca8bf50e188ba6646d7432
 2016-03-02 10:29:15 -08:00
Gus Prevas
27d68bb2df Merge "Removes swipe-to-dismiss from Wear window styles." into nyc-dev 2016-03-02 18:28:28 +00:00