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

104753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
c1dedb6fc4 Merge "Prepare WindowManager for multiple stacks." 2013-04-12 22:41:36 +00:00
Craig Mautner
9903d8bf78 Merge "Separate stacks into Home and others." 2013-04-12 22:40:35 +00:00
Amith Yamasani
8c176b2513 am b0511d47: am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 
* commit 'b0511d47eb15f4f7941d278467964f2cd6dd2871':
  Rename isUserRestricted to isUserLimited
 2013-04-12 15:39:15 -07:00
Amith Yamasani
b0511d47eb am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 
* commit 'e107aa43866ce06cd08a7a3f2500a22bf81bbe79':
  Rename isUserRestricted to isUserLimited
 2013-04-12 15:36:22 -07:00
Amith Yamasani
e107aa4386 Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 2013-04-12 22:33:05 +00:00
Chet Haase
1d9648df51 am d04215c4: am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 
* commit 'd04215c440e7b7f4bbfe8aaa9a47ccdf3a8dacf5':
  API and doc cleanup, plus small animation/UI features
 2013-04-12 15:26:55 -07:00
Chet Haase
d04215c440 am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 
* commit '0a41431d697a34e7fe4ed2c481484d7a63949037':
  API and doc cleanup, plus small animation/UI features
 2013-04-12 15:23:22 -07:00
Kenny Root
2eeda7286f AndroidKeyStore: Add encrypted flag 
Add the encrypted flag for the KeyPairGenerator and the KeyStore so that
applications can choose to allow entries when there is no lockscreen.

Bug: 8122243
Change-Id: Ia802afe965f2377ad3f282dab8c512388c705850
 2013-04-12 15:19:48 -07:00
Chet Haase
0a41431d69 Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 2013-04-12 22:18:24 +00:00
Amith Yamasani
46bc4ebb87 Rename isUserRestricted to isUserLimited 
Avoid confusion with user restrictions which can be applied to
non-limited users as well.

Updated the java docs.

Change-Id: I4097c50b528b01a49cebcb0832d09f2b06998faa
 2013-04-12 15:13:53 -07:00
Scott Main
c689ba3bdc am e4a92e3a: am faaaa223: am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit 'e4a92e3a92593e53154143c1be539157dd4ad57a':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 15:07:06 -07:00
Scott Main
e4a92e3a92 am faaaa223: am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit 'faaaa223996308f1d666e3d9c8bfaa7e17eca4fe':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 15:01:30 -07:00
Scott Main
faaaa22399 am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit '27248105a17eb64564cb904d6c9019afbfc5ac0f':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 14:57:34 -07:00
Scott Main
27248105a1 am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit '044d08b0f10ca3a9e45c35bd6638763915c1f253':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 14:54:27 -07:00
Dianne Hackborn
f7be4800df Add new resources trace, also trace apk dex loading. 
Change-Id: Ia48566efb21ee018659bd976ddb3a0f4997b9a3a
 2013-04-12 14:53:10 -07:00
Scott Main
044d08b0f1 am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit '7d62462bacc4235d4e99dfe7a75783a70688537d':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 14:50:15 -07:00
Scott Main
7d62462bac am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit '8ab0f12f5ea44f5eb0f7c0cb6f05c289c33774d3':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 14:48:13 -07:00
Scott Main
8ab0f12f5e am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit '64d51032cc1f20ae496ba49ca975e822dea02b7c':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 14:46:19 -07:00
Robert Greenwalt
28c0ef9fe7 am b06cc749: am e203384f: Merge "Disconnect from AP when teardown requested." into jb-mr2-dev 
* commit 'b06cc749ae463a37701601092ad468a4faaf634b':
  Disconnect from AP when teardown requested.
 2013-04-12 14:18:12 -07:00
Kristian Monsen
6c3ec1cf99 am 82b6de03: am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 
* commit '82b6de03cf2d3a66881cc3664dfdcf80c885c226':
  Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.
 2013-04-12 14:14:30 -07:00
Robert Greenwalt
b06cc749ae am e203384f: Merge "Disconnect from AP when teardown requested." into jb-mr2-dev 
* commit 'e203384f1627f27c81ff72426498927fb9d80698':
  Disconnect from AP when teardown requested.
 2013-04-12 14:14:20 -07:00
Robert Greenwalt
e203384f16 Merge "Disconnect from AP when teardown requested." into jb-mr2-dev 2013-04-12 21:10:53 +00:00
Kristian Monsen
82b6de03cf am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 
* commit '03499a23f9d84fab95a7383b50cc7f87a974e4a8':
  Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.
 2013-04-12 14:10:48 -07:00
Kristian Monsen
03499a23f9 Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 2013-04-12 21:05:15 +00:00
Romain Guy
f5539cb30c am a583a5ac: am dec4bb9e: Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev 
* commit 'a583a5ac7fcf5b1478297e20b2cd34872f0e18e9':
  Trace ValueAnimator based animations in systrace
 2013-04-12 14:04:10 -07:00
Romain Guy
190a0f24db am a378bab7: am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev 
* commit 'a378bab7a7ea4f748c72b0d14acbdf9359dbebfb':
  Add async events tracing to android.os.Trace
 2013-04-12 14:04:07 -07:00
Romain Guy
a583a5ac7f am dec4bb9e: Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev 
* commit 'dec4bb9e4b5a46b179a6aa3e90f9d9240d9c99cb':
  Trace ValueAnimator based animations in systrace
 2013-04-12 14:00:34 -07:00
Romain Guy
a378bab7a7 am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev 
* commit '50b68bf8364fd728553cb8066ece8f7905885625':
  Add async events tracing to android.os.Trace
 2013-04-12 14:00:31 -07:00
Scott Main
64d51032cc moar doc tags for search suggestions (Design docs) 
Change-Id: I842bc00f7ede23b1bebe4bf2e54ba32d026cf04c
 2013-04-12 14:00:30 -07:00
Romain Guy
dec4bb9e4b Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev 2013-04-12 20:58:36 +00:00
Romain Guy
50b68bf836 Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev 2013-04-12 20:58:00 +00:00
Chet Haase
430742f090 API and doc cleanup, plus small animation/UI features 
Adding features which round out the animation APIs (missing
getters, etc.). Also fix doc typos.

Issue #8350510 Add APIs needed for future animation capabilities

Change-Id: I063736848ba26e6d6c809b15fc3a103c74222f46
 2013-04-12 13:44:22 -07:00
Emily Bernier
d65b268fcd am 9b8abb5a: am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 
* commit '9b8abb5abde4264b6ed4e022804c743faf68323d':
  Add user restrictions (credentials, user removal)
 2013-04-12 13:29:35 -07:00
Emily Bernier
9b8abb5abd am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 
* commit 'ce70311b67c3dba6ed4fbda41617f4e24c82dfc7':
  Add user restrictions (credentials, user removal)
 2013-04-12 13:25:58 -07:00
Scott Main
8649660244 am 246ad407: am e527d256: am 4a88777e: am 2ad00035: am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs 
* commit '246ad407808b801f4bccba10ecdf6734d0da855d':
  exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
 2013-04-12 13:22:39 -07:00
Scott Main
4131a1c5d3 am 8fe62204: am d8b52ee6: am 8a18006e: am e54d44b3: am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 
* commit '8fe622044ff1afaa1113f449ffd17cb38907bc3f':
  add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
 2013-04-12 13:22:36 -07:00
Emily Bernier
ce70311b67 Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 2013-04-12 20:21:36 +00:00
Scott Main
246ad40780 am e527d256: am 4a88777e: am 2ad00035: am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs 
* commit 'e527d256dcf1df96da4cb8a2c144a02748bbf96d':
  exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
 2013-04-12 13:19:04 -07:00
Scott Main
8fe622044f am d8b52ee6: am 8a18006e: am e54d44b3: am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 
* commit 'd8b52ee675e4c951ca82bcdc5ac8f3f9f0cedac7':
  add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
 2013-04-12 13:19:01 -07:00
Raph Levien
c1f5756c23 am 1aa52487: am 6c072401: Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev 
* commit '1aa524878591dce809000e7263378138ccd6a25a':
  Fix for bug 8500202: Right-to-left text not showing in list view
 2013-04-12 13:15:37 -07:00
Scott Main
e527d256dc am 4a88777e: am 2ad00035: am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs 
* commit '4a88777e53ae26768255feeb49b46e2f7698d62e':
  exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
 2013-04-12 13:14:43 -07:00
Scott Main
d8b52ee675 am 8a18006e: am e54d44b3: am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 
* commit '8a18006e9de3901d1ee32eace9f37d638df27b1f':
  add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
 2013-04-12 13:14:39 -07:00
Tim Murray
d7fec6edad am f151a541: am d6b8a035: Merge "Add support for synchronous get()." into jb-mr2-dev 
* commit 'f151a5411eb6afd104daac10b3e43f5e3a60c61d':
  Add support for synchronous get().
 2013-04-12 13:11:45 -07:00
Raph Levien
1aa5248785 am 6c072401: Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev 
* commit '6c0724010f1a98e391827109c2c369b64197c449':
  Fix for bug 8500202: Right-to-left text not showing in list view
 2013-04-12 13:11:31 -07:00
Scott Main
4a88777e53 am 2ad00035: am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs 
* commit '2ad0003576dccedcfe5bff0af9bfbb6db97a2351':
  exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
 2013-04-12 13:11:30 -07:00
Scott Main
8a18006e9d am e54d44b3: am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 
* commit 'e54d44b35bc87bd8c44a3657f65c19754a5d5ae9':
  add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
 2013-04-12 13:11:26 -07:00
Raph Levien
6c0724010f Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev 2013-04-12 20:08:33 +00:00
Tim Murray
f151a5411e am d6b8a035: Merge "Add support for synchronous get()." into jb-mr2-dev 
* commit 'd6b8a035337e096f8d313b70f2178f4ec54ba2e4':
  Add support for synchronous get().
 2013-04-12 13:07:54 -07:00
Scott Main
2ad0003576 am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs 
* commit '6c79bc7ed1bea9013884907261cb1cd465c13741':
  exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
 2013-04-12 13:04:58 -07:00
Scott Main
e54d44b35b am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 
* commit 'ab23611c32a3887367b481cb023aa49c250eb0a3':
  add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
 2013-04-12 13:04:56 -07:00