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

158947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
321e7645c3 Merge "docs: Recents screen for tasks and activities" into lmp-dev 2014-10-17 05:40:43 +00:00
smain@google.com
7feac6013b Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev 
automerge: c640089

* commit 'c6400892b56ee217ed01a41abb769fb1aebc9830':
  add Lollipop highlights and revision to 5.0 API overview intro
 2014-10-17 05:33:46 +00:00
Joe Fernandez
365ca55529 Merge "Android 5.0 changes to IME switching" into lmp-dev 
automerge: d664dc9

* commit 'd664dc93f47e32df865384718055b200585e0e88':
  Android 5.0 changes to IME switching
 2014-10-17 05:33:00 +00:00
smain@google.com
c6400892b5 Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev 2014-10-17 05:17:02 +00:00
Scott Rowe
73d799dda2 docs: Recents screen for tasks and activities 
Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
 2014-10-16 22:16:13 -07:00
smain@google.com
4c169e03fb add Lollipop highlights and revision to 5.0 API overview intro 
Change-Id: Ic50db6ea2ea9893088f271ce2427ccda69fc6b75
 2014-10-16 22:15:18 -07:00
Joe Fernandez
b76c0d5853 Merge "docs: Update Android TV home for L announcement" into lmp-dev 
automerge: c49acf0

* commit 'c49acf029e65928d07815631a0160fe179458add':
  docs:  Update Android TV home for L announcement
 2014-10-17 05:04:44 +00:00
David Friedman
bf8860cd0e Merge "Notificiations Design for Android L Release" into lmp-dev 
automerge: c2a556f

* commit 'c2a556ffe8a5949a0e3d7baf8122ea38b4ae1d30':
  Notificiations Design for Android L Release
 2014-10-17 05:03:52 +00:00
David Friedman
5121f214f0 Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev 
automerge: 597d386

* commit '597d3861298d8c3e2bc50c92ecffb4003cd265f7':
  NDK-r10c release notes (change log) for publication to NDK page on DAC.
 2014-10-17 05:03:06 +00:00
Joe Fernandez
d664dc93f4 Merge "Android 5.0 changes to IME switching" into lmp-dev 2014-10-17 05:01:04 +00:00
Joe Fernandez
c49acf029e Merge "docs: Update Android TV home for L announcement" into lmp-dev 2014-10-17 04:58:03 +00:00
David Friedman
e802d5432e Android 5.0 changes to IME switching 
Change-Id: I158736ee36706889a5277f02a652162194289514
 2014-10-16 21:52:53 -07:00
David Friedman
c2a556ffe8 Merge "Notificiations Design for Android L Release" into lmp-dev 2014-10-17 04:48:32 +00:00
David Friedman
0df77e988a Notificiations Design for Android L Release 
Change-Id: I32723dafa2d3bd455da9c6e03c09c668b2bd6446
 2014-10-16 21:39:25 -07:00
Joe Fernandez
d5c4c26869 docs: Update Android TV home for L announcement 
Change-Id: Ie98da5efa59dd3c797dda38bb465b7cc66b4d2e7
 2014-10-16 21:38:17 -07:00
David Friedman
597d386129 Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev 2014-10-17 04:30:29 +00:00
David Friedman
2fe086c21f NDK-r10c release notes (change log) for publication to NDK page on DAC. 
Change-Id: I0f8bc87b741ec1ef978c3fc22954d43519172299
 2014-10-16 21:18:03 -07:00
Dan Albert
82cb38e573 Fix a wonderful copy/paste time bomb. 
While trying to move projects over to libc++, I came across a link
error where these tests were failing to link when built with mma, but
not with mm. When building with mma, they would fail to link because
of symbols missing from the NDK's stlport. Huh?

When cleaning up this makefile a while ago, I removed the redundant
static_libraries := gtest/stlport, but missed removing the
LOCAL_STATIC_LIBRARIES :+ $(static_libraries).  The Android.mk in
bootable/recovery/tests was being loaded before this one, and _did_ in
fact define static_libraries. It defined it to, redundantly, include
the stlport flavored gtest libraries (another wonderful piece of
copy/paste if I do say so myself). Because of this, running mma with
this project set to use libc++ meant that the final binary was linked
with not just libc++ and the libc++ gtest libraries, but also the
stlport gtest libraries and the NDK's stlport.

Change-Id: Ibc545f95f701126ec9f0d0d0ac3d2a0feba78f8a
 2014-10-16 20:45:13 -07:00
smain@google.com
9f39335194 update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement 
automerge: 271078f

* commit '271078f50dc730e0fda8e80c66b81ac2442f64f0':
  update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
 2014-10-17 02:12:42 +00:00
Ricardo Cervera
b7f8947f04 Merge "docs: Migrating material design info from the Preview site" into lmp-dev 
automerge: 2e57c2c

* commit '2e57c2c956588b3f08111c323e811d4cbe46dabd':
  docs: Migrating material design info from the Preview site
 2014-10-17 02:11:44 +00:00
smain@google.com
271078f50d update L preview landing page for 5.0 SDK launch 
includes new system images
also update the DAC homepage announcement

Change-Id: I6e249e4ec5ef4b4329b145b334b31cfe11dd136c
 2014-10-16 18:48:17 -07:00
Ricardo Cervera
2e57c2c956 Merge "docs: Migrating material design info from the Preview site" into lmp-dev 2014-10-17 01:06:06 +00:00
Quddus Chong
fac141260c Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev 
automerge: 67b5c8e

* commit '67b5c8ebc4a9895e065a9314cb9afbf8e3e60197':
  docs: Updates to Android 5.0 API Overview.
 2014-10-17 00:59:03 +00:00
Ricardo Cervera
414978a821 docs: Migrating material design info from the Preview site 
Change-Id: I3a2f71e41cc1371b8cce2d8860b116cf0f8b8ed2
 2014-10-16 17:52:28 -07:00
Dianne Hackborn
d3511d4be1 SDK only: hide the old L API version constant. 
Also update the LOLLIPOP version constant to describe more things
that change when you target it.

Change-Id: I15e2c26a0f997ff2bfc8dd5076c827da7f42ee66
 2014-10-16 17:49:45 -07:00
vandwalle
29a30d41a1 set autojoin associated scan frequency to 20 seconds 
Change-Id: I00cc11bfebcde99bc1bcfeaa682ec78fdd8d5ff2
 2014-10-16 17:48:21 -07:00
Quddus Chong
67b5c8ebc4 Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev 2014-10-17 00:39:31 +00:00
Dan Albert
69c8d39d1f Merge "Clean up unused parameter warnings." 2014-10-17 00:03:06 +00:00
Dan Albert
692018430f Clean up unused parameter warnings. 
Change-Id: Ifbf310a0c10bd6afc3099bcad1026990bd1e6a22
 2014-10-16 16:55:29 -07:00
ztenghui
eec6164e6f Make sure the bitmap from VD's cache is drawn using bi-linear filter. 
b/17949291

Change-Id: I0e59852220ab8a3be2c70afa483e805029a9e19e
 2014-10-16 15:40:04 -07:00
Christopher Tate
7a03241199 am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev 
* commit '040d89bb0a4563d93073b7a27b3f201ce11dcf58':
  Eliminate race condition around backup completion + resumption
 2014-10-16 21:31:54 +00:00
Christopher Tate
040d89bb0a Merge "Eliminate race condition around backup completion + resumption" into lmp-dev 2014-10-16 21:26:26 +00:00
Andrew Solovay
b002041c2e am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev 
* commit '6b53fb6227b884db2761fa146ed2f4f28100962d':
  docs: Updating support library pages for v.21.
 2014-10-16 21:14:32 +00:00
Andrew Solovay
6b53fb6227 Merge "docs: Updating support library pages for v.21." into lmp-dev 2014-10-16 21:10:20 +00:00
Andrew Solovay
0e4611d061 am 4461e926: Merge "docs: Restored the preview license." into lmp-dev 
* commit '4461e9268ba010f9cd6e8881a57b7af7b031ea31':
  docs: Restored the preview license.
 2014-10-16 21:09:45 +00:00
Andrew Solovay
4461e9268b Merge "docs: Restored the preview license." into lmp-dev 2014-10-16 21:01:07 +00:00
Andrew Solovay
347257a74d docs: Restored the preview license. 
Added the preview license back, with changes as previously negotiated
with legal.

See first comment for staging directory link.

Change-Id: Ibc23d4d89b4380546d61ed052ba15dc81b8b1336
 2014-10-16 13:57:20 -07:00
Christopher Tate
a28b5c5160 Eliminate race condition around backup completion + resumption 
Ensure that the callback always sees the current-operation state in sync
with the various other bits of internal backup-operation state.  Previously
only the current-operation state was managed inside the critical section;
this resulted in a slim race window where a callback could see an ongoing
operation as still valid, but after the internal state on which that
operation depended had already been cleared.

Bug 17931760

Change-Id: Ia032668e7a9d22f1029c57fc98db9e86484d5719
 2014-10-16 13:56:45 -07:00
Rich Slogar
69453b6e8e am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit '60e74b4924dee6d033ca61854cac42768006ced5':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 20:45:28 +00:00
Rich Slogar
60e74b4924 Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 2014-10-16 20:41:18 +00:00
Svet Ganov
25129a3975 am b22552c3: Merge "Send accessibility events with no window." into lmp-dev 
* commit 'b22552c35bc939619c2e7c967e4eae618d8b93cc':
  Send accessibility events with no window.
 2014-10-16 19:40:16 +00:00
Svet Ganov
b22552c35b Merge "Send accessibility events with no window." into lmp-dev 2014-10-16 19:35:41 +00:00
Rich Slogar
8ee2b2dace :docs Platform Tools Rel Note Nexus 6/9 dpi updates 
Change-Id: I34d71a4c42fababbce1ad13dee4fa8f722798e7b
 2014-10-16 12:07:35 -07:00
Scott Rowe
27d9fa6801 am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit '447369f2d2b02f78d01d4a4923fedfca96c1950f':
  docs: update reference to FragmentRetainInstance
 2014-10-16 18:32:17 +00:00
Joe Fernandez
b0c4a18dc5 am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '7e19b402c6651112a56ab8569ea53a7004a3a552':
  Typo fixed in sample code
 2014-10-16 18:32:13 +00:00
Scott Rowe
447369f2d2 am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
  docs: update reference to FragmentRetainInstance
 2014-10-16 18:23:42 +00:00
Joe Fernandez
7e19b402c6 am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
  Typo fixed in sample code
 2014-10-16 18:23:18 +00:00
David Friedman
40d9eaa844 am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 
* commit 'd12e6de645a39e6e902785d544100fb1963aa203':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 18:10:38 +00:00
David Friedman
d12e6de645 Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 2014-10-16 18:06:01 +00:00
Quddus Chong
49cc89ec51 docs: Updates to Android 5.0 API Overview. 
Change-Id: I0dcbb134fc499da0172bfe8d79c5aaa1a4b3ef75
 2014-10-16 11:01:42 -07:00