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

124112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
3a4924d417 am 371d68cc: add link back to main dev site home 
* commit '371d68ccb03e4c3827f8b548ebb128cddd8c4bd3':
  add link back to main dev site home
 2014-06-21 20:15:59 +00:00
Michael Kolb
c6ffc840c4 am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev 
* commit '270c099faf63868dcc21836a84de778337ff3be9':
  Move emulator check & save system properties access
 2014-06-21 20:15:47 +00:00
Craig Mautner
aaadf92210 am 90c9fffc: Merge "Do not delete stack if empty task is being reused." into klp-modular-dev 
* commit '90c9fffc956589f06d4a0c45a893c5db6a85fabc':
  Do not delete stack if empty task is being reused.
 2014-06-21 20:15:36 +00:00
Michael Kolb
71f65485bf am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev 
* commit 'db9fed74c2bbf97157683b47f3cbdcd04c729839':
  Make WindowInsets.isRound work with emulator
 2014-06-21 20:15:24 +00:00
Joe Fernandez
82d013d45a am 8b19cdf7: am 845835c7: am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs 
* commit '8b19cdf7535b193c2633bc311038521f749ebc70':
  ExoPlayer developer guide
 2014-06-21 20:15:12 +00:00
Robert Ly
5c26b33e4a am d8b94456: fix build 
* commit 'd8b94456c49578fa152fe5bd6a07a131056e3288':
  fix build
 2014-06-21 20:15:07 +00:00
Robert Ly
9e51442ca5 am 8c573178: Merge "docs: fix l preview bugs" into klp-modular-dev 
* commit '8c573178dfa68fc57594124128c9fd8e2abe8f01':
  docs: fix l preview bugs
 2014-06-21 20:14:59 +00:00
Robert Ly
31dde38567 am 448f823e: Merge "docs: fix margins and add partners back" into klp-modular-dev 
* commit '448f823e2048e2e5843557fe255b751c5a1b2961':
  docs: fix margins and add partners back
 2014-06-21 20:14:55 +00:00
smain@google.com
371d68ccb0 add link back to main dev site home 
Change-Id: Icab3fbd6a0a62d7a83ab41061956614d575b7bb4
 2014-06-20 17:45:37 -07:00
Dan Albert
70c47d7025 am a642a9ea: am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s." 
* commit 'a642a9ea3b2288b431ecb284b94a4657ae62889d':
  Use openssl's SHA1 instead of bionic's.
 2014-06-20 22:40:25 +00:00
smain@google.com
02616aff5a am 4d30b1e6: make buttons "primary" red 
* commit '4d30b1e663d975357e0e748a1bf4ab094e3afdde':
  make buttons "primary" red
 2014-06-20 22:30:25 +00:00
smain@google.com
a787d796c2 am 78dfcb3a: Merge "revised homepage to use static version of top banner" into klp-modular-dev 
* commit '78dfcb3aba8883ae13c62103172277dda32d87f1':
  revised homepage to use static version of top banner
 2014-06-20 22:30:02 +00:00
Joe Fernandez
8b19cdf753 am 845835c7: am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs 
* commit '845835c779557392c1b25a25082f6fe66ed0f066':
  ExoPlayer developer guide
 2014-06-20 21:46:57 +00:00
Robert Ly
d8b94456c4 fix build 
Change-Id: I9d9610137823656b63e5983ba93d390b2ab4cabc
 2014-06-20 14:42:12 -07:00
Joe Fernandez
845835c779 am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs 
* commit '2d7b3dedd0ddccd5a44b7c289f5075ea1696c06c':
  ExoPlayer developer guide
 2014-06-20 21:41:30 +00:00
Michael Kolb
db9fed74c2 Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev 2014-06-20 21:00:34 +00:00
Michael Kolb
437d31390b Make WindowInsets.isRound work with emulator 
Bug: 15775489

Change-Id: I53a14ccd3be776d46c9cea43c0d5d3f41674dd75
 2014-06-20 15:13:09 -07:00
Robert Ly
8c573178df Merge "docs: fix l preview bugs" into klp-modular-dev 2014-06-20 21:00:34 +00:00
Robert Ly
c8590ffdc3 docs: fix l preview bugs 
Change-Id: Ic89fea620ba458c604ccdeeb6da471c807a71fef
 2014-06-20 14:11:29 -07:00
Michael Kolb
270c099faf Merge "Move emulator check & save system properties access" into klp-modular-dev 2014-06-20 20:43:34 +00:00
Michael Kolb
22dfdcb7ee Move emulator check & save system properties access 
Bug: 15775489

Change-Id: I375aee36b212ae044101a65b65c51e6f889fd263
 2014-06-20 15:39:04 -07:00
Dan Albert
a642a9ea3b am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s." 
* commit 'd24f557798d04bdd50f2a45e48b70b009a205b4a':
  Use openssl's SHA1 instead of bionic's.
 2014-06-20 19:53:36 +00:00
Baligh Uddin
1c74e20db1 am 1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '1b3a52170ab0f2ec82532a689d271eaf8b8997f9':
  Import translations. DO NOT MERGE
 2014-06-20 19:48:52 +00:00
Robert Ly
149c1b09ee am c9334fb1: fix typo on lmp-prev page 
* commit 'c9334fb1b884031ad0f522085542e80e71f73685':
  fix typo on lmp-prev page
 2014-06-20 19:48:48 +00:00
Robert Ly
f6c5ee4079 am 3323e554: Merge "add new image and landing page for l-preview" into klp-modular-dev 
* commit '3323e554391e7cf5ddba03d9f468c8acfb35ee0e':
  add new image and landing page for l-preview
 2014-06-20 19:48:40 +00:00
Elliott Hughes
19597647f9 am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface" 
* commit 'ff6b0e24725c642f0681e214f143a8151e4e6bea':
  Fixed VM memory leak in AudioSystem JNI interface
 2014-06-20 16:34:36 +00:00
Elliott Hughes
ff6b0e2472 am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface" 
* commit 'f18961066b7029652dacb9016bacbf192a6cf73d':
  Fixed VM memory leak in AudioSystem JNI interface
 2014-06-20 16:30:40 +00:00
smain@google.com
4d30b1e663 make buttons "primary" red 
Change-Id: Ife5f2b565f52621df953593b9b3bd7cc05500f81
 2014-06-19 22:33:50 -07:00
Dan Albert
d24f557798 Merge "Use openssl's SHA1 instead of bionic's." 2014-06-20 02:09:57 +00:00
Elliott Hughes
f18961066b Merge "Fixed VM memory leak in AudioSystem JNI interface" 2014-06-20 02:09:57 +00:00
Robert Ly
448f823e20 Merge "docs: fix margins and add partners back" into klp-modular-dev 2014-06-20 02:09:17 +00:00
Robert Ly
3192cff692 docs: fix margins and add partners back 
Change-Id: I0430079f136fb6197a9a53e44f55a0292d8975a7
 2014-06-19 21:23:46 -07:00
smain@google.com
78dfcb3aba Merge "revised homepage to use static version of top banner" into klp-modular-dev 2014-06-20 00:30:35 +00:00
smain@google.com
c99f100f29 revised homepage to use static version of top banner 
Change-Id: Id337f67640a648cf28cbf20ccd2dba1524475aae
 2014-06-19 18:26:52 -07:00
Craig Mautner
90c9fffc95 Merge "Do not delete stack if empty task is being reused." into klp-modular-dev 2014-06-20 00:24:32 +00:00
Craig Mautner
362449af58 Do not delete stack if empty task is being reused. 
If a task is being cleared due to Intent flags and that clearing
was causing the last activity in the last task on a stack to be
deleted, then we were deleting the stack. Immediately after
this we were refilling the task with the same activity but the
stack had already been deleted.

This fix preserves the task and stack when it is only being
cleared for the new activity.

Fixes bug 15611901.

Change-Id: I7bcfa826d0852d9c640daa73fe1324b89471fecd
 2014-06-20 14:04:39 -07:00
Joe Fernandez
2d7b3dedd0 Merge "ExoPlayer developer guide" into klp-docs 2014-06-20 00:24:32 +00:00
Joe Fernandez
afe3bb96f2 ExoPlayer developer guide 
Change-Id: Icacaa0e68e602fc77946e10729b3649baaf4331b
 2014-06-20 14:28:54 -07:00
Baligh Uddin
1b3a52170a Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-06-20 00:01:43 +00:00
Robert Ly
c9334fb1b8 fix typo on lmp-prev page 
Change-Id: I3cc4c457d12c71a466b2be16022ac1e6835227b3
 2014-06-19 17:00:55 -07:00
Baligh Uddin
21681dcda4 Import translations. DO NOT MERGE 
Change-Id: I7f78f8188fd6b2f04f96a5846c13314687c2554e
Auto-generated-cl: translation import
 2014-06-19 16:53:45 -07:00
Robert Ly
3323e55439 Merge "add new image and landing page for l-preview" into klp-modular-dev 2014-06-19 22:33:55 +00:00
Robert Ly
7c5f1f1aae add new image and landing page for l-preview 
Change-Id: Ide3917a9795269b6606e3a7349c49b1d5b9b04b2
 2014-06-19 16:53:57 -07:00
smain@google.com
aa10b05a3b am b6974e92: add info about enabling USB debugging to adb doc. part of initiative to document the flash process for L preview. 
* commit 'b6974e9261f9d0bb4af39950496428cd2b45eb6d':
  add info about enabling USB debugging to adb doc. part of initiative to document the flash process for L preview.
 2014-06-19 19:45:47 +00:00
smain@google.com
b6974e9261 add info about enabling USB debugging to adb doc. 
part of initiative to document the flash process for L preview.

Change-Id: I5177ba63d1cb2f291002b0fdb0b0209ca9e17072
 2014-06-19 11:58:35 -07:00
Jeff Sharkey
b9a45aae8d am 447b68e7: am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak" 
* commit '447b68e767943fdde297d78321378e2623985a0a':
  Fixing parcel leaks to avoid virtual memory leak
 2014-06-19 16:11:51 +00:00
Jeff Sharkey
447b68e767 am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak" 
* commit 'b5e05cffccc2ca1ce85ce9952b6c6845b46aa5c7':
  Fixing parcel leaks to avoid virtual memory leak
 2014-06-19 16:07:52 +00:00
Robert Ly
611e591a3a am 4d521ed9: Merge "new lmp prev landing page" into klp-modular-dev 
* commit '4d521ed9663a7a4f938b3c09f06af557614ca3d3':
  new lmp prev landing page
 2014-06-19 08:53:46 +00:00
Ricardo Cervera
c93766932e am 10276c32: Merge "docs: Updated the screenshot for the Android Studio page." into klp-modular-dev 
* commit '10276c32ec0a15fa444c1f3fa6ec9e8d1002cb6e':
  docs: Updated the screenshot for the Android Studio page.
 2014-06-19 08:53:29 +00:00
Stephen Hines
c5b11fcc1f am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP." 
* commit 'ff83ed2dc34f0595bcff2cb7b5d71bb39191963e':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
 2014-06-19 03:18:17 +00:00