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

120228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
8e63696a73 am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'f7bffe7707f31da920a8ff08d013934562e9a43d':
  Doc Update: notification bug fix.
 2014-04-04 21:31:28 +00:00
Katie McCormick
f7bffe7707 am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'fc8ea92df15689d51079212d7d012756ce9298d2':
  Doc Update: notification bug fix.
 2014-04-04 21:17:29 +00:00
Katie McCormick
fc8ea92df1 Merge "Doc Update: notification bug fix." into klp-docs 2014-04-04 21:12:16 +00:00
Katie McCormick
507c9fd016 Doc Update: notification bug fix. 
Fixes:

b/13429906

Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
 2014-04-04 14:07:35 -07:00
John Spurlock
5c31e487c4 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 2014-04-04 19:24:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier. 
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
 2014-04-04 15:21:53 -04:00
Ricardo Cervera
d10b654315 am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit '5df825237afd016c48dd3577d839825e5161d3e7':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:42:44 +00:00
Ricardo Cervera
5df825237a am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit 'ff3d89c08cd69c506ea07fb30a58f88e188b2dd9':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:38:59 +00:00
Ricardo Cervera
ff3d89c08c Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 2014-04-04 17:32:57 +00:00
Ricardo Cervera
c31bd52df2 am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 
* commit 'a821af684e2a5f814fc8709518b5f0589c81661e':
  docs: Fixed action bar example. Bug: 13806963
 2014-04-04 17:32:42 +00:00
Ricardo Cervera
a821af684e am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 
* commit '715139a620383c89e061a2b0650e184bf3382a10':
  docs: Fixed action bar example. Bug: 13806963
 2014-04-04 17:29:00 +00:00
Ricardo Cervera
90a5f9851a docs: Added permissions note for Context.getFilesDir. Bug: 13716053 
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
 2014-04-04 10:26:05 -07:00
Ricardo Cervera
715139a620 Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 2014-04-04 17:23:09 +00:00
Ricardo Cervera
13d49e9f36 am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 
* commit 'e2bdd6ae33640430fc4a0d58c263d5af94fdee77':
  docs: Updated the link to buy a Nexus phone. Bug: 13671312
 2014-04-04 17:01:35 +00:00
Ricardo Cervera
e2bdd6ae33 am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 
* commit '6ae21ea7fb37c76429a48a41987c9c0e2c067c31':
  docs: Updated the link to buy a Nexus phone. Bug: 13671312
 2014-04-04 16:55:02 +00:00
Ricardo Cervera
6ae21ea7fb Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 2014-04-04 16:51:20 +00:00
Ricardo Cervera
7f427b45bd docs: Fixed action bar example. Bug: 13806963 
Change-Id: I27dd1b80cf13eb3d47f48992db535de5a62bcde9
 2014-04-04 09:46:11 -07:00
Ricardo Cervera
8866eb8155 am c23ab90c: am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
* commit 'c23ab90c80c76c0f5249190ff26dac1fa5992d3b':
  docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
 2014-04-04 16:30:02 +00:00
Ricardo Cervera
c23ab90c80 am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
* commit '07aac5e346c3fed31254e34d386c6236f1ac3f22':
  docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
 2014-04-04 16:25:45 +00:00
Baligh Uddin
87210ee962 am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b285604185de1ade346eadb78971712607f54058':
  Import translations. DO NOT MERGE
 2014-04-04 14:30:55 +00:00
Baligh Uddin
ab0c43a458 am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '15fdce9d65b47e2b92bcac78776cc01486cff61a':
  Import translations. DO NOT MERGE
 2014-04-04 14:30:52 +00:00
Baligh Uddin
b285604185 am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '81e62eb1e576388866779e6f29d71614892dcf8a':
  Import translations. DO NOT MERGE
 2014-04-04 14:28:01 +00:00
Baligh Uddin
15fdce9d65 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-04-04 14:25:47 +00:00
Baligh Uddin
81e62eb1e5 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-04-04 14:22:51 +00:00
Deepanshu Gupta
53ccdf1894 am ef5caff8: am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ef5caff8b53f3b8ce85277824f14936047bc11d5':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:21:45 +00:00
Deepanshu Gupta
5f9887e6f1 am e18ae130: am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'e18ae1303c070759bce117b969186f699baa8564':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:21:42 +00:00
Deepanshu Gupta
3e4aebdbfc am eca9620e: am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'eca9620e331d72afa933252dc7adb1ae3ed4d692':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:21:39 +00:00
Deepanshu Gupta
2deb31ffbe am f1973ae2: am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'f1973ae2107b2202cc7a2436ef1cf941cbfd9ff6':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:21:35 +00:00
Deepanshu Gupta
6acadebe8b am 74ad989d: am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '74ad989de6e5d62791edf15ebdbe45194cba3530':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:21:32 +00:00
Deepanshu Gupta
a53466479c am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '14dee803f8a3b532e86613bb18d5cb572d113df9':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:21:29 +00:00
Deepanshu Gupta
ef5caff8b5 am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c0086ba57f3bba1f9139baf72ed38f79f3e4ac02':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:14:12 +00:00
Deepanshu Gupta
e18ae1303c am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '0bb7ec7ef9523a8e87878251ae0a0502b66e3706':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:14:10 +00:00
Deepanshu Gupta
eca9620e33 am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '0c44762ffee58dbcd526ad173934e3ff48fb9ff9':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:14:07 +00:00
Deepanshu Gupta
f1973ae210 am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'a1cca5cb0b7ad982983aebac980c4a44827e7eb3':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:14:04 +00:00
Deepanshu Gupta
74ad989de6 am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '77596103b82939887901b04c9a46fab746ad63a7':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:14:01 +00:00
Deepanshu Gupta
14dee803f8 am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c7fdfe6b67d81a62d79912780b585673043148ab':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:13:59 +00:00
Deepanshu Gupta
c0086ba57f am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit '9bcfee1d3ebe9704937e6935ffe7eabd46ebbf08':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:07:45 +00:00
Deepanshu Gupta
0bb7ec7ef9 am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'd8b890da785e386f08e0a3cf6b7094a23af3c8f2':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:07:42 +00:00
Deepanshu Gupta
0c44762ffe am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '8152502e93edfe2f50d678d6860d3c7d1a8b4865':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:07:39 +00:00
Deepanshu Gupta
a1cca5cb0b am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '29b4986ecce1592bd2fe62024bb187dded33c0af':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:07:36 +00:00
Deepanshu Gupta
77596103b8 am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ce393373b73e1a1f30ce9bb41568d415cab7df49':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:07:32 +00:00
Deepanshu Gupta
c7fdfe6b67 am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '99939cce702b6b5a01be351f1a0b406a16509103':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:07:28 +00:00
Deepanshu Gupta
9bcfee1d3e am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit '30e59135b11d196cac2edd97d1ccca3471f3e398':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:01:58 +00:00
Deepanshu Gupta
d8b890da78 am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'af60289e692b6b598d550371cc6e41e0b40dd6cd':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:01:55 +00:00
Deepanshu Gupta
8152502e93 am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '07d5f94e6b8a6d3f9caca057830e5cbd4cfa7dac':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:01:51 +00:00
Deepanshu Gupta
29b4986ecc am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '5c77c126b258924961a4a9c784177b4bcd403dd0':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:01:48 +00:00
Deepanshu Gupta
ce393373b7 am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ef9f3043f5259fa55376a1522152779295e15da6':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:01:45 +00:00
Deepanshu Gupta
99939cce70 am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '6094daa2626e57c6bd24409f0934090581541e49':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:01:42 +00:00
Deepanshu Gupta
30e59135b1 am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c07a48bed2c772dc548423396b208331b22a679a':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 01:54:13 +00:00
Deepanshu Gupta
af60289e69 am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '70dfe865013f0c8fedf2c9468360a41b02fcce0a':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 01:54:10 +00:00