summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add API to retrieve cursor notification URI.Dianne Hackborn2013-05-155-4/+24
| | | | Change-Id: I89f6c4d6ee6ef3675eff62ff6bca691b54c69f75
* am 944a8725: am bee0495f: Merge "Dirty rect must expand, not contract." into ↵Chet Haase2013-05-151-4/+4
|\ | | | | | | | | | | | | jb-mr2-dev * commit '944a8725e6e2ccb310c9515c9067f995c034b724': Dirty rect must expand, not contract.
| * am bee0495f: Merge "Dirty rect must expand, not contract." into jb-mr2-devChet Haase2013-05-151-4/+4
| |\ | | | | | | | | | | | | * commit 'bee0495fa17b7e385d880f18e510e295c000cfa9': Dirty rect must expand, not contract.
| | * Merge "Dirty rect must expand, not contract." into jb-mr2-devChet Haase2013-05-151-4/+4
| | |\
| | | * Dirty rect must expand, not contract.Chet Haase2013-05-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different devices have different precision, leading to different pixels being touched during rendering operations. We need to ensure that the dirty rect we draw with (and which gets erased on the following frame) encompasses all possible pixels instead of some ideal rounded rectangle. The bug from this code led to dropped-pixels artifacts on some devices, where we'd scale a view, drawing it into some pixels, then invalidate that same area on the next frame, but the invalidation rectangle didn't cover the same pixels as the device drew into. The fix is to floor() the left/top pixels and ceil() the right/bottom pixels of the transformed invalidation rectangle. Issue #8971348 dropped pixel artifacts during some scaling operations Change-Id: Iedb1afd5621dff43bf7a3919bdbd8d2251647fd2
* | | | am 38272ad2: am 21403857: Merge "Fix for bug 8911390 RTL text alignment is ↵Raph Levien2013-05-151-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | changed ..." into jb-mr2-dev * commit '38272ad2b1d3ab90c83fcd74139503fcd3148a19': Fix for bug 8911390 RTL text alignment is changed ...
| * | | am 21403857: Merge "Fix for bug 8911390 RTL text alignment is changed ..." ↵Raph Levien2013-05-151-1/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '214038571992a4ba65531297bf4a89af9a0b5fd4': Fix for bug 8911390 RTL text alignment is changed ...
| | * | Merge "Fix for bug 8911390 RTL text alignment is changed ..." into jb-mr2-devRaph Levien2013-05-151-1/+3
| | |\ \
| | | * | Fix for bug 8911390 RTL text alignment is changed ...Raph Levien2013-05-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The predicate for detecting whether text was right aligned was missing some cases - it was correctly sensing RIGHT or OPPOSITE aligned text in the LTR case, but was missing NORMAL for rtl. This patch just adds that case. Change-Id: I06691e7122e1ca91d66299cf0d7ef1f8a476a44b
* | | | | am 231544c9: am 5f46f16e: am 47dbcfe4: am 023a70da: am c92ce29f: typoScott Main2013-05-152-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '231544c9212b31699f2bd8ef02c02f668e1c786e': typo
| * | | | am 5f46f16e: am 47dbcfe4: am 023a70da: am c92ce29f: typoScott Main2013-05-152-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '5f46f16e040163bb5fe9ed841a3d11312d10af01': typo
| | * | | am 47dbcfe4: am 023a70da: am c92ce29f: typoScott Main2013-05-152-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '47dbcfe4ed4922f6b6ece5f46edb13b1fc66f971': typo
| | | * \ \ am 023a70da: am c92ce29f: typoScott Main2013-05-152-2/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '023a70daa1c5b2bc0526fc75a7ea92626f476747': typo
| | | | * \ \ am c92ce29f: typoScott Main2013-05-152-2/+2
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c92ce29fe59d0ac0693847a6ac68bdadc507f1e7': typo
| | | | | * | | typoScott Main2013-05-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d8ea3b012d530b4f9212fbac159fce37cf36a03
* | | | | | | | am 8096329c: am 5720da0e: am b09a6e9c: am 0a008991: am 98599ee7: final ↵Scott Main2013-05-152-16/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android studio package info * commit '8096329c1fee6915f865fce9c69dcc70195485ff': final android studio package info
| * | | | | | | am 5720da0e: am b09a6e9c: am 0a008991: am 98599ee7: final android studio ↵Scott Main2013-05-152-16/+18
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package info * commit '5720da0e85b05a988c6262e737ba9a8228bd669c': final android studio package info
| | * | | | | | am b09a6e9c: am 0a008991: am 98599ee7: final android studio package infoScott Main2013-05-152-16/+18
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b09a6e9cfe847db59a3a16869bfe3b4333bc81df': final android studio package info
| | | * | | | | am 0a008991: am 98599ee7: final android studio package infoScott Main2013-05-152-16/+18
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a0089913292eaa099fcca78efc2c06e76d13f22': final android studio package info
| | | | * | | | am 98599ee7: final android studio package infoScott Main2013-05-152-16/+18
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '98599ee71eb1af403cd2f122dafc53c7aa380335': final android studio package info
| | | | | * | | final android studio package infoScott Main2013-05-152-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ec2c09e46c0eb563d6be3eda3fa92e1d692378d
* | | | | | | | am e3a133a8: am b865d578: Merge "Opt-in Settings package to see restricted ↵Amith Yamasani2013-05-151-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accounts" into jb-mr2-dev * commit 'e3a133a815fc1b8b9e39c499f251e36c87346e1c': Opt-in Settings package to see restricted accounts
| * | | | | | | am b865d578: Merge "Opt-in Settings package to see restricted accounts" into ↵Amith Yamasani2013-05-151-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'b865d578158150a13ca080c2525091a7722e75e3': Opt-in Settings package to see restricted accounts
| | * | | | | | Merge "Opt-in Settings package to see restricted accounts" into jb-mr2-devAmith Yamasani2013-05-151-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Opt-in Settings package to see restricted accountsAmith Yamasani2013-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can't be done in the settings package because the API only allows one account type to be listed. This resource gives the Settings app blanket access to restricted accounts when running in a restricted profile. Bug: 8968575 Change-Id: I69b42b496d9cf235982d40a142c084295edc6281
* | | | | | | | | Merge "Limit screenshots to specified activity and stack."Craig Mautner2013-05-153-18/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Limit screenshots to specified activity and stack.Craig Mautner2013-05-153-18/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The screenshots were capturing the entire screen. Now they are limited to the stack containing the activity. Add debug for stack states. Change-Id: I6d47cd37091bfdfd94e7abe89826b7ba8cb69b51
* | | | | | | | | | Merge "Revert "Reduce the number of measurement passes in RelativeLayout""Romain Guy2013-05-151-17/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Reduce the number of measurement passes in RelativeLayout"Romain Guy2013-05-151-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4cb81d6423ab15ce97575699e5fbc765322ba699.
* | | | | | | | | | | am 777e2e85: am a34b531b: Merge "EthernetDataTracker: Set network available ↵Robert Greenwalt2013-05-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | on connected" * commit '777e2e8545e37dfaf27f0f0ccd835f64fab7b746': EthernetDataTracker: Set network available on connected
| * | | | | | | | | am a34b531b: Merge "EthernetDataTracker: Set network available on connected"Robert Greenwalt2013-05-151-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a34b531bb6d2f2923f474b8c0a0c09149303e5d3': EthernetDataTracker: Set network available on connected
| | * \ \ \ \ \ \ \ \ Merge "EthernetDataTracker: Set network available on connected"Robert Greenwalt2013-05-151-0/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | EthernetDataTracker: Set network available on connectedPeter YOON2013-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes state mismatch found in the bugs below, and makes the code look consistent with disconnect(). In startMonitoring(), reconnect() is called before mNMService.registerObserver(). Then dhcpThread.run() could finish without getting interfaceLinkStateChanged() callback. In such a case, mNetworkInfo has connected but not-available state - which is contradictory. Bug: 8113933, 8291000, 8291039 Change-Id: I29d74f8d09dcffb97d6c9f8198811bca046fef0c
* | | | | | | | | | | | am f4dfad6a: am 1b173c6d: am 0f5d1391: am b7059861: am 2694897a: am ↵Dirk Dougherty2013-05-151-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs * commit 'f4dfad6a89831d6b1780513cf4ea28a5485b19b9': Doc change: add redirects for edu urls.
| * | | | | | | | | | | am 1b173c6d: am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am ↵Dirk Dougherty2013-05-151-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs * commit '1b173c6d5dceac14a42e6bf92980d0e247f5ccbc': Doc change: add redirects for edu urls.
| | * | | | | | | | | | am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc ↵Dirk Dougherty2013-05-151-0/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change: add redirects for edu urls." into jb-mr1.1-docs * commit '0f5d1391f511380382b2cb91cf356d80854230b5': Doc change: add redirects for edu urls.
| | | * | | | | | | | | am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add ↵Dirk Dougherty2013-05-151-0/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | redirects for edu urls." into jb-mr1.1-docs * commit 'b705986179b1bbda80c9281477a4d6b6b6d27e88': Doc change: add redirects for edu urls.
| | | | * | | | | | | | am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for ↵Dirk Dougherty2013-05-151-0/+6
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edu urls." into jb-mr1.1-docs * commit '2694897a3c20b79e3b28601ee43bcaefec827232': Doc change: add redirects for edu urls.
| | | | | * | | | | | | am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." ↵Dirk Dougherty2013-05-151-0/+6
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1.1-docs * commit '787cbb37d5cb2334af80d8da1b8fa4286e845eee': Doc change: add redirects for edu urls.
| | | | | | * \ \ \ \ \ \ am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docsDirk Dougherty2013-05-151-0/+6
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a51dfd4e3e10411ede67743f85cdd510ba3eb90': Doc change: add redirects for edu urls.
| | | | | | | * \ \ \ \ \ \ Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docsDirk Dougherty2013-05-151-0/+6
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * | | | | | | Doc change: add redirects for edu urls.Dirk Dougherty2013-05-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic46047c99fe9b1902694d9ecdcea1c9c799ee611
* | | | | | | | | | | | | | | am d662bf1a: am 7b2fba2f: am 997d0042: am aa0acfc8: am 231e2474: Merge ↵Dirk Dougherty2013-05-153-9/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit \'c3069c26\' into manualmerge * commit 'd662bf1a50e7a19f5ea301a8083aeb6dabee4b0a': Doc change: updates to location landing.
| * | | | | | | | | | | | | | am 7b2fba2f: am 997d0042: am aa0acfc8: am 231e2474: Merge commit ↵Dirk Dougherty2013-05-153-9/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'c3069c26\' into manualmerge * commit '7b2fba2f4a78fb42f42268fb899884b8fe4c5e1d': Doc change: updates to location landing.
| | * | | | | | | | | | | | | am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into ↵Dirk Dougherty2013-05-153-9/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manualmerge * commit '997d00428c420ba8c2175c7c2e28f14d54abd0b9': Doc change: updates to location landing.
| | | * | | | | | | | | | | | am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmergeDirk Dougherty2013-05-153-9/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa0acfc8761fc8802879f90511b904061a523ed2': Doc change: updates to location landing.
| | | | * | | | | | | | | | | am 231e2474: Merge commit \'c3069c26\' into manualmergeDirk Dougherty2013-05-153-9/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '231e2474f283dc0a1962b45f1c16c5280a8937df': Doc change: updates to location landing.
| | | | | * | | | | | | | | | Merge commit 'c3069c26' into manualmergeDirk Dougherty2013-05-153-9/+21
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/html/guide/topics/location/strategies.jd Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b
| | | | | | * | | | | | | | | am 8d595130: Merge "Doc change: updates to location landing." into jb-mr1.1-docsDirk Dougherty2013-05-155-9/+24
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d59513030cbc61c37aec2d2a2343a9bfc03ae2d': Doc change: updates to location landing.
| | | | | | | * | | | | | | | Merge "Doc change: updates to location landing." into jb-mr1.1-docsDirk Dougherty2013-05-155-9/+24
| | | | | | | |\ \ \ \ \ \ \ \