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

158409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
smain@google.com
93a4b93d5f am a2216f74: am 16bc5859: am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02 
* commit 'a2216f748d2464486106c6796dff97afb6853721':
 2014-11-03 21:08:00 +00:00
Quddus Chong
2ffdd5b92a am 7257befb: am 0323f8a6: am 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. automerge: 581d03b 
* commit '7257befb6b59484ebf630829f0e925c34345677b':
 2014-11-03 21:07:56 +00: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
Deepanshu Gupta
1b406f54ab am 6f7fd0ba: am 3eff8312: am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af 
* commit '6f7fd0ba50ad15788a1378eb62ec7d8a78983051':
 2014-11-03 20:58:33 +00:00
Joe Fernandez
1705bdd70e am f32a7bc2: am 1daece6f: am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge: 37ec657 
* commit 'f32a7bc25f20cadb81702a8766807b1f407522a5':
 2014-11-03 20:58:22 +00:00
Deepanshu Gupta
517cd8a4d6 am a900a0f1: am dabb6c05: am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9 -s ours 
* commit 'a900a0f1cedfc74fc775afc1b6e733ded96b6259':
 2014-11-03 20:58:17 +00:00
Rich Slogar
8b2b1aac21 am 09e2f41a: am 10e749a5: am 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs automerge: 9779c90 
* commit '09e2f41a0a972a0b7ef63253410fc21f2d268b00':
 2014-11-03 20:58: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
Joe Fernandez
f32a7bc25f am 1daece6f: am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge: 37ec657 
* commit '1daece6f4aaf679dbbe5ba4fd54d399e96ff4639':
 2014-11-03 20:51:37 +00:00
Deepanshu Gupta
a900a0f1ce am dabb6c05: am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9 -s ours 
* commit 'dabb6c0596a06cd9427070a4202f733db3e13a9d':
 2014-11-03 20:51:33 +00:00
Quddus Chong
11c53cecf8 am 3dc6b6ab: am b9120e4c: am 03f627c4: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs automerge: dfb86b9 
* commit '3dc6b6abc1a159b38bd51897b0e3d52afe57edfb':
 2014-11-03 20:51:32 +00:00
Rich Slogar
09e2f41a0a am 10e749a5: am 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs automerge: 9779c90 
* commit '10e749a5730db65ceb656627c72583fec44ab0f7':
 2014-11-03 20:51:29 +00:00
Quddus Chong
0aebb24ae8 am 5f7c43a0: am 7045d963: am bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs automerge: 9566bd2 
* commit '5f7c43a094ddf9de685f4e318872e09da9d50a6a':
 2014-11-03 20:51:26 +00:00
Ricardo Cervera
d53e32205c am aace9d17: am 5ef2d855: am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680 
* commit 'aace9d175a68288bac123482281ec61ba73f95b0':
 2014-11-03 20:51:20 +00:00
Ricardo Cervera
1a5a1ff499 am b2c0394d: am ea4f3e79: am d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs automerge: a6abe30 
* commit 'b2c0394dc666e8d3c5e45a8d40829b58cce51f7a':
 2014-11-03 20:51:15 +00:00
Joe Fernandez
7d35425b98 am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
automerge: a9d803e

* commit 'a9d803e0f7efe4c899ea37a50653452edb6d77fd':
 2014-11-03 20:50:40 +00:00
Dirk Dougherty
e1970f1258 Doc change: Tv doc updates for publishing in Google Play. 
cherry-picked from Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888

Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888
 2014-11-03 20:48:23 +00:00
Fred Fettinger
b33ca4f38c am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
automerge: 7565da1  -s ours

* commit '7565da1f38f9bd1aad1749aa829b54fe2df223b6':
 2014-11-03 20:47:38 +00:00
Deepanshu Gupta
3eff8312c9 am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af 
* commit 'ac875484041183a299a36534cbb5a5574f4f93e1':
 2014-11-03 20:47:37 +00:00
Joe Fernandez
1daece6f4a am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge: 37ec657 
* commit '9e22cd6fd10983cdd4a84e5a2143cb8ed49e084d':
 2014-11-03 20:47:33 +00:00