drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,823 Commits 1 Branch 0 Tags
Commit Graph

177823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
48413e6a11 am 761b4a7d: Merge "docs: migration guide link update" into mnc-preview-docs 
* commit '761b4a7deb2438e039fdb11a05e2de41593ffd8f':
  docs: migration guide link update
 2015-06-30 22:31:52 +00:00
Rich Slogar
761b4a7deb Merge "docs: migration guide link update" into mnc-preview-docs 2015-06-30 22:21:18 +00:00
Filip Gruszczynski
3ce79f6c0c am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev 
* commit '96496e2d17607a8bfa944461c2458b0dcdeee872':
  Build fix after changing IWindowSession.
 2015-06-30 22:17:55 +00:00
Filip Gruszczynski
96496e2d17 Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev 2015-06-30 22:02:34 +00:00
Luan Nguyen
a4ac253bc3 am ed053477: Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs 
* commit 'ed053477d0f76edad4853f0a5aac275acfe2d6ce':
  docs: Move scale Bitmap code to onSurfaceChanged
 2015-06-30 22:02:23 +00:00
Amit Mahajan
45e50f87bb am 71699d76: am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '71699d760eff662055dde458ea0d614a32fb6dfc':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 21:55:08 +00:00
Joe Fernandez
f1f720b607 am cbbbabaa: am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit 'cbbbabaa4aa1cbb84cb49133ecda1da2f06daf54':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 21:55:01 +00:00
Luan Nguyen
ed053477d0 Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs 2015-06-30 21:53:29 +00:00
Filip Gruszczynski
7e3b61e73d Build fix after changing IWindowSession. 
Change-Id: I339fecb0138e8b8907fc53372b694021f6327260
 2015-06-30 14:42:21 -07:00
Amit Mahajan
71699d760e am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '95c47354a6841d7ae3a81fcacea5acdd25dc42c6':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 21:40:32 +00:00
Joe Fernandez
cbbbabaa4a am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '4c8ecd9a70b3ba1bbf0b546c6189a892e63a6f18':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 21:40:27 +00:00
Amit Mahajan
95c47354a6 am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '43d3bd027604f400caf49826e5b4705784937b35':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 21:23:41 +00:00
Joe Fernandez
4c8ecd9a70 am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '72356f0b20d4e6d84430629c2bb7d8baac55002d':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 21:23:34 +00:00
Rich Slogar
e3d8df6307 am 3de121f9: Merge "docs: studio workflow page typo" into mnc-preview-docs 
* commit '3de121f94c1ee4624e263aede6e2f7af7231b968':
  docs: studio workflow page typo
 2015-06-30 21:22:50 +00:00
Luan Nguyen
6cfe6a8d38 docs: Move scale Bitmap code to onSurfaceChanged 
bug: 21099578
Change-Id: I5e8d1c6c1757ec512ff2695689bc5b8c2c88706f
 2015-06-30 14:13:14 -07:00
Rich Slogar
3de121f94c Merge "docs: studio workflow page typo" into mnc-preview-docs 2015-06-30 20:38:25 +00:00
Rich Slogar
a351bca51a docs: migration guide link update 
b.android/178474

Change-Id: Ie0c54b1eb4d47426da4e09cfea0ede7dde3c7a91
 2015-06-30 13:31:47 -07:00
Robert Schaub
e51d6d05e9 am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs 
* commit 'fae35eed99d6bc87f3a864bdd16d951136a16cc7':
  docs: Changed link in Java source code comment to repair 404
 2015-06-30 20:26:36 +00:00
Filip Gruszczynski
300ccf4ab5 am 0ec1328f: Calculate outset hint when adding window. 
* commit '0ec1328f85a08a610868856c688ebb8196c79c17':
  Calculate outset hint when adding window.
 2015-06-30 20:20:48 +00:00
Amit Mahajan
43d3bd0276 am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '8363104782302c08f2f03d4e1e345edb7f20876c':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 20:11:48 +00:00
Joe Fernandez
72356f0b20 am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit 'f1686ac225c75991d931348818065f9e99cf0b73':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 20:11:40 +00:00
Robert Schaub
fae35eed99 Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs 2015-06-30 20:06:26 +00:00
Amit Mahajan
8363104782 am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '22766e85d8b7bbedaa28a409f34120c4f3d4a2d3':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 20:00:00 +00:00
Joe Fernandez
f1686ac225 am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '88c2d704c3bbb58a676b4b1164b1c98aecdf467d':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 19:59:53 +00:00
Amit Mahajan
22766e85d8 am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'bcf9223b3bbe542d0ab040398c26cf1c600f5493':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 19:45:08 +00:00
Joe Fernandez
88c2d704c3 am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '4bd25634f13876e7ab31b6de66ceb9ca1cdc784d':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 19:45:03 +00:00
Filip Gruszczynski
0ec1328f85 Calculate outset hint when adding window. 
Outsets aren't dynamic so they are a great candidate for a hint when the
window is added through the window manager. Thanks to this during first
view hierarchy measure or wallpaper window layout they are immediately
available and don't require multiple measure/layout passes.

Bug: 21593814
Change-Id: I573c15ffbbe4fcd8a6ed9c5e4fcd6cfbbcd7434f
 2015-06-30 12:42:17 -07:00
Robert Schaub
f64c80a6cd docs: Changed link in Java source code comment to repair 404 
Need to find out what developer is in charge of CardEmulation.java to include
in review.

Bug: 19950839

Change-Id: Ic30ebaf69e46a70a64c8a123b0f72abaff7d0b80
 2015-06-30 12:41:58 -07:00
Rich Slogar
823bd9fbc4 docs: studio workflow page typo 
b.android/178485

Change-Id: I26da96cd5d08ad72c99dba9a72a427d050986507
 2015-06-30 12:27:11 -07:00
Bryce Lee
d903e580aa am cc2ba220: Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev 
* commit 'cc2ba2200ddc9d95753fa930aa245540fac880e8':
  Only enable theater mode by button press after setup.
 2015-06-30 18:34:47 +00:00
Amit Mahajan
bcf9223b3b am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '23444e76d2480d2537c2b6418f0c6c89c8cdb590':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 18:21:50 +00:00
Joe Fernandez
4bd25634f1 am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '765255b41229553842da855b8e5d9dfa87cf8e2b':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 18:21:41 +00:00
Bryce Lee
cc2ba2200d Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev 2015-06-30 17:13:04 +00:00
David Friedman
eb7f1a948a am 9f2e92ee: Merge "Docs: Localized M-Preview pages Bug: 21789313" into mnc-preview-docs 
* commit '9f2e92eebd05d8f37ae5f8383b4a0d63d51a9654':
  Docs: Localized M-Preview pages Bug: 21789313
 2015-06-30 01:58:57 +00:00
David Friedman
9f2e92eebd Merge "Docs: Localized M-Preview pages Bug: 21789313" into mnc-preview-docs 2015-06-30 01:51:37 +00:00
David Friedman
4fd1a573eb Docs: Localized M-Preview pages 
Bug: 21789313

Change-Id: Ifb4a45a65acd7b786e05bdf7b7dd86698093fbdf
 2015-06-29 16:03:08 -07:00
Andrew Solovay
4653cdecab am 350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs 
* commit '350286e613cdde99f347bd115c406e790a242f87':
  docs: Clarified when you can put the fragments in the root view.
 2015-06-29 21:55:09 +00:00
Andrew Solovay
350286e613 Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs 2015-06-29 21:42:48 +00:00
Filip Gruszczynski
e89d821e33 am b6c158f9: Merge "Dump of previous vibrations." into cw-d-mr1-dev 
* commit 'b6c158f9d863768d5d8315f2a4a4bb87c4db2fea':
  Dump of previous vibrations.
 2015-06-29 20:59:50 +00:00
Filip Gruszczynski
b6c158f9d8 Merge "Dump of previous vibrations." into cw-d-mr1-dev 2015-06-29 20:47:10 +00:00
Filip Gruszczynski
3a8eb0f670 Dump of previous vibrations. 
It's hard to find previous vibrations when you chase excessive use that
impacts the battery. A dump of previous vibrations allows us to
investigate where the vibrations come from.

Bug: 21933068
Change-Id: I14944732927c73401e5adc7345ea9823092b1883
 2015-06-29 09:28:32 -07:00
Amit Mahajan
293facf4bf am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'ad6a2da84800e47048a8c2a83eeb343cee6aaa9c':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 23:26:27 +00:00
Amit Mahajan
ad6a2da848 am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '2da8a992cb2afc25ac6df84da449944ea08f0c57':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 23:12:05 +00:00
Amit Mahajan
1573d8efb2 am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'd98e7c1df774eb86a67310f5cbc0dbdd91f33c19':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:55:47 +00:00
Amit Mahajan
2da8a992cb am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'b98f786c8acfaed27ee733dde0aa0fd255a09afc':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:55:18 +00:00
Amit Mahajan
d98e7c1df7 am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '7278b04383cb6c01c2fbb184c560875ab709dea5':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:35:46 +00:00
Amit Mahajan
b98f786c8a am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '5b8976a5eaffe81a742ec2600cf9b63e911f978c':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:34:59 +00:00
Rich Slogar
76e42bdd05 am 3686e043: am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs 
* commit '3686e0430f8366e2f4de867eeabfd1b7fe4aefc0':
  docs: manifest merger updates
 2015-06-26 22:34:49 +00:00
Amit Mahajan
23444e76d2 am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'eee86342713a7c89c30933a22f8b7e190d3af10f':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:31:49 +00:00
Rich Slogar
3686e0430f am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs 
* commit '268a7c190c37a7a63bd1134c4dfb8aacf71c211e':
  docs: manifest merger updates
 2015-06-26 22:25:35 +00:00