Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ecd9daab20 am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours 
* commit 'aa816de4e061ae5a70c759a1c6e55d111c636b6d':
  Import translations. DO NOT MERGE
 2014-11-04 00:56:16 +00:00
Deepanshu Gupta
0a2e42d4af Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev 
automerge: 9b64954

* commit '9b64954cb5b30b03abaae0b24132e1b1876f8af1':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 00:51:51 +00:00
Nancy Chen
f950301945 Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 2014-11-04 00:51:29 +00:00
Deepanshu Gupta
33996b9878 Merge "Support framework menus in ActionBar" into lmp-dev 
automerge: c23487a

* commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9':
  Support framework menus in ActionBar
 2014-11-04 00:50:48 +00:00
Deepanshu Gupta
cd5f3bab37 Merge "Use the right layout for inflating Action Bar." into lmp-dev 
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
  Use the right layout for inflating Action Bar.
 2014-11-04 00:49:43 +00:00
Baligh Uddin
aa816de4e0 Import translations. DO NOT MERGE 
automerge: 07dd521  -s ours

* commit '07dd52188ccafac3cec01122b132666f2bd8e32e':
  Import translations. DO NOT MERGE
 2014-11-04 00:48:44 +00:00
Dianne Hackborn
d1f1ea76e8 Merge "Few more small meminfo improvements." into lmp-mr1-dev 2014-11-04 00:41:54 +00:00
Rob Tsuk
b7c26562d0 Make points drawn with default paint visible 
When no stroke width is set, use 0.5 instead of 0.25 to make
sure the resulting rectangle spans at least one pixel.

Bug: 15455111
Change-Id: Id0a4b6d014c542ffc98b13a032f88ae0ce69b3a1
 2014-11-04 00:31:45 +00:00
Bryce Lee
99a6c1cbe8 Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev 
automerge: abf33e4

* commit 'abf33e48baff1ffc14562a499ec3eabc09a5dbb5':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
 2014-11-04 00:23:50 +00:00
Jeff Tinker
1b51c72e91 Add missing secure stop methods 
b/18053197
b/18076411

Change-Id: Ide9ecab2fd2021f3544491f23ae84c394c48ac14
 2014-11-03 16:22:04 -08:00
Dirk Dougherty
73e558664d am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. 
automerge: 45729a1

* commit '45729a10495ed828749a706066b69051512bf4f0':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-04 00:21:53 +00:00
John Spurlock
2d695813b4 QS: New rotation-lock tile icon, using AVDs. 
Also:
 - Better icon change detection, unify tile.icon vs tile.iconId.
 - Fix regression in touch feedback by fixing a11y string calculation.

Bug: 17426910
Change-Id: I14772f4e9b3be127bc39106ae9146ed46488fa48
 2014-11-03 19:08:39 -05:00
David Friedman
a827de4e8b Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 2014-11-04 00:05:52 +00:00
Jorim Jaggi
7fd12db350 Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc 
automerge: 61059fe

* commit '61059fe82ca43adcd34ab8f48201a8925dcec164':
  Only hide sensitive content when Keyguard is showing
 2014-11-04 00:05:04 +00:00
Luan Nguyen
9a4dc72b35 am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 automerge: c85ccdf 
automerge: 343baef

* commit '343baef7a50c5cdafeeab6b22cd8a888d5cef29c':
 2014-11-04 00:03:06 +00:00
Joe Fernandez
b070a7cf2f am f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a automerge: 583b2cc 
automerge: efbc7f3

* commit 'efbc7f33e47d6c87dbdffbd335c32df42b2190e2':
 2014-11-04 00:02:07 +00:00
Natalie Masse
f208d803a4 am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 automerge: f978dac 
automerge: f6ca1a6

* commit 'f6ca1a616cbdf7cc197bb263592dc7eb8e0ed680':
 2014-11-04 00:01:04 +00:00
Scott Rowe
f93197389f am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd automerge: d584dbe 
automerge: cca9f67

* commit 'cca9f67c24ca63b487ce91a858423e39fd2c8150':
 2014-11-03 23:59:56 +00:00
Joe Fernandez
995c1e0ea4 am 9586eacf: am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575 
automerge: a1ce8ca

* commit 'a1ce8ca70172529fbb7dbbdd591865a4396121cd':
 2014-11-03 23:58:10 +00:00
Prashant Malani
b507d8dee1 am eaf585a1: am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours 
automerge: 9ffa931  -s ours

* commit '9ffa931ad9a3e9c7c1bfbab539561abbd64ed177':
 2014-11-03 23:57:07 +00:00
Ricardo Cervera
cd8bff2369 am c96d62a6: am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473 
automerge: e3835c1

* commit 'e3835c143c18581e18362f7be4fd0729f3d4515b':
 2014-11-03 23:56:00 +00:00
Adam Lesinski
de7de47fef Add error checking to aapt for split generation 
Change-Id: Ica627db6a671f6a6c35f98bfd9c03598ffe103ce
 2014-11-03 15:55:44 -08:00
Luan Nguyen
768e068bbf am 4e4a1ed3: am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367 
automerge: d3b5483

* commit 'd3b5483df203986fc896725ee208e029ef3700ca':
 2014-11-03 23:54:56 +00:00
smain@google.com
cbc3b3db1a am c360ec9b: am afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb 
automerge: 5dbac8e

* commit '5dbac8e720e7a4227c7018f4fe5a69b717f72ce9':
 2014-11-03 23:53:23 +00:00
smain@google.com
6757cc5543 am ec3eb1c7: am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8 
automerge: 21fdc41

* commit '21fdc416aef371975a656b8f8e7902535895b83d':
 2014-11-03 23:52:19 +00:00
Ricardo Cervera-Navarro
4a1fb17845 am dc489b6c: 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 
automerge: 6bda7d2

* commit '6bda7d250e086dbfe829248d2359c564a0871d98':
 2014-11-03 23:51:11 +00:00
Rich Slogar
d55f47318f am 4a6b69c5: am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b 
automerge: 6b54651

* commit '6b54651c245bd54c3889aa539c20b3c2ea30f10a':
 2014-11-03 23:50:03 +00:00
Eric Gilmore
921ceb2eaa am f38b98f3: am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36 
automerge: ee870df

* commit 'ee870df81593774a76d5618fecbccb8a3299dd2b':
 2014-11-03 23:48:43 +00:00
Adam Lesinski
f7ffcaa7a4 Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 2014-11-03 23:38:56 +00:00
Adam Lesinski
668f0a356c Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 2014-11-03 23:38:43 +00:00
Jorim Jaggi
61059fe82c Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev 
automerge: 3c7efdc

* commit '3c7efdc00506e6561ca08933f0b2acf5e3f16b02':
  Only hide sensitive content when Keyguard is showing
 2014-11-03 23:27:18 +00:00
Joe Fernandez
c0998b7b01 am 21c57b29: am d6d0be4f: am 194d2026: am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e 
automerge: 8b495ac

* commit '8b495acf4a5d049ccd3ecdd8607a12158c5d02e7':
 2014-11-03 23:15:17 +00:00
Deepanshu Gupta
9b64954cb5 Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev 2014-11-03 23:15:03 +00:00
Deepanshu Gupta
c23487aa18 Merge "Support framework menus in ActionBar" into lmp-dev 2014-11-03 23:14:46 +00:00
Fred Fettinger
3ff39c15ad am 1d538214: am 369aafb6: am eeeebfff: am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1 -s ours 
automerge: 0ce56ec  -s ours

* commit '0ce56ec4ccb830bbe5d815a6b80161bf163bf04f':
 2014-11-03 23:14:08 +00:00
Deepanshu Gupta
84a89ed0f5 Merge "Use the right layout for inflating Action Bar." into lmp-dev 2014-11-03 23:13:15 +00:00
smain@google.com
00139ebc83 am 93a4b93d: am a2216f74: am 16bc5859: am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02 
automerge: 226b432

* commit '226b432b29323989d2c51cbc0868755fa53b68bf':
 2014-11-03 23:11:37 +00:00
Quddus Chong
cfeeb5b978 am 2ffdd5b9: am 7257befb: am 0323f8a6: am 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. automerge: 581d03b 
automerge: deb33b9

* commit 'deb33b9e5df1571edce547f1d6d087c21bc3f677':
 2014-11-03 23:10:22 +00:00
Deepanshu Gupta
7c9701d1dc am 1b406f54: am 6f7fd0ba: am 3eff8312: am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af 
automerge: bf41982

* commit 'bf419829d7758bdd9638b3e74f7de1bc550b9ba2':
 2014-11-03 23:07:18 +00:00
Joe Fernandez
328e2c4f40 am 1705bdd7: am f32a7bc2: am 1daece6f: am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge: 37ec657 
automerge: 10177a7

* commit '10177a71f5ba7704e6f1176af649ae3bae05aa45':
 2014-11-03 23:06:12 +00:00
Deepanshu Gupta
7d7b382c13 am 517cd8a4: am a900a0f1: am dabb6c05: am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9 -s ours 
automerge: aa55874  -s ours

* commit 'aa558740b33cab49073d9c1a2bdca9f98129988d':
 2014-11-03 23:05:08 +00:00
Rich Slogar
ea745ee0a1 am 8b2b1aac: am 09e2f41a: am 10e749a5: am 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs automerge: 9779c90 
automerge: 3a74e20

* commit '3a74e2072ec7e3056581774eff3a7575ce8f58dc':
 2014-11-03 23:04:08 +00:00
Quddus Chong
151eab0bf0 am 11c53cec: 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 
automerge: 4eff1e0

* commit '4eff1e0cdd9722964802e92fe3091dd8b616edca':
 2014-11-03 23:01:58 +00:00
Quddus Chong
3d88488b61 am 0aebb24a: 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 
automerge: 497a969

* commit '497a969dc6153e7c54a79357f3b6ad83d53cb07c':
 2014-11-03 23:00:50 +00:00
Ricardo Cervera
a1eab38f1c am d53e3220: am aace9d17: am 5ef2d855: am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680 
automerge: 8abf851

* commit '8abf85127c19c879b045f4a52f37896052141b0f':
 2014-11-03 22:59:45 +00:00
Ricardo Cervera
6a58bc49ec am 1a5a1ff4: 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 
automerge: b85803d

* commit 'b85803d075874096238402d4a318c9f150ed1617':
 2014-11-03 22:58:42 +00:00
Quddus Chong
c63f2a52e5 am 1403f44b: am ff5d2e2d: am 92cfa5d0: am c9c18671: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs automerge: 
automerge: 7731a84

* commit '7731a84d928661fd143d42db2c74cd9c269d7014':
 2014-11-03 22:53:48 +00:00
Ricardo Cervera
57240179af am 5e17f086: am a4877f30: am 5063cf9a: am d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs automerge: 2166913 
automerge: 0993686

* commit '09936861d0955097e9833c0b15f2aad458d70f14':
 2014-11-03 22:52:45 +00:00
Rich Slogar
8caa6f67dd am e6e140ab: am 3aa8271a: am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
automerge: 129ace2

* commit '129ace2ffac49070ee7a38511716b7f49a6d78da':
 2014-11-03 22:51:33 +00:00
smain@google.com
6d4191f9b5 am 07d46a38: am 7c2f87ec: am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b 
automerge: 2e966db

* commit '2e966db50859e9d243f2815624efa83d224c812f':
 2014-11-03 22:50:25 +00:00