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

172050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joe Fernandez
efa9f725e9 am 1c337a11: am 2cc032d5: am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
automerge: 554d4b1

* commit '554d4b123b27aabc9283dd92c122c3cf53b9670a':
  docs: Update Android Dashboard for November 2014
 2014-11-03 22:48:27 +00:00
Jim Miller
c02b02806f am ff25dd06: am 12b239e6: Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev 
automerge: a3a0cd7

* commit 'a3a0cd7f9014a7d6db51197c54ebadd2e3973ba2':
  Fix SetupWizard black screen issue for EDU devices
 2014-11-03 22:47:02 +00:00
Jorim Jaggi
3c7efdc005 Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev 2014-11-03 22:38:34 +00:00
Joe Fernandez
8b495acf4a am 21c57b29: am d6d0be4f: am 194d2026: am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e 
* commit '21c57b299a3c98b5f977539f624115504c536010':
 2014-11-03 22:35:48 +00:00
Fred Fettinger
0ce56ec4cc 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 
* commit '1d53821475d3e30e7c8a4f49596de5ab7c219d11':
 2014-11-03 22:35:43 +00:00
smain@google.com
226b432b29 am 93a4b93d: am a2216f74: am 16bc5859: am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02 
* commit '93a4b93d5f896ba4be8e2fb3405131762f8a6e41':
 2014-11-03 22:35:02 +00:00
Quddus Chong
deb33b9e5d 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 
* commit '2ffdd5b92afffddd35c6a8abf830a8f313920bbe':
 2014-11-03 22:34:57 +00:00
Deepanshu Gupta
bf419829d7 am 1b406f54: am 6f7fd0ba: am 3eff8312: am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af 
* commit '1b406f54ab24f5f5704cd37091b905c48aacab86':
 2014-11-03 22:34:21 +00:00
Joe Fernandez
10177a71f5 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 
* commit '1705bdd70e00a54d0b403961729114a8c9c85ccf':
 2014-11-03 22:34:15 +00:00
Deepanshu Gupta
aa558740b3 am 517cd8a4: am a900a0f1: am dabb6c05: am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9 -s ours 
* commit '517cd8a4d649e12b303975bbbcec8a59a088d155':
 2014-11-03 22:34:09 +00:00
Rich Slogar
3a74e2072e 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 
* commit '8b2b1aac213f3636beafef184d70c63eddf70ded':
 2014-11-03 22:34:03 +00:00
Quddus Chong
4eff1e0cdd 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 
* commit '11c53cecf854674e40c410001d03e4eff1943bf3':
 2014-11-03 22:33:46 +00:00
Quddus Chong
497a969dc6 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 
* commit '0aebb24ae8d420d1891008a24b6543d996aa1426':
 2014-11-03 22:33:40 +00:00
Ricardo Cervera
8abf85127c am d53e3220: am aace9d17: am 5ef2d855: am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680 
* commit 'd53e32205c6a27a39397654bf412b88197783a98':
 2014-11-03 22:33:33 +00:00
Ricardo Cervera
b85803d075 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 
* commit '1a5a1ff499896df09e0166b3c25c7b9a9695767e':
 2014-11-03 22:33:28 +00:00
Quddus Chong
7731a84d92 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: 
* commit '1403f44baa9428f6ed1c4122d276a08e846509a8':
 2014-11-03 22:32:40 +00:00
Ricardo Cervera
09936861d0 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 
* commit '5e17f0863590577c226d88a7b9bc5029b5598c6d':
 2014-11-03 22:32:16 +00:00
Rich Slogar
129ace2ffa am e6e140ab: am 3aa8271a: am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
* commit 'e6e140abfbc055291a8a945f3ae54aa38f971af5':
 2014-11-03 22:32:09 +00:00
smain@google.com
2e966db508 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 
* commit '07d46a3880172209fb9a82e9828ea13d93f47622':
 2014-11-03 22:32:03 +00:00
Joe Fernandez
554d4b123b am 1c337a11: am 2cc032d5: am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit '1c337a11d724a2e745423c2918d45aae501c607c':
  docs: Update Android Dashboard for November 2014
 2014-11-03 22:31:38 +00:00
Jim Miller
a3a0cd7f90 am ff25dd06: am 12b239e6: Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev 
* commit 'ff25dd06a3d8c0ba3bade95c67720612cfb04ef3':
  Fix SetupWizard black screen issue for EDU devices
 2014-11-03 22:31:31 +00:00
Scott Kennedy
a593fa94fe Fix a small typo in a variable name 
Change-Id: If431236bf6885b3b0ef2c967869320538222ee33
 2014-11-03 22:22:09 +00:00
Luan Nguyen
343baef7a5 am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 
automerge: c85ccdf

* commit 'c85ccdf307fcc8c826ac6d02f372f724b8984089':
 2014-11-03 22:11:54 +00:00
Joe Fernandez
efbc7f33e4 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

* commit '583b2cc0513da316ba9d192a4c03143b9e0429f8':
 2014-11-03 22:10:53 +00:00
Natalie Masse
f6ca1a616c am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 
automerge: f978dac

* commit 'f978dac8b7de06911a2da0f5a32fb20ac430443d':
 2014-11-03 22:09:47 +00:00
Scott Rowe
cca9f67c24 am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd 
automerge: d584dbe

* commit 'd584dbea672341a533dc0cfdfb5d05ffadcc67f5':
 2014-11-03 22:08:38 +00:00
Bryce Lee
abf33e48ba Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev 2014-11-03 21:59:27 +00:00
Dianne Hackborn
1842930762 Few more small meminfo improvements. 
- Add in category for graphics driver, and knowledge about it
  for N5 (more devices will be added later).
- Renaming the labels for the .oat and .art files to be just
  that, so it is clear what they are talking about.

Change-Id: I663ca8bd2febce41fcdde74b0d3a96ef9325edf1
 2014-11-03 13:58:11 -08:00
Baligh Uddin
07dd52188c Import translations. DO NOT MERGE 
Bug: 18218486
Change-Id: I929129a2c443e4db78e0ad4e78e653a7cd603855
Auto-generated-cl: translation import
 2014-11-03 21:58:01 +00:00
Joe Fernandez
a1ce8ca701 am 9586eacf: am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575 
* commit '9586eacf98de267d9caed9cb0f09f501c1ecf761':
 2014-11-03 21:24:07 +00:00
Prashant Malani
9ffa931ad9 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 
* commit 'eaf585a1bb7564891844eeee3e48ba60433487d1':
 2014-11-03 21:24:01 +00:00
Ricardo Cervera
e3835c143c am c96d62a6: am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473 
* commit 'c96d62a66a539d7fd66e84294b82637a22e4ef37':
 2014-11-03 21:23:56 +00:00
Luan Nguyen
d3b5483df2 am 4e4a1ed3: am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367 
* commit '4e4a1ed3380b51a1667516579825f2bf839036f0':
 2014-11-03 21:23:51 +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