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

156488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
3c7efdc005 Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev 2014-11-03 22:38:34 +00:00
Luan Nguyen
c85ccdf307 am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 
* commit '9b1bad22a2cc6ff4d996d40c7c1cbbd56200ec38':
 2014-11-03 21:22:12 +00:00
Joe Fernandez
583b2cc051 am f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a 
* commit 'f05f8a3036730389ced119ee9f4a44f2af96e06e':
 2014-11-03 21:22:02 +00:00
Natalie Masse
f978dac8b7 am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 
* commit '471a354c870ea02c2742c92c7b819ca1b1567f6f':
 2014-11-03 21:21:52 +00:00
Scott Rowe
d584dbea67 am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd 
* commit 'f6768bac864cdf9ed99b088dc88da6b38df6911e':
 2014-11-03 21:21:48 +00:00
Joe Fernandez
9586eacf98 am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575 
* commit '2fb449e9190abe7b3181d623091df378bc682a7b':
 2014-11-03 21:17:18 +00:00
Prashant Malani
eaf585a1bb am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours 
* commit '80c26ce0f6893b2c97b88800467332b69d793e4c':
 2014-11-03 21:17:14 +00:00
Ricardo Cervera
c96d62a66a am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473 
* commit 'b50fd5d569d03292fa0b4c4306077efbab87f70e':
 2014-11-03 21:17:11 +00:00
Luan Nguyen
4e4a1ed338 am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367 
* commit '879b948e2bfed25877ff89ac316885394139cc11':
 2014-11-03 21:17:07 +00:00
Luan Nguyen
9b1bad22a2 am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 
* commit 'dcea6fa9ad14e2b1ba4cce5c1f6acd08219494c5':
 2014-11-03 21:15:58 +00:00
Joe Fernandez
f05f8a3036 am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a 
* commit 'cbabe5761296d60bd26a76dff710c00b86d55f69':
 2014-11-03 21:15:54 +00:00
Natalie Masse
471a354c87 am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 
* commit '7d3bd06d2928942c6eedbcf5e9437b43a1268a6d':
 2014-11-03 21:15:51 +00:00
Scott Rowe
f6768bac86 am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd 
* commit 'c51276ec1fddf67c7d31b35bdc0632098233fbb6':
 2014-11-03 21:15:47 +00:00
smain@google.com
c360ec9b6d am afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb 
* commit 'afa68731cf249f19a293c42fafd4daf074fe20bd':
 2014-11-03 21:11:38 +00:00
smain@google.com
ec3eb1c7f5 am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8 
* commit '6df786d3b6a86cf6d43bf5b9f431fcc070711dd7':
 2014-11-03 21:11:34 +00:00
Ricardo Cervera-Navarro
dc489b6ce7 am 521f964a: am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757 
* commit '521f964a6e79aa913e42f2449dab9d2fe58cf7cb':
 2014-11-03 21:11:30 +00:00
Rich Slogar
4a6b69c545 am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b 
* commit 'ec4bc00674168c78a0adbd6f48e8733e16486558':
 2014-11-03 21:11:23 +00:00
Eric Gilmore
f38b98f3b6 am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36 
* commit 'e9324d0f8204a82db45cd86cc7cd3fb3025f9681':
 2014-11-03 21:11:14 +00:00
Luan Nguyen
dcea6fa9ad am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 
automerge: 4182391

* commit '418239190b0d0e6921ee0e1e498a34bb7cddc392':
 2014-11-03 21:10:02 +00:00
Joe Fernandez
cbabe57612 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e 
automerge: 3d76f6a

* commit '3d76f6a9578302e4c6c0de694ec7e0923f3cabe2':
 2014-11-03 21:08:45 +00:00
Joe Fernandez
2fb449e919 am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575 
* commit '031a08631900b7863b3ea228db50062633a2decd':
 2014-11-03 21:08:40 +00:00
Prashant Malani
80c26ce0f6 am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours 
* commit 'ee2802ebedf920b43bd199b807b4d413c8c8cf0a':
 2014-11-03 21:08:37 +00:00
Ricardo Cervera
b50fd5d569 am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473 
* commit '764e61ad3ffecb0bcde4d1d5569757f9674f0849':
 2014-11-03 21:08:34 +00:00
Luan Nguyen
879b948e2b am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367 
* commit 'acbfd20d53b4caeb6e1bb1fc564fe795cde3a5bc':
 2014-11-03 21:08:30 +00:00
Jorim Jaggi
ec705c2c58 Only hide sensitive content when Keyguard is showing 
isOccluded is set delayed when unlocking the phone from a
notification, so updatePublicMode used a stale state. Now, only
the fact whether the Keyguard is showing (no matter if occluded or
not) is used to determine the public mode, which is set in a
synchronous manner.

Bug: 18026898
Change-Id: I3e4988f3e806cf15616ee5aa452f81f19d4aa716
 2014-11-03 22:08:05 +01:00
Natalie Masse
7d3bd06d29 am 1e5bb861: Link and typo fixed automerge: bcf9ced 
automerge: 9f6ea58

* commit '9f6ea5841c139bf061bc8b212b6f3183558235a1':
 2014-11-03 21:07:41 +00:00
Joe Fernandez
d6d0be4f66 am 194d2026: am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e 
* commit '194d2026a3fc685a0ed9afc8080060155a983c95':
 2014-11-03 21:06:16 +00:00
Fred Fettinger
369aafb658 am eeeebfff: am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1 -s ours 
* commit 'eeeebfff30ef1bcd916ed5bbb82c78f7216c0a7d':
 2014-11-03 21:06:12 +00:00
Scott Rowe
c51276ec1f am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 
automerge: e0da6dd

* commit 'e0da6ddc08ff014bf2e5cd619451d95f5ac5663b':
 2014-11-03 21:05:48 +00:00
Joe Fernandez
031a086319 am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 
automerge: d6ed575

* commit 'd6ed5752da2c741b43d7c4d4d33da955c4fc72b9':
 2014-11-03 21:04:37 +00:00
Prashant Malani
ee2802ebed Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours 
automerge: a8f4b8a  -s ours

* commit 'a8f4b8a26055055cc5efa3a33862db6f5ca572a5':
 2014-11-03 21:03:23 +00:00
Ricardo Cervera
764e61ad3f am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 
automerge: 884b473

* commit '884b473ad8bccfef4e379de9034278ffa2113780':
 2014-11-03 21:02:22 +00:00
smain@google.com
afa68731cf am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb 
* commit '841b7a21f164f8fd9bf3c870e635d48861738751':
 2014-11-03 21:02:16 +00:00
smain@google.com
6df786d3b6 am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8 
* commit '87c4d66ddd45829559f70eb921d0dbea66ca9982':
 2014-11-03 21:02:12 +00:00
Ricardo Cervera-Navarro
521f964a6e am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757 
* commit 'e3e6193ea040a25691b68a780f16ebed3f685d0e':
 2014-11-03 21:02:07 +00:00
Rich Slogar
ec4bc00674 am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b 
* commit '4f8a41cccdd7d7c8070d925decf4893b397cb7bc':
 2014-11-03 21:01:59 +00:00
Eric Gilmore
e9324d0f82 am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36 
* commit '7ecb0a3e5c50837d1b9ea6d952805a9b3795448e':
 2014-11-03 21:01:54 +00:00
smain@google.com
a2216f748d am 16bc5859: am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02 
* commit '16bc5859b728d3fb74a538679920cf3846505616':
 2014-11-03 21:00:56 +00:00
Quddus Chong
7257befb6b am 0323f8a6: am 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. automerge: 581d03b 
* commit '0323f8a685f25cb8f2d95b73fa098d9641005adb':
 2014-11-03 21:00:52 +00:00
Luan Nguyen
acbfd20d53 am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 
automerge: cc8b367

* commit 'cc8b36706cd976d8313ba35c238920079005578e':
 2014-11-03 20:59:12 +00:00
smain@google.com
841b7a21f1 am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a 
automerge: 870afdb

* commit '870afdb39abdb308aee8d035f5e72251059f7af4':
 2014-11-03 20:58:03 +00:00
Joe Fernandez
194d2026a3 am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e 
* commit '7d35425b98d7228f1b6fc58e96a2b3b9333318c2':
 2014-11-03 20:57:20 +00:00
Fred Fettinger
eeeebfff30 am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1 -s ours 
* commit 'b33ca4f38c6b2a804fda7dad4cb488134b485130':
 2014-11-03 20:57:15 +00:00
smain@google.com
87c4d66ddd am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 
automerge: 469c8c8

* commit '469c8c898389368b7fb9f34c302d810565e29326':
 2014-11-03 20:56:59 +00:00
Ricardo Cervera-Navarro
e3e6193ea0 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b 
automerge: 4687757

* commit '46877572906d932d27bc39f0a347d17607411282':
 2014-11-03 20:55:52 +00:00
Rich Slogar
4f8a41cccd am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad 
automerge: d84910b

* commit 'd84910b06b8d8af7de04f975e58a77e65f888374':
 2014-11-03 20:54:50 +00:00
Eric Gilmore
7ecb0a3e5c Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp 
automerge: 068cb36

* commit '068cb36877144dc337766c1113250f5ebc2cbf6f':
 2014-11-03 20:53:40 +00:00
smain@google.com
16bc5859b7 am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02 
* commit 'a77da17ecc64f6125c954892c6d2dabf1a317be5':
 2014-11-03 20:52:11 +00:00
Quddus Chong
0323f8a685 am 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. automerge: 581d03b 
* commit '68f8326eb4c7e7b56130979dc366c0aba32aa9f8':
 2014-11-03 20:52:07 +00:00
Deepanshu Gupta
6f7fd0ba50 am 3eff8312: am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af 
* commit '3eff8312c9c742cc75086d006ecdf36695327f93':
 2014-11-03 20:51:40 +00:00