Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Billy Lamberta
2b3870cd94 docs: work - Update devhub url 
Update to new DevHub URL in resource card and
referenced in /work pages.

Change-Id: Ia3bfda3af8a9c83bcad37697fa5019ce59bfabbe
 2016-05-17 16:19:44 -07:00
Chris Craik
6ee192f4e9 Document that SurfaceView is synchronous in N 
bug:28821062

Change-Id: I1c17949d93de3d1f89c504fc061f7d20dd451a4d
 2016-05-17 16:17:25 -07:00
Joe Fernandez
2015256ccc Merge "docs: Wear 2 Preview - improve visibility and look of pages" into mnc-io-docs 2016-05-17 23:10:50 +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
Sreevani Sreejith
1e2739e635 Merge "Updated documentation for Input Method Framework Wear 2.0" into mnc-io-docs 2016-05-17 23:09:28 +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
Andrew Solovay
bd96855929 resolve merge conflicts of 33d83db to mnc-ub-dev 
Change-Id: I8c148af6eec071ac076882a53c5ba2929cf0c9d2
 2016-05-17 16:09:03 -07: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
Jorim Jaggi
ca0cf0f529 Fix threading problems with drawables 
We can't use the same instance on both the main and the background
thread, as this will lead to problems.

Change-Id: Ieec525f028df2d0596667126d8f5004773461517
Fixes: 28745682
 2016-05-17 23:05:38 +00:00
Joe Fernandez
581883ccfe docs: Wear 2 Preview - improve visibility and look of pages 
- add browse path from Wear landing page to preview (new ribbon section)

Change-Id: Ifc204347c89f732adce0caae5070905277232ced
 2016-05-17 16:05:31 -07:00
Bert McMeen
ba803db9a6 Merge "Docs: Iterating on Wear docs - Bridger API" into mnc-io-docs 2016-05-17 23:05:21 +00:00
Bert McMeen
5d0f016f4b Merge "docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview" into mnc-io-docs 2016-05-17 23:04:25 +00:00
sreevanis
1f23e74fa0 Updated documentation for Input Method Framework Wear 2.0 
Bug:28472831
Change-Id: I7fbcc0e6f044079b4c63c9c99f9442cdd6192215
 2016-05-17 16:02:28 -07: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
Adrian Roos
f4be9c7a96 Fix cut off actions in messaging style 
Change-Id: Iaa21620b8f150f1d9f747162c063e4c8d77176f6
Fixes: 28767094
 2016-05-17 16:01:47 -07:00
Sreevani Sreejith
abe5e7e366 Merge "Updated app pattern documentation." into mnc-io-docs 2016-05-17 23:00:59 +00:00
Sreevani Sreejith
14981cbe35 Merge "Notification changes for Wear 2.0 and Release notes." into mnc-io-docs 2016-05-17 23:00:42 +00:00
Ta-wei Yen
153fcd7ba1 Rename visual voicemail sync intent value 
Rename value of KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL KEY_VVM_PREFETCH_BOOL

Change-Id: I13718333a8ddc38e8d2131b478562b76cf9aab64
Fixes:28819765
Fixes:28822093
 2016-05-17 15:57:20 -07:00
Robert Sesek
55b2d11cd3 Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE. 
Bug: 28775488
Change-Id: Ic0473d3664671f0ac5df8412f61ca8c1d029887f
 2016-05-17 18:53:13 -04:00
Bert McMeen
6ab3473274 docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview 
Bug: 28317997
Change-Id: I1be68881c2ce94b4728072a2cfa6b4ae6b55f5ca
 2016-05-17 15:51:27 -07:00
Sreevani Sreejith
f62ae36a96 Merge "API Overview page for Wear 2.0 preview." into mnc-io-docs 2016-05-17 22:47:32 +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
Adrian Roos
96b7e20ba6 Adjust Notification APIs per API council 
Also fixes a slight bug where a CharSequence extra
was retrieved as a string.

Change-Id: I8a40ab1934b8a20355c3cd4afd66a4a7b91fb517
Fixes: 28775580
Fixes: 28775582
 2016-05-17 15:35:33 -07:00
sreevanis
c3e99afeb7 Updated app pattern documentation. 
Bug:28473253
Change-Id: Iba5aff299d2e5fc1b90c7cb5beaeeb65f52c5932
 2016-05-17 15:33:38 -07: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
Joe Onorato
1cc1d13d6e Demote the log in ProcessState.ensureNotDead from a wtf to a warning. 
It's raising alarm bells but there isn't much we can do without a lot
of rewriting inside the ActivityManager.  The only consequence is stats
that are off by a little bit.

Bug: 28581070
Change-Id: If51568c3a708a907ceef6452e7d45599a57454f7
 2016-05-17 15:31:38 -07:00
Joe Onorato
22cfef381d @hide SystemHealthManager.from 
Bug: 28820055
Change-Id: Idd434c196428178e2c66facea36a7e010246611c
 2016-05-17 15:29:51 -07: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
Paul Crowley
cc70155f3b Two phases to set the password for disk encryption 
Revert "Revert "Two phases to set the password for disk encryption""

This reverts commit a1eb750e75.

Bug: 28154455
Bug: 28694324
Change-Id: I8106bfba28da401b9fd38349c6a9fa9a24f54712
 2016-05-17 15:22:29 -07: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