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

114477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
6e1e8b17c5 am c0e1ae01: am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev 
* commit 'c0e1ae0176b2ce23ea1b19883507cd920712289a':
  Move PdfDocument to android.graphics.pdf
 2013-09-20 11:21:05 -07:00
Craig Mautner
d052ee34a5 am f15024c8: am 12946530: Merge "Only show launcher for the bottom activity in a task" into klp-dev 
* commit 'f15024c8c8b3d21919347070909049c61c14ae06':
  Only show launcher for the bottom activity in a task
 2013-09-20 11:21:00 -07:00
David Braun
119ad51710 am e28962fe: am 3372cb26: Merge "Add config setting for default sms app." into klp-dev 
* commit 'e28962fe8e109d240b2f76988f93234e76a8eab9':
  Add config setting for default sms app.
 2013-09-20 11:20:53 -07:00
Glenn Kasten
1f6ec93f12 am 0fbb7484: am 9d53e30e: Merge "Workaround for slow AudioRecord destructor" into klp-dev 
* commit '0fbb74847aec65b057cad019d86617d9703c7c7a':
  Workaround for slow AudioRecord destructor
 2013-09-20 11:20:47 -07:00
Joe Fernandez
a48dfca9e4 am cda15002: am a17309fd: am 41c3c2b6: am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit 'cda1500201fb549caa6f324f61c2ad21bcd81536':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-20 11:20:41 -07:00
Joe Fernandez
3f3d49a032 am 29ccf51f: am 27f525c4: am 354b4fef: am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes 
* commit '29ccf51fc7c48559e20a1650837c9210f3cfe788':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
 2013-09-20 11:20:37 -07:00
Ed Heyl
083ebcf49a am 3ece8270: am 812c4d73: Merge "fix typo" into klp-dev 
* commit '3ece8270173df27518c16a5904ae5fe3c6b51913':
  fix typo
 2013-09-20 11:20:33 -07:00
Leon Scroggins III
29baa03ba5 am 2360ada9: am 57989c0e: Merge "Skip writing zeroes to java allocated memory." into klp-dev 
* commit '2360ada939b0abd4a6cca794288ff06701219f19':
  Skip writing zeroes to java allocated memory.
 2013-09-20 11:20:22 -07:00
Victoria Lease
9e233b54b6 am ab99b39d: am ddc0a63d: Merge "fix emoji clipping in hw draw path" into klp-dev 
* commit 'ab99b39d7d152de35ea02a364190ff325da4015b':
  fix emoji clipping in hw draw path
 2013-09-20 11:20:06 -07:00
Amith Yamasani
fa80ffa4fd am 638918a2: am 722b15e0: Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev 
* commit '638918a2681cff345b9e3bd5ff7b170a874125dc':
  Fix a regression in pausing activity immediately on sleep
 2013-09-20 11:20:03 -07:00
Eino-Ville Talvala
84fa15ce63 am f3c61c66: am a84ca8a3: Merge "TextureView/GLES20Canvas: Support synchronous GLConsumers" into klp-dev 
* commit 'f3c61c6657fb2a25e5ac04e55ce0d7eefabc07f7':
  TextureView/GLES20Canvas: Support synchronous GLConsumers
 2013-09-20 11:19:45 -07:00
Dianne Hackborn
9bef5b67dc resolved conflicts for merge of 20021b30 to master 
Change-Id: Ie758de25a277ed0a25bf08e4cd2c57c9519bd52d
 2013-09-20 10:40:34 -07:00
Igor Murashkin
52c77ea4d1 am a7dd66a4: am 9fa4b7af: Merge "Camera2Tests: create new directory for manual camera2 test apps" into klp-dev 
* commit 'a7dd66a4709353cd27b4482be73d2b3804cbeaa6':
  Camera2Tests: create new directory for manual camera2 test apps
 2013-09-20 09:58:48 -07:00
Yuhao Zheng
5380b780bb am 2e9a4265: am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev 
* commit '2e9a426529c54774b23609bee8d50118118ab895':
  Remove STOPSHIP in WifiWatchdogStateMachine
 2013-09-20 09:58:45 -07:00
Craig Mautner
de4232f721 am 9ea8bf15: am 7908f190: Merge "Debug for b/10689184." into klp-dev 
* commit '9ea8bf154cdad4b4cb627d9d6c9a9bc01c31abcd':
  Debug for b/10689184.
 2013-09-20 09:58:41 -07:00
petergng@google.com
594c72c8ed am a13e5dd3: am fe4643bb: Merge "Increasing visibility of pressed feedback for default ui widget assets" into klp-dev 
* commit 'a13e5dd3a953344dd3b702b6325a8e58be015625':
  Increasing visibility of pressed feedback for default ui widget assets
 2013-09-20 09:58:35 -07:00
Craig Mautner
2c34bd6a9a am cd569b31: am e8a94224: Merge "Return tasks in correct order." into klp-dev 
* commit 'cd569b31d398fe846eeee567d2816a3bb93dd493':
  Return tasks in correct order.
 2013-09-20 09:58:22 -07:00
Christopher Tate
0719715586 am 654aad21: am 9c5cc571: Merge "Support for "not the home app you\'re looking for" metadata" into klp-dev 
* commit '654aad21609642f7d0891962d72c0dfd4077fb94':
  Support for "not the home app you're looking for" metadata
 2013-09-20 09:58:18 -07:00
John Spurlock
03d4a0920c am cc8dc013: am 0286f5e2: Merge "Bar gradients now 55% to 0% black." into klp-dev 
* commit 'cc8dc0139ef11e8f34a22dfeb5073921030ccf98':
  Bar gradients now 55% to 0% black.
 2013-09-20 09:58:13 -07:00
Amith Yamasani
25fd841bd5 am 80af4f7b: am 7301bd96: Merge "Use a separate thread for services that do NTP lookup" into klp-dev 
* commit '80af4f7b098aa912dcc7c2ccaf4a559e15e608ff':
  Use a separate thread for services that do NTP lookup
 2013-09-20 09:58:08 -07:00
Jeff Sharkey
cc288455e6 am ba8129f1: am 18b94817: Merge "Also catch one more tablet layout NPE." into klp-dev 
* commit 'ba8129f1b15de500f46bd2adee251bf5d8bf5bbd':
  Also catch one more tablet layout NPE.
 2013-09-20 09:57:57 -07:00
Jeff Sharkey
ff8bd2316e am 5de6787d: am 7cb93f4e: Merge "Fix tablet layout and resources." into klp-dev 
* commit '5de6787d1e90991af85d677bf38e242fcba427a1':
  Fix tablet layout and resources.
 2013-09-20 09:57:51 -07:00
Derek Sollenberger
8fa4e29f16 am 23b7bc1b: am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev 
* commit '23b7bc1b4409ca5844db5f17992b906aa3e63927':
  Update SkTypeface::CreateFromName to handle NULL if familyName does not match
 2013-09-20 09:57:42 -07:00
Baligh Uddin
457767d267 am be643364: (-s ours) am 25f9f364: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'be64336477bf3445da13b29236b6aa038d053daf':
  Import translations. DO NOT MERGE
 2013-09-20 09:57:33 -07:00
Baligh Uddin
58c35d0b61 am 16c68d62: (-s ours) am 07cf6487: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '16c68d62965f97fdc18650181c7faebe27729182':
  Import translations. DO NOT MERGE
 2013-09-20 09:57:29 -07:00
Geoffrey Borggaard
cf83beee99 am ce040924: am 5b05a115: Merge "Remove char limit." into klp-dev 
* commit 'ce040924f7dcfea558e432f9e4c5a643ff2623ef':
  Remove char limit.
 2013-09-20 09:57:25 -07:00
Baligh Uddin
b6f0dcff71 am 26aa6e90: (-s ours) am 8074862d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '26aa6e904c017abe9b7ce0773f5a353cabae93aa':
  Import translations. DO NOT MERGE
 2013-09-20 09:57:22 -07:00
Svetoslav
03e9838357 "resolved conflicts for merge of db7659e0 to master" 
Change-Id: I5c09680bbc6263d38f995f053c747199eb569c32
 2013-09-20 09:54:56 -07:00
Svetoslav
c0e1ae0176 am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev 
* commit 'facc08c7757cef56da6d10e78ce99ef7949700e3':
  Move PdfDocument to android.graphics.pdf
 2013-09-19 18:17:05 -07:00
Svetoslav
facc08c775 Merge "Move PdfDocument to android.graphics.pdf" into klp-dev 2013-09-20 01:14:02 +00:00
Craig Mautner
f15024c8c8 am 12946530: Merge "Only show launcher for the bottom activity in a task" into klp-dev 
* commit '12946530cfba2024fa45c06b0060fe5c91252aab':
  Only show launcher for the bottom activity in a task
 2013-09-19 17:53:38 -07:00
Craig Mautner
12946530cf Merge "Only show launcher for the bottom activity in a task" into klp-dev 2013-09-20 00:51:20 +00:00
Svetoslav
44634bbefc resolved conflicts for merge of db7659e0 to master 
Change-Id: I6b56fabd07b18dfcb25be83834e4f248f8aa4a40
 2013-09-19 17:44:13 -07:00
David Braun
e28962fe8e am 3372cb26: Merge "Add config setting for default sms app." into klp-dev 
* commit '3372cb2654e002e953e15d1b8513f090e9b6997d':
  Add config setting for default sms app.
 2013-09-19 17:30:42 -07:00
David Braun
3372cb2654 Merge "Add config setting for default sms app." into klp-dev 2013-09-20 00:26:32 +00:00
Craig Mautner
f51b5588d7 Only show launcher for the bottom activity in a task 
When transitioning from activity-over-launcher to task-over-launcher
ensureActivitiesVisibleLocked() was too aggressive in showing the
launcher. If there were any non-fullscreen activities in a task that
sits over the launcher then the launcher would be shown.

This fix adds a test to make sure the launcher will only be shown if
the bottommost activity in such a task is non-fullscreen.

Fixes bug 10840919.

Change-Id: I5dcd63be3fa2865ae38cbb921332937dfa4b5d47
 2013-09-19 17:19:51 -07:00
Glenn Kasten
0fbb74847a am 9d53e30e: Merge "Workaround for slow AudioRecord destructor" into klp-dev 
* commit '9d53e30e5eaf53cb0bd57319e02025ba7182bba3':
  Workaround for slow AudioRecord destructor
 2013-09-19 17:13:51 -07:00
Svetoslav
6811f4e92c Move PdfDocument to android.graphics.pdf 
1. Move PdfDocument to android.graphics.pdf.

2. Changed the PdfDocument as per API concil request.

3. Updated the documentation.

bug:10461180
bug:10552565
bug:10681585
bug:10552336

Change-Id: I08e15b34cf37bb064248c887e6f59808019cafe8
 2013-09-19 17:12:47 -07:00
Glenn Kasten
9d53e30e5e Merge "Workaround for slow AudioRecord destructor" into klp-dev 2013-09-20 00:08:58 +00:00
Joe Fernandez
cda1500201 am a17309fd: am 41c3c2b6: am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit 'a17309fd9ed705bb3a9d7adbf3b30eb71952dabc':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-19 16:53:09 -07:00
Joe Fernandez
a17309fd9e am 41c3c2b6: am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit '41c3c2b687fa19d10c450a6d4b0b9f9a707a3854':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-19 16:50:16 -07:00
Joe Fernandez
41c3c2b687 am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit '6e3b21cc83da2b227704b9a6b0cbad258ea5bd84':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-19 16:47:56 -07:00
Joe Fernandez
29ccf51fc7 am 27f525c4: am 354b4fef: am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes 
* commit '27f525c422aa9bdc2b0c1dccb989989f6fc8dbe4':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
 2013-09-19 16:46:21 -07:00
Ed Heyl
3ece827017 am 812c4d73: Merge "fix typo" into klp-dev 
* commit '812c4d737896fbf5dffa272f5d15863fb185d956':
  fix typo
 2013-09-19 16:46:18 -07:00
Glenn Kasten
8d87d7ba11 Workaround for slow AudioRecord destructor 
Bug: 10816117
Change-Id: If59028bc7dc7abb84e1e3642c721c2629653631f
 2013-09-19 16:46:04 -07:00
Joe Fernandez
6e3b21cc83 am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit '72f65780c77f9c0c306fcb53efeb62fbeba3899c':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-19 16:44:58 -07:00
Joe Fernandez
27f525c422 am 354b4fef: am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes 
* commit '354b4fef036ef9e57d79bf70a6988be92a9813eb':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
 2013-09-19 16:44:44 -07:00
Ed Heyl
812c4d7378 Merge "fix typo" into klp-dev 2013-09-19 23:43:25 +00:00
Joe Fernandez
72f65780c7 Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 2013-09-19 23:41:39 +00:00
Joe Fernandez
354b4fef03 am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes 
* commit '0d8f0849ff842ed7ce16f183207ed7ebbc7bac7e':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
 2013-09-19 16:41:07 -07:00