Fabrice Di Meglio
a26ddfacd7
Merge "Remove dead code in Switch"
2012-06-06 15:56:36 -07:00
Dianne Hackborn
9a8eed3a4d
am 18aa041a: am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev
...
* commit '18aa041a62d36b9f2d4ead8ca0945ec87af582b4':
Fix some divide by zero errors that could crash the system.
2012-06-06 14:22:43 -07:00
Dianne Hackborn
18aa041a62
am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev
...
* commit '6cd19e0266b3f4277f13dab7e9a86ebdd9905ee9':
Fix some divide by zero errors that could crash the system.
2012-06-06 14:17:54 -07:00
Dianne Hackborn
6cd19e0266
Merge "Fix some divide by zero errors that could crash the system." into jb-dev
2012-06-06 14:16:05 -07:00
Jake Hamby
f2fb9044c5
am e60a35c1: Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
...
* commit 'e60a35c156ac9a354ad6434da483b43af20ae4a2':
DO NOT MERGE: Remove SMS shortcode warning feature.
2012-06-06 14:04:07 -07:00
Jake Hamby
e60a35c156
Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
2012-06-06 14:01:24 -07:00
Jake Hamby
004ff5ad2a
DO NOT MERGE: Remove SMS shortcode warning feature.
...
Fix jb-dev build. The SMS shortcode warning feature has some usability
limitations which need to be resolved before shipping. Remove the code
for JellyBean. It will be added back to a future release when the
feature is complete.
Bug: 6605549
Change-Id: Ic8a68dc0b1ad038618962185f5ee680d5281ca21
2012-06-06 13:56:50 -07:00
Eric Fischer
2c7f1325e1
am 5ddf003c: Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev
...
* commit '5ddf003cb2957672038bf1db397422402dce930a':
Revert "Import translations. DO NOT MERGE"
2012-06-06 13:54:56 -07:00
Eric Fischer
5ddf003cb2
Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev
2012-06-06 13:53:00 -07:00
Eric Fischer
25dcc321f7
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 6a6f746ece453c43aa92808cd140012866c8eb5c
2012-06-06 13:51:50 -07:00
Dianne Hackborn
20e14948f2
am 82811d45: am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
...
* commit '82811d45ed21ccdff77d11495fa2045c7942bd6d':
Docs (mostly): enumerate JELLY_BEAN target SDK changes.
2012-06-06 13:37:57 -07:00
Dianne Hackborn
82811d45ed
am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
...
* commit '533fce25a22718c491a86c31866b7751f1f582b7':
Docs (mostly): enumerate JELLY_BEAN target SDK changes.
2012-06-06 13:33:43 -07:00
Dianne Hackborn
533fce25a2
Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
2012-06-06 13:31:59 -07:00
Eric Fischer
8e62634acd
am 38987073: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '38987073c1b1a993a727210f981601217d30b899':
Import translations. DO NOT MERGE
2012-06-06 12:40:11 -07:00
Eric Fischer
404de74c49
Merge "Import translations. DO NOT MERGE"
2012-06-06 12:39:39 -07:00
Eric Fischer
38987073c1
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-06 12:37:51 -07:00
Eric Fischer
4328d8bb22
Import translations. DO NOT MERGE
...
Change-Id: I531d75aff0713a0664110bf2c138305b30c84722
2012-06-06 12:08:20 -07:00
Eric Fischer
6a6f746ece
Import translations. DO NOT MERGE
...
Change-Id: I5a8719c293a25460058ad5b62069ea80c33da110
2012-06-06 12:02:00 -07:00
Dianne Hackborn
cdadee630e
Fix some divide by zero errors that could crash the system.
...
Change-Id: I66273df84e45de59b5b161f4d13de67a9e0f46d5
2012-06-06 11:48:46 -07:00
Dianne Hackborn
636fd528f7
Docs (mostly): enumerate JELLY_BEAN target SDK changes.
...
Okay this isn't entirely docs. I have un-hidden the new permission
for binding to accessibility services; we were going to go out with
it hidden since it didn't go into factory ROM, but now that we are
doing other things we might as well expose it.
Also changed a log from E to W, since it is not an error.
Change-Id: I9226c95e3b63e12218fe41dc3f4290d9824a9e5c
2012-06-06 11:36:49 -07:00
Svetoslav Ganov
5fccbbebdf
am cf27a374: am 538252cd: Merge "Removing leftover code to sync accessibility and input focus." into jb-dev
...
* commit 'cf27a3743941d9ccb1d20a294085819049fac028':
Removing leftover code to sync accessibility and input focus.
2012-06-06 11:02:13 -07:00
Svetoslav Ganov
cf27a37439
am 538252cd: Merge "Removing leftover code to sync accessibility and input focus." into jb-dev
...
* commit '538252cd37945612a4761ff03d87022d56e33b96':
Removing leftover code to sync accessibility and input focus.
2012-06-06 10:57:50 -07:00
Svetoslav Ganov
538252cd37
Merge "Removing leftover code to sync accessibility and input focus." into jb-dev
2012-06-06 10:55:12 -07:00
Mangesh Ghiware
c1892e0c29
am f8e99204: am b215726a: Merge "Remove transient and unnecessary update density message." into jb-dev
...
* commit 'f8e99204c901d1d05960ed9a11c6af4a4e7dccd8':
Remove transient and unnecessary update density message.
2012-06-06 08:41:28 -07:00
Mangesh Ghiware
f8e99204c9
am b215726a: Merge "Remove transient and unnecessary update density message." into jb-dev
...
* commit 'b215726a0e46400c8dbc4a585c2f4200c7a619b6':
Remove transient and unnecessary update density message.
2012-06-06 08:35:52 -07:00
Mangesh Ghiware
b215726a0e
Merge "Remove transient and unnecessary update density message." into jb-dev
2012-06-06 08:32:36 -07:00
Svetoslav Ganov
462a7284b5
Removing leftover code to sync accessibility and input focus.
...
1. We have decided to let the accessibility services take care
for syncing accessibility and input focus. Some apps may
move input focus when a given view takes input focus which
dragging accessibility focus can lead to a loop in the
focus traversal. This change removes some leftover sync
code.
bug:6616861
Change-Id: I57cb44e315a386d13596794d3767b559e9ee3d99
2012-06-05 21:10:04 -07:00
Adam Powell
b85afc25d5
resolved conflicts for merge of 1178569b to master
...
Change-Id: If2bb6ccaee99bcf199cd93f24eba217fe6ff485e
2012-06-05 20:08:41 -07:00
Adam Powell
1178569b26
am f6452d0c: Merge "More fun with MediaRouter" into jb-dev
...
* commit 'f6452d0cac64b72005af330411b5a895f0038312':
More fun with MediaRouter
2012-06-05 19:29:57 -07:00
Adam Powell
f6452d0cac
Merge "More fun with MediaRouter" into jb-dev
2012-06-05 19:27:49 -07:00
Jeff Brown
1b60e72877
am eef4bc08: am 615fd3df: Merge "Implement new rotation policy." into jb-dev
...
* commit 'eef4bc08137f2324e2974c282992ff546df99e54':
Implement new rotation policy.
2012-06-05 19:20:08 -07:00
Adam Powell
690ffb4e1f
More fun with MediaRouter
...
Add action provider, button, and styles. Extend ActionProvider to
allow for getting references to MenuItem instances.
Implement toggle mode for the MediaRouteButton/ActionProvider. Dialog
selection yet to come.
Change-Id: Ibe3188570f503bbf8dd00cf154663435656a7171
2012-06-05 19:15:57 -07:00
Jeff Brown
eef4bc0813
am 615fd3df: Merge "Implement new rotation policy." into jb-dev
...
* commit '615fd3dff2e369d8b786abcfe41b6da988e41001':
Implement new rotation policy.
2012-06-05 19:14:17 -07:00
Jeff Brown
615fd3dff2
Merge "Implement new rotation policy." into jb-dev
2012-06-05 19:11:13 -07:00
Fabrice Di Meglio
8dbf3b006d
Remove dead code in Switch
...
Change-Id: I91b47866be6f370feef67b1aa4df3aa0d09cc6fb
2012-06-05 19:01:01 -07:00
Mangesh Ghiware
c7ad10201b
Remove transient and unnecessary update density message.
...
On a page load, the (viewport) metadata settings for the main frame are
reset. Reloading a page with viewport meta tag specifying target density
dpi will result in 2 back to back update zoom density messages to be
sent from WebViewCore to UI thread.
In setupViewport(), remove update density messages in flight. If the new
density is indeed different from WebView's default scale, queue another
message.
Bug: 6509512
Change-Id: I195e40277bf1bcccb0e61d84ed84db1e34556243
2012-06-05 18:46:10 -07:00
Jeff Brown
207673cdbb
Implement new rotation policy.
...
Rotation lock does not override NOSENSOR mode anymore.
Centralize the rotation policy settings into a new class shared by
the System UI and Settings applications.
Add a new setting to specify whether rotation-lock is being hidden
because the "auto-rotate screen" option has been toggled in the
Accessibility settings panel.
Bug: 6523269
Change-Id: I15173280d25bc5d101e89a9c65913aefc53fc33a
2012-06-05 17:59:46 -07:00
Fabrice Di Meglio
6fc225a02f
Merge "Make CheckBox / RadioButton / ToggleButton / Star widgets aware of layout direction"
2012-06-05 17:16:31 -07:00
John Reck
1f1f21aaa8
am f671e430: am 804e822c: Merge "Fix logspam" into jb-dev
...
* commit 'f671e430159425ea1ce323f5eb0f59452b1a6fe1':
Fix logspam
2012-06-05 16:56:38 -07:00
John Reck
f671e43015
am 804e822c: Merge "Fix logspam" into jb-dev
...
* commit '804e822c56473ce71d1f912c617ff05b474a7af6':
Fix logspam
2012-06-05 16:52:41 -07:00
John Reck
804e822c56
Merge "Fix logspam" into jb-dev
2012-06-05 16:50:10 -07:00
Fabrice Di Meglio
2842679d34
Make CheckBox / RadioButton / ToggleButton / Star widgets aware of layout direction
...
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: I8badb57d095c6a0a1d0c82bedf30b02502013ae0
2012-06-05 16:41:18 -07:00
Jake Hamby
2b57c8e0ba
am 321ec19e: Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
...
* commit '321ec19e3e2ac1d1f0609f2f5f5feda90f7a688b':
DO NOT MERGE: Remove SMS shortcode warning feature.
2012-06-05 16:36:19 -07:00
Jake Hamby
321ec19e3e
Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
2012-06-05 16:34:27 -07:00
Jeff Brown
137217209d
am 3795105f: am b7161f57: Merge "Report extended error information from SQLite." into jb-dev
...
* commit '3795105ff06d3676ea059a037bb0180fd367e2fc':
Report extended error information from SQLite.
2012-06-05 16:11:50 -07:00
Jeff Brown
3795105ff0
am b7161f57: Merge "Report extended error information from SQLite." into jb-dev
...
* commit 'b7161f578642df90c44728c175e31fca198aaddb':
Report extended error information from SQLite.
2012-06-05 16:07:35 -07:00
Jeff Brown
b7161f5786
Merge "Report extended error information from SQLite." into jb-dev
2012-06-05 16:04:45 -07:00
Svetoslav Ganov
7510230583
am f1abc425: am cab5b8a9: Merge "Nodes with contentDescription should always be important for accessibility." into jb-dev
...
* commit 'f1abc4253111907ffb8e5ba19dffa8d00d92fc45':
Nodes with contentDescription should always be important for accessibility.
2012-06-05 16:02:17 -07:00
Svetoslav Ganov
f1abc42531
am cab5b8a9: Merge "Nodes with contentDescription should always be important for accessibility." into jb-dev
...
* commit 'cab5b8a91d6fbcbb694284038f5529ff02f10f78':
Nodes with contentDescription should always be important for accessibility.
2012-06-05 15:57:25 -07:00
Svetoslav Ganov
cab5b8a91d
Merge "Nodes with contentDescription should always be important for accessibility." into jb-dev
2012-06-05 15:55:42 -07:00