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

104613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Tim Murray
d6b8a03533 Merge "Add support for synchronous get()." into jb-mr2-dev 2013-04-12 20:03:52 +00:00
Scott Main
6c79bc7ed1 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 'bfc4e4ebf65fff4a07a8b0a7d1fc56e58965f564':
  exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
 2013-04-12 13:02:56 -07:00
Scott Main
ab23611c32 am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 
* commit '816e905ac241529919e3cb1adde533429924b02f':
  add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
 2013-04-12 13:02:53 -07:00
Scott Main
bfc4e4ebf6 am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs 
* commit 'c9762f201bb511a1566f0054cedea0115da6dab8':
  exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
 2013-04-12 13:00:08 -07:00
Scott Main
816e905ac2 am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 
* commit '32bd549520fdb46842f2e8fff8365cf7c9ee83a7':
  add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
 2013-04-12 13:00:06 -07:00
Scott Main
c9762f201b Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs 2013-04-12 19:57:57 +00:00
Robert Greenwalt
720471f0fd am 2d28d622: am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev 
* commit '2d28d6229f8cb5e158998de421ee0a0d1ff865fe':
  Add new route.hasGateway() api
 2013-04-12 12:11:20 -07:00
Craig Mautner
ffe0c56c29 am 429664a5: am d5e7b8bf: Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev 
* commit '429664a52ab0d024757650a246297ae8224e60dc':
  Clear test rectangle if previous focus is null.
 2013-04-12 12:11:17 -07:00
Robert Greenwalt
2d28d6229f am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev 
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
  Add new route.hasGateway() api
 2013-04-12 12:07:14 -07:00
Craig Mautner
429664a52a am d5e7b8bf: Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev 
* commit 'd5e7b8bfb4381baa36feb241bc65d4681f664592':
  Clear test rectangle if previous focus is null.
 2013-04-12 12:07:11 -07:00
Robert Greenwalt
3016244ffb Merge "Add new route.hasGateway() api" into jb-mr2-dev 2013-04-12 19:02:24 +00:00
Craig Mautner
d5e7b8bfb4 Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev 2013-04-12 19:02:06 +00:00
Kenny Root
7415737326 am 12cff6f6: am 10a25c0a: Merge "Remove keystore entries when app data cleared" into jb-mr2-dev 
* commit '12cff6f6289cb6bb06b716e75e7776099343323a':
  Remove keystore entries when app data cleared
 2013-04-12 12:00:59 -07:00
Kenny Root
12cff6f628 am 10a25c0a: Merge "Remove keystore entries when app data cleared" into jb-mr2-dev 
* commit '10a25c0af785ee0daa735fc9a26571fb4c27399a':
  Remove keystore entries when app data cleared
 2013-04-12 11:56:53 -07:00
Kenny Root
10a25c0af7 Merge "Remove keystore entries when app data cleared" into jb-mr2-dev 2013-04-12 18:54:23 +00:00
Raph Levien
f5cf6c9d44 Fix for bug 8500202: Right-to-left text not showing in list view 
In single line mode, changing the text from LTR to RTL (or vice versa)
affects the alignment, which in turn means that bringTextIntoView is
needed to update the scrolling. A registerForPredraw should be done to
make this happen, but it was missing. This patch tests explicitly for
direction changes in this case, and schedules a predraw if so.

Change-Id: I16e0e23141c244dc8adc00ea8306dfe4c9bf487d
 2013-04-12 11:42:25 -07:00
Scott Main
32bd549520 add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478 
Change-Id: Ideacad7f2b7dd78f56faef93de1f4d5bc60db6a7
 2013-04-12 11:40:38 -07:00
Baligh Uddin
0d1ce86476 am 0cd2be7c: am 058835e3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '0cd2be7c176881732606f1d8d75604a715543c57':
  Import translations. DO NOT MERGE
 2013-04-12 11:23:04 -07:00
Robert Greenwalt
ca441ee2f0 Add new route.hasGateway() api 
Fixes issues brought in by change to isHostRoute.  isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.

bug:8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f
 2013-04-12 11:22:52 -07:00
Baligh Uddin
0cd2be7c17 am 058835e3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '058835e33d9b078d0a72d150f9483e8aa288e772':
  Import translations. DO NOT MERGE
 2013-04-12 11:20:28 -07:00
Scott Main
6be7162966 exclude IAB docs and various SDK docs from search suggestions 
Also delete several useless files

Change-Id: I1b17e4eca17e69169002fc617180beb2ac83f67a
 2013-04-12 11:19:39 -07:00
Baligh Uddin
5325278da7 Merge "Import translations. DO NOT MERGE" 2013-04-12 18:17:36 +00:00
Baligh Uddin
058835e33d Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-12 18:16:47 +00:00
Romain Guy
e48da96ab5 resolved conflicts for merge of 886e1204 to master 
Change-Id: Id002d2ae799c6946672335f122ecbfa07d9c0bc1
 2013-04-12 11:00:21 -07:00
Scott Main
28da13494b am 5a0c8a42: am 737a3611: am d6c7d6a7: am 8b3516e0: am 600d40a6: am 2545e285: am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs 
* commit '5a0c8a426e70efa9beb9669e28d94d96e2909c1e':
  add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
 2013-04-12 10:38:40 -07:00
Scott Main
e4a42cb639 am dc1ebec7: am 43d44621: am 8d53821d: am 46a1b362: am 657d7b8c: am 4f4d243d: am 64461bf4: doc tags for api guides and delete a useless file 
* commit 'dc1ebec7826cce6b4c1dba647e651bcb31c3d50f':
  doc tags for api guides and delete a useless file
 2013-04-12 10:38:34 -07:00