Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,385 Commits 3 Branches 0 Tags
47e1e14589cb62de65332ee467e845efc3e43d55
Commit Graph

254385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chong Zhang
47e1e14589 Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev am: daa0d214dd 
am: d73883c7f8

* commit 'd73883c7f83452ea20e07e344ebc5363b57c060d':
  Fix wallpaper cropped too soon when unminimizing dock

Change-Id: Ic78fb852bd40babe1a9548c607f6c01389b11d94
 2016-05-17 23:43:46 +00:00
Ruben Brunk
aef12f4ffd Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev am: 8ecf66fc83 
am: 2b699f0fe0

* commit '2b699f0fe065ee9d4a7a3c14bebae88c3505ba2f':
  Dismiss immersive mode overlay while in VR mode.

Change-Id: Ib38d654dea478622bfa1cda2e7a58b71c27e5492
 2016-05-17 23:43:38 +00:00
Android Build Merger (Role)
3d99cd41e6 Merge "Merge "Use focused app\'s stack for IME adjustment" into nyc-dev am: 65ee55457d am: da107902d9" into nyc-mr1-dev-plus-aosp 2016-05-17 23:40:31 +00:00
Chong Zhang
d73883c7f8 Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev 
am: daa0d214dd

* commit 'daa0d214dd07caa8dc99abe635211ed94200bc2e':
  Fix wallpaper cropped too soon when unminimizing dock

Change-Id: I851227f5df0bf3cb0a1519fca1991db8927222c5
 2016-05-17 23:39:47 +00:00
Chong Zhang
12a23a9004 Merge "Use focused app\'s stack for IME adjustment" into nyc-dev am: 65ee55457d 
am: da107902d9

* commit 'da107902d9cd46d1ed9d051f89b91cee14dd8f17':
  Use focused app's stack for IME adjustment

Change-Id: I9825f8b9738072ae5fbc8f33db74c68a6f7c6603
 2016-05-17 23:39:43 +00:00
Ruben Brunk
2b699f0fe0 Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev 
am: 8ecf66fc83

* commit '8ecf66fc83e76165bea3cd408c687bd0b79c0552':
  Dismiss immersive mode overlay while in VR mode.

Change-Id: I15038cfb9e2ccfc119353d33699f2001eed4e180
 2016-05-17 23:39:41 +00:00
Chong Zhang
afe4482b4a Merge "Use focused app\'s stack for IME adjustment" into nyc-dev am: 65ee55457d 
am: e5bbbea494

* commit 'e5bbbea4940c490e0f8977f7568bf3ba6a86eba4':
  Use focused app's stack for IME adjustment

Change-Id: I02afe6824d506982c86a4d70f1ba903ab2dcc0f5
 2016-05-17 23:39:35 +00:00
Chong Zhang
daa0d214dd Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev 2016-05-17 23:35:27 +00:00
Chong Zhang
e5bbbea494 Merge "Use focused app\'s stack for IME adjustment" into nyc-dev 
am: 65ee55457d

* commit '65ee55457dc39c3e30c677d9126565799b50a8dc':
  Use focused app's stack for IME adjustment

Change-Id: I4852a25d7a0bc356b659d8acb4407d820cd14502
 2016-05-17 23:34:20 +00:00
Chong Zhang
da107902d9 Merge "Use focused app\'s stack for IME adjustment" into nyc-dev 
am: 65ee55457d

* commit '65ee55457dc39c3e30c677d9126565799b50a8dc':
  Use focused app's stack for IME adjustment

Change-Id: Idd34a63f377f43cb79c397eac8adccef3f791429
 2016-05-17 23:34:18 +00:00
Ruben Brunk
8ecf66fc83 Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev 2016-05-17 23:29:53 +00:00
Chong Zhang
65ee55457d Merge "Use focused app's stack for IME adjustment" into nyc-dev 2016-05-17 23:27:19 +00:00
Android Build Merger (Role)
f3d09db6dd Merge "Merge "Adjust wifi idle times to fit in system time period" into nyc-dev am: e1f6975ebc am: 73be9053b9" into nyc-mr1-dev-plus-aosp 2016-05-17 23:26:58 +00:00
Roshan Pius
02558c18df Merge "Adjust wifi idle times to fit in system time period" into nyc-dev am: e1f6975ebc 
am: b1e5b7419b

* commit 'b1e5b7419b5170b0a7bd6723e32d179a31077c80':
  Adjust wifi idle times to fit in system time period

Change-Id: I6f220b7a55f9994dfc04aca94eee3a6531b1f102
 2016-05-17 23:26:18 +00:00
Roshan Pius
eb4cdcd4b5 Merge "Adjust wifi idle times to fit in system time period" into nyc-dev am: e1f6975ebc 
am: 73be9053b9

* commit '73be9053b9d5178bd1c9e14567319d7acc127616':
  Adjust wifi idle times to fit in system time period

Change-Id: I10d0dee8b8039f55ee9bd5d2793467f66ae01ae5
 2016-05-17 23:26:18 +00:00
Roshan Pius
73be9053b9 Merge "Adjust wifi idle times to fit in system time period" into nyc-dev 
am: e1f6975ebc

* commit 'e1f6975ebc1499ddcb493666f884ef0d8e042255':
  Adjust wifi idle times to fit in system time period

Change-Id: Id3dd41bab8096452d3f806304e2127cf1cc970c2
 2016-05-17 23:20:04 +00:00
Roshan Pius
b1e5b7419b Merge "Adjust wifi idle times to fit in system time period" into nyc-dev 
am: e1f6975ebc

* commit 'e1f6975ebc1499ddcb493666f884ef0d8e042255':
  Adjust wifi idle times to fit in system time period

Change-Id: Ic47031e1bc2287545382d567114c316bafe12912
 2016-05-17 23:19:57 +00:00
Android Build Merger (Role)
648a6437c0 Merge "invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d am: bf4296e500 am: 7c919ef804 am: 8ab4d2c0b4 am: dd840ef116" into nyc-mr1-dev-plus-aosp 2016-05-17 23:09:45 +00:00
smain@google.com
f655fd20cd invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d am: bf4296e500 am: 7c919ef804 am: 8ab4d2c0b4 
am: dd840ef116

* commit 'dd840ef1168b53b9f39ee54ac557284019952664':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: Ifcada3ea4b1ff1b04baf9aa6066ad892b2ddb7de
 2016-05-17 23:09:15 +00:00
smain@google.com
a3cbb74467 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d am: bf4296e500 am: 7c919ef804 am: 8ab4d2c0b4 
am: 8c9ffe1fe3

* commit '8c9ffe1fe3b5c5effbb766059098e45fa3eddca8':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I456071fce3d97cf7df18675a60403627cc1dc913
 2016-05-17 23:09:12 +00:00
TreeHugger Robot
e1f6975ebc Merge "Adjust wifi idle times to fit in system time period" into nyc-dev 2016-05-17 23:07:58 +00:00
smain@google.com
8c9ffe1fe3 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d am: bf4296e500 am: 7c919ef804 
am: 8ab4d2c0b4

* commit '8ab4d2c0b4fc2c7f67f6100c2264fba49fc6de8a':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: Ic3233b734ee1e18353d761ff918de3ffbef590ec
 2016-05-17 23:02:25 +00:00
smain@google.com
dd840ef116 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d am: bf4296e500 am: 7c919ef804 
am: 8ab4d2c0b4

* commit '8ab4d2c0b4fc2c7f67f6100c2264fba49fc6de8a':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: Ic166d97b2fc4ecabe6dbd5e901627d1f45b41087
 2016-05-17 23:02:18 +00:00
smain@google.com
8ab4d2c0b4 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d am: bf4296e500 
am: 7c919ef804

* commit '7c919ef8042c1864fb4ea39a663e6ff684bd0156':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I64afc374bb3261b0f5f69a8f4a7677369dfec353
 2016-05-17 22:40:42 +00:00
Selim Cinek
2d8adc6a61 Merge "Fixed a screen flickering on tablets" into nyc-dev am: ce80acd73a 
am: ba0639ad01

* commit 'ba0639ad018a7c66552ed790574cb6745f1cced1':

Change-Id: Ibb81549eaf4b3e42cc18135b3f128fc40625e43a
 2016-05-17 22:32:35 +00:00
Selim Cinek
eb39012d65 Merge "Fixed a bug with auto cancelling" into nyc-dev am: a35d9b3ee0 
am: a6a27fb71f

* commit 'a6a27fb71f84f822dd8bdb4f1fd84a1b3bd01efb':

Change-Id: Id3cd3ab84a7caa95d5e4fcc5705ab8acbc0a23dc
 2016-05-17 22:32:30 +00:00
smain@google.com
7c919ef804 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d 
am: bf4296e500

* commit 'bf4296e500af87a83ff64642cb15d25e81df01c5':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I9504b2b124e00e0d0bbeea56b7611c57f6bfd9fc
 2016-05-17 22:32:26 +00:00
Jim Miller
97c4dec2ff Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev am: 2d1c424a0e 
am: d79eaa220c

* commit 'd79eaa220c84130f96db8249e9860e57edd605c3':

Change-Id: Icf65f8d865b12634060c821ae64e098eb77e406f
 2016-05-17 22:32:25 +00:00
Android Build Merger (Role)
4713c4079d Merge "Merge "Fixed a screen flickering on tablets" into nyc-dev am: ce80acd73a am: be80263275" into nyc-mr1-dev-plus-aosp 2016-05-17 22:28:00 +00:00
Android Build Merger (Role)
03e3a1f308 Merge "Merge "Fixed a bug with auto cancelling" into nyc-dev am: a35d9b3ee0 am: d61b5b655e" into nyc-mr1-dev-plus-aosp 2016-05-17 22:27:50 +00:00
Android Build Merger (Role)
87e89a47ec Merge "Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev am: 2d1c424a0e am: 9e507bd737" into nyc-mr1-dev-plus-aosp 2016-05-17 22:27:42 +00:00
Selim Cinek
a0a542d0f0 Merge "Fixed a screen flickering on tablets" into nyc-dev am: ce80acd73a 
am: be80263275

* commit 'be80263275ca977b9f3047b596afb5c08eec8d9b':
  Fixed a screen flickering on tablets

Change-Id: Iae540c51ef8e28d493dfe4fca4dcb5c86947918a
 2016-05-17 22:27:08 +00:00
Selim Cinek
c0dca174e7 Merge "Fixed a bug with auto cancelling" into nyc-dev am: a35d9b3ee0 
am: d61b5b655e

* commit 'd61b5b655eb7b76d7539eb8118d3317e97e008c9':
  Fixed a bug with auto cancelling

Change-Id: I4c934cf6b2da6fe4859f390bf05da8642accbe02
 2016-05-17 22:26:51 +00:00
Jim Miller
40d4d6094c Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev am: 2d1c424a0e 
am: 9e507bd737

* commit '9e507bd73702ae56da0439be0b9f27e05b06f558':
  Don't always announce accessibility events when resetting password

Change-Id: Id1fa56d69af2d7394fa2083511f68c6621d19a54
 2016-05-17 22:26:45 +00:00
Dianne Hackborn
b847bcb65e Merge "Work on issue #28689719: Runtime restart" into nyc-dev am: 77ad5f1657 
am: ebfbc39537

* commit 'ebfbc3953719b00a51450c3002cb2d26cfa0289d':

Change-Id: Ib46312139e77f68dd8eeef5d90586d79ecaead17
 2016-05-17 22:25:49 +00:00
Selim Cinek
ba0639ad01 Merge "Fixed a screen flickering on tablets" into nyc-dev 
am: ce80acd73a

* commit 'ce80acd73a5a34d15531d8377fa5b16d0ec5deb7':
  Fixed a screen flickering on tablets

Change-Id: I933d1b9d4b93f4f621bce2f55b85d8462f5e994b
 2016-05-17 22:21:40 +00:00
Selim Cinek
be80263275 Merge "Fixed a screen flickering on tablets" into nyc-dev 
am: ce80acd73a

* commit 'ce80acd73a5a34d15531d8377fa5b16d0ec5deb7':
  Fixed a screen flickering on tablets

Change-Id: I5829b4044df7605bbeecb0545d2d600384132181
 2016-05-17 22:21:37 +00:00
Selim Cinek
a6a27fb71f Merge "Fixed a bug with auto cancelling" into nyc-dev 
am: a35d9b3ee0

* commit 'a35d9b3ee055d591249a30c58285fe2be5a45c43':
  Fixed a bug with auto cancelling

Change-Id: Id6e2850c96274a406ea52095516bfbe39dd2d2c8
 2016-05-17 22:21:36 +00:00
Selim Cinek
d61b5b655e Merge "Fixed a bug with auto cancelling" into nyc-dev 
am: a35d9b3ee0

* commit 'a35d9b3ee055d591249a30c58285fe2be5a45c43':
  Fixed a bug with auto cancelling

Change-Id: I46be6f420c4ad89ffc7cd88f621aed173ba130d1
 2016-05-17 22:21:32 +00:00
Jim Miller
d79eaa220c Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev 
am: 2d1c424a0e

* commit '2d1c424a0ee8e210c1cd3f71b78d5a11e94f4ff3':
  Don't always announce accessibility events when resetting password

Change-Id: I7e1e2b8982708490b9ff467f6dfc129b11269259
 2016-05-17 22:21:30 +00:00
Dianne Hackborn
a648b098f8 Merge "Work on issue #28689719: Runtime restart" into nyc-dev am: 77ad5f1657 
am: ab82de14b1

* commit 'ab82de14b1c6bdf44fa2cac96c37620f0f2319f0':
  Work on issue #28689719: Runtime restart

Change-Id: I9dc025c78a1d58cf46b73141063dda0c9632d502
 2016-05-17 22:21:24 +00:00
Jim Miller
9e507bd737 Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev 
am: 2d1c424a0e

* commit '2d1c424a0ee8e210c1cd3f71b78d5a11e94f4ff3':
  Don't always announce accessibility events when resetting password

Change-Id: I8ff47b7b9c340fbf5ef4dfde619a80264ca9c170
 2016-05-17 22:21:24 +00:00
smain@google.com
bf4296e500 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 
am: 28445c4d7d

* commit '28445c4d7d46a14e8cc2654c4912019327cbe471':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I243768d45ff5ac5eb11140ac8f8d770335be3d70
 2016-05-17 22:21:19 +00:00
Ruben Brunk
c30c8fd29c Dismiss immersive mode overlay while in VR mode. 
Bug: 28052143
Change-Id: I750753c72cb8d41bf91c108e8fc645750fbf9c45
 2016-05-17 15:15:28 -07:00
Chong Zhang
b8da4a7fa8 Use focused app's stack for IME adjustment 
Don't use mInputMethodTarget as it could be set to some system alert
window that has both FLAG_NOT_FOCUSABLE and FLAG_ALT_FOCUSABLE_IM,
and it's not actually taking inputs.

bug: 28328085
Change-Id: I38263f64fec13a5e10357499ebc97671389ba69a
 2016-05-17 15:08:44 -07:00
Dianne Hackborn
ebfbc39537 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 
am: 77ad5f1657

* commit '77ad5f1657a8bef6b28f69f9bd8a2d1978c88a57':
  Work on issue #28689719: Runtime restart

Change-Id: I29e0ef82bed0df030939b198d5a238405dc7486a
 2016-05-17 22:07:01 +00:00
Dianne Hackborn
ab82de14b1 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 
am: 77ad5f1657

* commit '77ad5f1657a8bef6b28f69f9bd8a2d1978c88a57':
  Work on issue #28689719: Runtime restart

Change-Id: Ic44a4f56be67e3a50932d6bfbb58cdca6536e501
 2016-05-17 22:06:57 +00:00
Selim Cinek
ce80acd73a Merge "Fixed a screen flickering on tablets" into nyc-dev 2016-05-17 22:05:54 +00:00
Selim Cinek
a35d9b3ee0 Merge "Fixed a bug with auto cancelling" into nyc-dev 2016-05-17 22:05:39 +00:00
Jim Miller
2d1c424a0e Merge "Don't always announce accessibility events when resetting password" into nyc-dev 2016-05-17 22:00:37 +00:00