Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,375 Commits 3 Branches 0 Tags
ca00a396af662a28ba066e9a022b8b3aa0956df9
Commit Graph

25134 Commits

Author SHA1 Message Date
Craig Mautner
ca00a396af am b19e273d: am 5851c6e6: Merge "Convert resized() method to new parameters." into jb-mr1-dev 
* commit 'b19e273dd2eab159ad8b8c4d05a94a032685c4da':
  Convert resized() method to new parameters.
 2012-09-06 15:13:36 -07:00
Chris Craik
e037167446 am 8387b4d8: am a6b5eca7: Merge "Don\'t trigger log for empty views" into jb-mr1-dev 
* commit '8387b4d86f447f7bfa5dbefb357f49041dbee42c':
  Don't trigger log for empty views
 2012-09-06 15:13:32 -07:00
Craig Mautner
5851c6e638 Merge "Convert resized() method to new parameters." into jb-mr1-dev 2012-09-06 15:07:46 -07:00
Chris Craik
a6b5eca796 Merge "Don't trigger log for empty views" into jb-mr1-dev 2012-09-06 15:07:46 -07:00
Craig Mautner
656e3af444 Convert resized() method to new parameters. 
When the BaseIWindow.resized method got switched from taking (int x,
int y, ...) to taking (Rect, ...) the SurfaceView.MyWindow override
never got updated.

Fixes bug 6992324.

Change-Id: Id0b9625559ae0100336f4573f09d313138c8a6e7
 2012-09-06 15:04:22 -07:00
rich cannings
3e057216e9 am c376537d: am c862d0fc: Merge "Add secure setting for package verification" into jb-mr1-dev 
* commit 'c376537dde3026a0c86cc406d5c42ede6e0c9a1a':
  Add secure setting for package verification
 2012-09-06 15:00:26 -07:00
Chris Craik
3667aa364f Don't trigger log for empty views 
Change-Id: Idb2193d6dd064e5c4af1f02d0df2a83a7db0e0f8
 2012-09-06 14:59:15 -07:00
rich cannings
c862d0fc05 Merge "Add secure setting for package verification" into jb-mr1-dev 2012-09-06 14:55:55 -07:00
Chris Craik
d4078443b8 am 263f27c2: am 776dafa8: Merge "Log if a view fails to fit in the drawing cache" into jb-mr1-dev 
* commit '263f27c22c0a10832d821759920f231d11009cf6':
  Log if a view fails to fit in the drawing cache
 2012-09-06 14:53:10 -07:00
Chris Craik
10e9d1d7ad Log if a view fails to fit in the drawing cache 
Large software layers won't draw if they're larger than the size of the drawing
cache, in which case this log will be triggered.

bug:7078391
Change-Id: Ib42a060b8e3b3642417df9243a086aa15b2989b1
 2012-09-06 14:45:45 -07:00
rich cannings
16e119e798 Add secure setting for package verification 
Framework changes to store and read a secure setting for package verification.
Default is on/true.

This setting will be turned on/off via the Settings app.

Bug: 7082362
Change-Id: I6f93d3136add8af0dbbdc664f0473c5f5b7e3fee
 2012-09-06 14:37:44 -07:00
Dianne Hackborn
59ad17ed08 am 99b23e2c: am fae0d662: Merge "Nested fragments." into jb-mr1-dev 
* commit '99b23e2c873ff6df5f6609bc87a3bdb9ae33e5ba':
  Nested fragments.
 2012-09-06 11:48:43 -07:00
Dianne Hackborn
fae0d66275 Merge "Nested fragments." into jb-mr1-dev 2012-09-06 11:41:48 -07:00
Dianne Hackborn
62bea2f171 Nested fragments. 
Change-Id: I79acc19b391352c16b06afee2ca543223c38e364
 2012-09-06 11:05:53 -07:00
Martijn Coenen
a7e34d5178 am 67ad3e98: am 32ac1e14: Fix NPE in NdefRecord parser. 
* commit '67ad3e98e373402cb6be5cdc8036a82eb8f7be91':
  Fix NPE in NdefRecord parser.
 2012-09-06 09:16:43 -07:00
Martijn Coenen
32ac1e142c Fix NPE in NdefRecord parser. 
Malformed Uri tags could cause this crash.

Bug: 7116323
Change-Id: I979d1512058f351df32dbd972b6ec5c108202da5
 2012-09-06 17:13:38 +02:00
Selim Gurun
fadf962d3c am a106ab46: am 18e87680: Merge "remove defunct javascript interface" into jb-mr1-dev 
* commit 'a106ab46ae07e1658ecfae20216995a275c11707':
  remove defunct javascript interface
 2012-09-05 16:30:08 -07:00
Selim Gurun
18e8768067 Merge "remove defunct javascript interface" into jb-mr1-dev 2012-09-05 15:04:07 -07:00
Jean-Baptiste Queru
b2057ad01e am 79a37c45: am f389f282: resolved conflicts for merge of 7749a1c5 to jb-mr1-dev 
* commit '79a37c453954f7f04a535ef311bb8bbfc0ee0791':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:36:17 -07:00
Jean-Baptiste Queru
f389f2820c resolved conflicts for merge of 7749a1c5 to jb-mr1-dev 
Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97
 2012-09-05 12:21:50 -07:00
Jean-Baptiste Queru
7749a1c5ec am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit 'b4ac801c477c0a0de18da89744d9a78e79d2ff51':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:12:52 -07:00
Jean-Baptiste Queru
b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:10:44 -07:00
Fabrice Di Meglio
c0e4a76164 am 86683232: am 5575e97c: Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev 
* commit '866832323499e332bcc426b104da9cd842713472':
  Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures
 2012-09-05 12:10:08 -07:00
Fabrice Di Meglio
5575e97cea Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev 2012-09-05 12:03:32 -07:00
Selim Gurun
d773ca8ff2 remove defunct javascript interface 
Bug: 7073422

The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.

Change-Id: I9441d461caf189467e4ad45de958c13b81f4ff17
 2012-09-05 11:53:44 -07:00
Jean-Baptiste Queru
1ca2fee954 Merge "Make default value of auto-sync in SyncStorageEngine configurable" 2012-09-05 11:03:13 -07:00
Mark Fickett
0d42d5424d Merge "Fix docs typo: startActivityWithResult should be startActivityForResult." 2012-09-05 08:14:03 -07:00
Mark Fickett
ab249e08db Fix docs typo: startActivityWithResult should be startActivityForResult. 
Change-Id: Ieb75798475fa5cfaa9bf1f1493e03b9ab27f63e3
 2012-09-05 09:45:47 -04:00
Mathias Agopian
287e081262 am 54afe6ab: am f87633f3: Merge "update to new SurfaceComposerClient API" into jb-mr1-dev 
* commit '54afe6abf990162023eeaa1a029344bb221622eb':
  update to new SurfaceComposerClient API
 2012-09-04 20:34:19 -07:00
Satoshi Kataoka
993ed86b99 am ea5fdf61: am 0d727c71: Merge "Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed" into jb-mr1-dev 
* commit 'ea5fdf6171abfcad59c4d2d00dbb0783fcb94251':
  Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed
 2012-09-04 20:34:15 -07:00
Mathias Agopian
f87633f38c Merge "update to new SurfaceComposerClient API" into jb-mr1-dev 2012-09-04 20:30:02 -07:00
Satoshi Kataoka
0d727c714b Merge "Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed" into jb-mr1-dev 2012-09-04 20:27:50 -07:00
Mathias Agopian
63f1c43fbe update to new SurfaceComposerClient API 
Change-Id: I8f2c96df56fe3a851b8ec03bb8734db0b6bea3d5
 2012-09-04 20:23:23 -07:00
Adam Powell
4289b49dd5 am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately 
* commit '9f3b0bfd0b1d8876c96036a303b3ff72df0e8ad0':
  DO NOT MERGE - Make WebView track focal points more accurately
 2012-09-04 19:49:13 -07:00
Adam Powell
52da9fa7b5 am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold 
* commit 'c4ce0da255df07e3d8a799aa4e9af2f1949ef4f4':
  DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
 2012-09-04 19:49:07 -07:00
Fabrice Di Meglio
fa1babd221 Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures 
- cache the text aligment as we cannot resolve the text alignment during reset of the text direction

Change-Id: I79de625e517bf8bad6313fd5e349f1181b1eaa30
 2012-09-04 19:11:25 -07:00
Adam Powell
9f3b0bfd0b DO NOT MERGE - Make WebView track focal points more accurately 
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
 2012-09-04 18:33:56 -07:00
Adam Powell
c4ce0da255 DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold 
Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
 2012-09-04 18:33:42 -07:00
Adam Powell
1cab7d049f am e8f8fae5: am deeade34: Merge "Make WebView track focal points more accurately" into jb-mr1-dev 
* commit 'e8f8fae548d67f658d5627081e6a0167f68544ae':
  Make WebView track focal points more accurately
 2012-09-04 18:24:38 -07:00
Adam Powell
fd679e4b39 am 40ae1bda: am adb93889: Merge "Delay starting scale gesture events until a touch slop threshold" into jb-mr1-dev 
* commit '40ae1bda1e1c346ece55727fdae76f9c0b8a86a7':
  Delay starting scale gesture events until a touch slop threshold
 2012-09-04 18:21:54 -07:00
Adam Powell
deeade34cb Merge "Make WebView track focal points more accurately" into jb-mr1-dev 2012-09-04 18:19:30 -07:00
Adam Powell
adb93889ae Merge "Delay starting scale gesture events until a touch slop threshold" into jb-mr1-dev 2012-09-04 18:17:10 -07:00
Jim Miller
a6e7d33cab am 6627406a: am 175ae55c: Merge "Update DevicePolicyManager with ability to disable keyguard widgets" into jb-mr1-dev 
* commit '6627406a5ce881d6d6b4bcdfef4b2b9804032810':
  Update DevicePolicyManager with ability to disable keyguard widgets
 2012-09-04 15:25:40 -07:00
Jim Miller
175ae55c0d Merge "Update DevicePolicyManager with ability to disable keyguard widgets" into jb-mr1-dev 2012-09-04 15:20:42 -07:00
Fabrice Di Meglio
949c875a05 am 81c66d65: am 035ce2ca: Merge "Add support for "-rtl" in resources" into jb-mr1-dev 
* commit '81c66d6592718e9a1c57c39c1675ea13e8e769bb':
  Add support for "-rtl" in resources
 2012-09-04 15:06:20 -07:00
Fabrice Di Meglio
035ce2ca92 Merge "Add support for "-rtl" in resources" into jb-mr1-dev 2012-09-04 15:01:03 -07:00
Adam Powell
1027ed2aca Make WebView track focal points more accurately 
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
 2012-09-04 14:42:11 -07:00
Adam Powell
47ec2fb370 Delay starting scale gesture events until a touch slop threshold 
Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
 2012-09-04 14:42:11 -07:00
Luca Zanolin
f252f1dcaf Merge "Relax suggestion notification." 2012-09-04 14:08:24 -07:00
Jim Miller
b8ec470617 Update DevicePolicyManager with ability to disable keyguard widgets 
Change-Id: I5876e9e180b2a995aaa355fbbb2b67cebb86104d
 2012-09-04 13:52:36 -07:00