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

127228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
1ac6519b24 am c31bd52d: am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 
* commit 'c31bd52df22dabf52b50e1377878548607d1f07b':
  docs: Fixed action bar example. Bug: 13806963
 2014-04-04 17:39:39 +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
Winson Chung
b7341e222d Merge "Fixing error in calculating translation animation." 2014-04-04 17:38:01 +00:00
Winson Chung
00350bb3a0 Fixing error in calculating translation animation. 
Change-Id: Idd029051619f152a59653e8fb445d028f5e8672e
 2014-04-04 10:37:18 -07: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
Winson Chung
e8cfc94ef6 Merge "Fixing crash when filtering tasks too quickly." 2014-04-04 17:22:07 +00:00
Winson Chung
2f2ca08baa Fixing crash when filtering tasks too quickly. 
- Using a translation-based animation duration scheme
- Fixing issue where filtering a task could slide it out of view

Change-Id: Id434b4a98aa671d84d047dad18cbe26f543cdf25
 2014-04-04 10:18:24 -07:00
Ricardo Cervera
ce16215d7b am c6d4a464: am 13d49e9f: am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 
* commit 'c6d4a4647074e7d9f4882e54637567103108c0e3':
  docs: Updated the link to buy a Nexus phone. Bug: 13671312
 2014-04-04 17:14:16 +00:00
Adam Powell
e43340c80d android.widget.Toolbar 
Add the new Toolbar widget for use in app layouts.

ActionBar can now be used as a point of control for either a
traditional window decor action bar or for a Toolbar that appears
inline in an Activity's layout.

ToolbarActionBar is currently WIP.

Change-Id: I0da093e5645840f4fd032aa34efa0ae5f1825ff2
 2014-04-04 10:08:17 -07:00
Adam Powell
fc35dfd513 Deprecate ActionBar navigation modes 
Navigation modes were a great shortcut for patterns that are no longer
recommended or that don't integrate as nicely with application
content. Apps have done a great job both inventing new navigation
patterns that work well in their own contexts or following patterns
that can be implemented inline with an app's content. Navigation modes
as a prescriptive construct are no longer needed.

Be free, apps!

Change-Id: I9ae1c2efc830c7dcb6664061bba68b1748928ae3
 2014-04-04 10:08:17 -07:00
Ricardo Cervera
c6d4a46470 am 13d49e9f: am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 
* commit '13d49e9f364965169f933bcad6bcaeeb2f29fade':
  docs: Updated the link to buy a Nexus phone. Bug: 13671312
 2014-04-04 17:07:43 +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
2d65aad4fb am 957428dc: am 8866eb81: am c23ab90c: am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
* commit '957428dcc55456077b28f2ff3190ec39844e6eee':
  docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
 2014-04-04 16:42:49 +00:00
Andres Morales
2517be5b72 Merge "Add calls for NFC WSC token creation" 2014-04-04 16:42:37 +00:00
Ricardo Cervera
957428dcc5 am 8866eb81: am c23ab90c: am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
* commit '8866eb8155a40559c4ee0927764aa4c32e9a9cd2':
  docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
 2014-04-04 16:36:32 +00: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
Glenn Kasten
b951af64eb Merge "Simplify and document AudioTrack gain" 2014-04-04 15:31:10 +00:00
Baligh Uddin
f1e27b586f am 69660170: (-s ours) am 87210ee9: (-s ours) am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '696601704ecfc23d9f8e4e184b2a78c049add6d7':
  Import translations. DO NOT MERGE
 2014-04-04 14:44:42 +00:00
Baligh Uddin
da1cef3603 am c71d89a8: (-s ours) am ab0c43a4: (-s ours) am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'c71d89a8268cdc445b1b07e9f5a97372f8593629':
  Import translations. DO NOT MERGE
 2014-04-04 14:44:39 +00:00
Adam Connors
d423986e68 Merge "Add android.software.managedprofiles feature flag." 2014-04-04 14:40:20 +00:00
Baligh Uddin
696601704e am 87210ee9: (-s ours) am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '87210ee9621829786516f52fc45dfeabd5daec0a':
  Import translations. DO NOT MERGE
 2014-04-04 14:37:25 +00:00
Baligh Uddin
c71d89a826 am ab0c43a4: (-s ours) am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'ab0c43a4581d5b34ea9590cad4495447aa536942':
  Import translations. DO NOT MERGE
 2014-04-04 14:37:23 +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
e4c3dfa7b6 Merge "Import translations. DO NOT MERGE" 2014-04-04 14:25:46 +00:00
Baligh Uddin
5edca2bbd2 Merge "Import translations. DO NOT MERGE" 2014-04-04 14:23:01 +00:00
Baligh Uddin
e1301a5424 Merge "Import translations. DO NOT MERGE" 2014-04-04 14:22:54 +00:00
Baligh Uddin
81e62eb1e5 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-04-04 14:22:51 +00:00
Paul Lawrence
f17f0e0eb0 Merge "Save OwnerInfo so CryptKeeper can display at boot time" 2014-04-04 14:05:56 +00:00
Deepanshu Gupta
a867e1dec8 am e0628134: (-s ours) am 53ccdf18: 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 'e0628134ab8c5f997d43cc6d8ed79fdea5e815f6':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 03:20:01 +00:00
Deepanshu Gupta
0750f2baa2 am 37f28f22: (-s ours) am 5f9887e6: 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 '37f28f22e2c2816c63ccd316432f768401177f9e':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 03:19:57 +00:00
Deepanshu Gupta
931f8e69bf am adcd4ee2: (-s ours) am 3e4aebdb: 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 'adcd4ee2e42b126d66cc793dcd6e44e049156e30':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 03:19:54 +00:00
Deepanshu Gupta
1038247ad4 am 8b38cd7f: (-s ours) am 2deb31ff: 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 '8b38cd7ff63bcd38266b4fdb26ca993e3090b5dd':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 03:19:51 +00:00
Deepanshu Gupta
ee88c5910a am f3603fe9: (-s ours) am 6acadebe: am 74ad989d: am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit 'f3603fe93a6a3b2002384415fbd555dd3cd2e538':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 03:19:48 +00:00
Deepanshu Gupta
4ed280d351 am c6ef5428: (-s ours) am a5346647: 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 'c6ef5428cf3ced10645f5bab7bc3b99ba5ec191a':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 03:19:45 +00:00
Maxim Siniavine
962e12883b DownloadManager test will wait until certain progress, is made 
during download before moving to next stage of the test.

Increase the timeout for waiting for download to complete.

Change-Id: I61820a9525256f4f2e16571e1ac075d2f5268cae
 2014-04-03 19:46:51 -07:00
Deepanshu Gupta
e0628134ab am 53ccdf18: 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 '53ccdf1894f64ea53e2dd57477c783c82b81e537':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:26:40 +00:00
Deepanshu Gupta
37f28f22e2 am 5f9887e6: 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 '5f9887e6f1587dd9e761574727ca420f7d033cc4':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:26:38 +00:00
Deepanshu Gupta
adcd4ee2e4 am 3e4aebdb: 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 '3e4aebdbfcb4290e2c0afe7d0473516c52c96e85':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:26:35 +00:00
Deepanshu Gupta
8b38cd7ff6 am 2deb31ff: 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 '2deb31ffbe4ce6fc3552f35847b2e02a0d938f1e':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:26:33 +00:00