Jeff Sharkey
b81c7bb932
am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev
...
* commit '65f4de101fa8d5752603c6e79536c3a17f585490':
Migrate more Secure settings to Global.
2012-09-28 00:36:41 -07:00
Adam Cohen
a2ba6f9202
am 080ee3ef: am 580ee8b0: Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev
...
* commit '080ee3ef55ec32bc6a3254814f9fd717767dfa7e':
Fixing AppWidgetService / AppWidgetHost to work in system process
2012-09-28 00:33:42 -07:00
Jeff Sharkey
ae1af49a91
am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev
...
* commit '3a8af8efff93ca8ee80fc8c7841e7bee9a8b7786':
Migrate more Secure settings to Global.
2012-09-27 19:34:28 -07:00
Fabrice Di Meglio
03b8d3a9a4
Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams
...
- remove isLayoutRtl() from public API
Change-Id: If700e3f5f30e3c98403b48dbcdd892535d929e2d
2012-09-27 17:05:27 -07:00
Fabrice Di Meglio
9a04856d5e
Other improvements for bug #6427629 Clean up layout direction APIs
...
- hide isLayoutRtl() from public API
- canResolveXXX() is now smarter: use recursion to get its returned value
- in ViewGroup, if resolution cannot be done then dont ask resolution for
its children
- in ViewGroup, addViewInner() needs to ask to resolve the child. This is
needed for example by ListView which is using the same measurespec before
and after its childs being attached.
It also take care of the general case where a measure pass is done when not
attached to a parent (and thus asking for resolution that will "fail" if we
are using IHNERIT) and never done again. That would lead to never do a
resolution.
- some code refactoring
Change-Id: I120dd2fef7397944f5ba8deff0686b108dc827d2
2012-09-27 16:39:14 -07:00
Jeff Sharkey
625239a054
Migrate more Secure settings to Global.
...
Migrate networking, storage, battery, DropBox, and PackageManager
related Secure settings to Global table.
Bug: 7232014, 7231331, 7231198
Change-Id: I772c2a9586a2f708c9db95622477f235064b8f4d
2012-09-27 16:22:53 -07:00
Adam Cohen
d086ee036e
am 580ee8b0: Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev
...
* commit '580ee8b0c6e1aea1e2e1d60499b603b9168b44f0':
Fixing AppWidgetService / AppWidgetHost to work in system process
2012-09-27 11:19:28 -07:00
Adam Cohen
580ee8b0c6
Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev
2012-09-27 11:17:20 -07:00
Jeff Sharkey
4cabbc5be7
am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev
...
* commit 'f57fcddb61236c6e9c145d8f310bf1f4b1daafbb':
First step towards cleaning up Global settings.
2012-09-26 20:23:07 -07:00
Jeff Sharkey
031c410adc
am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev
...
* commit '68b7a6d14b68b38324ffd275c7227805c7d99b2d':
First step towards cleaning up Global settings.
2012-09-26 20:19:32 -07:00
Jeff Sharkey
68b7a6d14b
Merge "First step towards cleaning up Global settings." into jb-mr1-dev
2012-09-26 20:15:45 -07:00
Adam Cohen
3ff2d867d4
Fixing AppWidgetService / AppWidgetHost to work in system process
...
-> Fixes issue 7208464
-> Fixed issue with partial update as well, should address
issue 7214731
Change-Id: Ib8d9d5bee68b4fa7d6b4fbbc2f6609c287689958
2012-09-26 18:00:12 -07:00
Philip Milne
9ac0a9af26
am 2bbc3257: am eed8f06f: Merge "Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
...
* commit '2bbc32575fc746026e9cc1dae897754a0ba1dcb7':
Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()
2012-09-26 17:37:02 -07:00
Philip Milne
ac4b97caed
am eed8f06f: Merge "Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
...
* commit 'eed8f06f7f5d8f934ea99f16ef987a3ae1bd99b2':
Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()
2012-09-26 17:34:10 -07:00
Philip Milne
eed8f06f7f
Merge "Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
2012-09-26 17:30:20 -07:00
Jeff Sharkey
bdfce2ec05
First step towards cleaning up Global settings.
...
Remove all @Deprecated @hide settings, and clean up any stragglers.
Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
2012-09-26 17:18:49 -07:00
Brian Carlstrom
b66e30373c
am 0b6cb84b: am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev
...
* commit '0b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a':
Reverting public setSoWriteTimeout
2012-09-26 16:09:29 -07:00
Brian Carlstrom
cd4a962a84
am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev
...
* commit '13987fb43255ccb3802d415e32b1c5caf14291bb':
Reverting public setSoWriteTimeout
2012-09-26 16:09:03 -07:00
Brian Carlstrom
13987fb432
Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev
2012-09-26 16:05:00 -07:00
Brian Carlstrom
992f238d13
Reverting public setSoWriteTimeout
...
This reverts fd901f735c858af8ec8884b2e7ab71a46a9639e6 and 5e21bf934b2a71b595deb9856a2044eea4dbce86
Bug: 7237764
Bug: 6693087
Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
2012-09-26 15:48:21 -07:00
Philip Milne
4118012da9
Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()
...
Change-Id: Ie38952bbaace080e81e41e61350cda172951d548
2012-09-26 11:29:25 -07:00
John Spurlock
46193469c7
am ccb06b41: am fddedc94: Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev
...
* commit 'ccb06b415747655cead26a801560b68ee061b870':
Dream metadata now specified using an xml-resource.
2012-09-26 11:20:17 -07:00
John Spurlock
5d15dd08bf
am fddedc94: Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev
...
* commit 'fddedc94b77812ea13afe8cae32ad27d7266f787':
Dream metadata now specified using an xml-resource.
2012-09-26 11:17:55 -07:00
John Spurlock
f41f505fac
Dream metadata now specified using an xml-resource.
...
Removed old metadata key for dream settings activity, now defined in attrs.xml.
Also took this opportunity to remove Dream#lightsOut.
Bug:7172816
Bug:7211867
Change-Id: Ied18a527d2dc2aacc19d7a9543f090653232f0ed
2012-09-26 12:44:39 -04:00
Jeff Brown
9da4d74477
am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev
...
* commit '876f95ed7f914b4d86634db552277f835d288805':
Update references to migrated global settings.
Handle user switched for settings changes.
2012-09-25 17:11:25 -07:00
Jeff Brown
3476cb8ec2
am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev
...
* commit 'b32e221699201cb647beae3fe0a1771fd5a41cf4':
Update references to migrated global settings.
Handle user switched for settings changes.
2012-09-25 17:05:56 -07:00
Jeff Brown
b32e221699
Merge changes I332f020f,I632648ac into jb-mr1-dev
...
* changes:
Update references to migrated global settings.
Handle user switched for settings changes.
2012-09-25 17:03:11 -07:00
Svetoslav Ganov
2a0168615b
am dfd00788: am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev
...
* commit 'dfd007884d104417b8d39fd2002f09b11ac875f8':
Adding a global accessibility action to open quick settings.
2012-09-25 16:52:34 -07:00
Brian Carlstrom
1802935852
am bee07548: am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev
...
* commit 'bee07548d5beda94538a211383847889dc9224b5':
Add a static generator that takes a Socket Write Timeout Argumanet
2012-09-25 16:50:47 -07:00
Svetoslav Ganov
53da9d3490
am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev
...
* commit 'c91fb5875bfd7f91d50d6fe939873872b53c8b2f':
Adding a global accessibility action to open quick settings.
2012-09-25 16:49:56 -07:00
Brian Carlstrom
71d2b48fb7
am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev
...
* commit 'fe54290df0c5d495b7f388035a4ae3a20821a183':
Add a static generator that takes a Socket Write Timeout Argumanet
2012-09-25 16:48:02 -07:00
Svetoslav Ganov
c91fb5875b
Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev
2012-09-25 16:47:06 -07:00
Svetoslav Ganov
e20a177d3f
Adding a global accessibility action to open quick settings.
...
1. Added APIs for opening the quick settings to the StatusBarManagerService
and the local StatausBarManager. The new APIs are protected by the old
EXPAND_STATUS_BAR permission.
Renamed the expand* and collapse* non-public APIs that are expanding
the notifications to expandNotifications* collapseNotifications* to
better convey what they do given that this change adds
expandQuickSettings* and collapseQuickSettings*.
Added a global action to the accessibility layer to expand the quick
settings which is calling into the new status bar manager APIs.
bug:7030487
Change-Id: Ic7b46e1a132f1c0d71355f18e7c5a9a2424171c3
2012-09-25 16:07:59 -07:00
Alon Albert
fd901f735c
Add a static generator that takes a Socket Write Timeout Argumanet
...
Use it from AndroidHttpClient
Bug: 6693087
Change-Id: I08648e441a6431d0944caaec0db516a26671f2a5
2012-09-25 15:33:28 -07:00
Jeff Brown
bf6f6f9de7
Update references to migrated global settings.
...
Fixed one setting that was migrated but not marked deprecated.
Removed a hidden setting that is no longer used by the new
power manager service.
Bug: 7231172
Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7
2012-09-25 15:27:51 -07:00
Brian Carlstrom
a1b0baf1e5
am df44266d: am 5e21bf93: Unhide SSLCertificateSocketFactory.setSoWriteTimeout
...
* commit 'df44266daa8e50e2a0686bf3fc49454518eabb0f':
Unhide SSLCertificateSocketFactory.setSoWriteTimeout
2012-09-25 13:29:44 -07:00
Brian Carlstrom
ce536f3b47
am 5e21bf93: Unhide SSLCertificateSocketFactory.setSoWriteTimeout
...
* commit '5e21bf934b2a71b595deb9856a2044eea4dbce86':
Unhide SSLCertificateSocketFactory.setSoWriteTimeout
2012-09-25 12:50:11 -07:00
Jean-Baptiste Queru
6d5efebc56
am 5ef9cb68: Merge into jb-mr1-dev
...
* commit '5ef9cb68c3bb639990abc0eadcaaaa61164ad628':
Hiding a method for JB-MR1
2012-09-25 12:48:55 -07:00
Jean-Baptiste Queru
3d9e6909fd
am 1b242759: Merge into jb-mr1-dev
...
* commit '1b242759763205fa529591738cbe213fcc25150e':
Adding support for new 'uid2445' column in Calendar's Events table.
2012-09-25 12:46:53 -07:00
Jean-Baptiste Queru
df3131e466
am 6fb2514c: Merge into jb-mr1-dev
...
* commit '6fb2514cdf77e2657d7b73b0cd97e060aefc6b53':
Fix issue #7215984 : java.lang.RuntimeException: Unable to create...
2012-09-25 12:46:26 -07:00
Martijn Coenen
8aad9d7923
am 8f862ef9: Add NfcBarcode technology API.
...
* commit '8f862ef9f74f2d2ebf767c645ce39db8412dd08f':
Add NfcBarcode technology API.
2012-09-25 12:46:22 -07:00
Brian Carlstrom
5e21bf934b
Unhide SSLCertificateSocketFactory.setSoWriteTimeout
...
Bug: 6693087
Change-Id: I585c2a61226da58077fd7cd7826695ce17380248
2012-09-25 10:38:52 -07:00
Jean-Baptiste Queru
5ef9cb68c3
Merge into jb-mr1-dev
...
Change-Id: I4696f4336d79ca199f2358bfb3ed5fc7e6c51732
2012-09-25 09:46:23 -07:00
Jean-Baptiste Queru
1b24275976
Merge into jb-mr1-dev
...
Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5
2012-09-25 09:31:15 -07:00
Jean-Baptiste Queru
6fb2514cdf
Merge into jb-mr1-dev
...
Change-Id: I1baab28b12364213673ed7992207ad198491f286
2012-09-25 09:25:15 -07:00
Martijn Coenen
8f862ef9f7
Add NfcBarcode technology API.
...
Supporting only Kovio barcode technology for now.
Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
2012-09-25 09:22:16 -07:00
Kristian Monsen
7f37a5028f
am 20d2bcf8: am 7ae8a60f: Merge "Hiding a method for JB-MR1" into jb-mr1-dev
...
* commit '20d2bcf899ece7a39dcf120bd9cfdfb235f6198f':
Hiding a method for JB-MR1
2012-09-25 07:32:36 -07:00
Kristian Monsen
7ae8a60f35
Merge "Hiding a method for JB-MR1" into jb-mr1-dev
2012-09-25 07:29:13 -07:00
Philip Milne
8c549d6ffe
Merge "Bug #6110465 . Optical bounds support for all ViewGroup subclasses."
2012-09-24 20:55:00 -07:00
Kristian Monsen
d0b90d30d8
Hiding a method for JB-MR1
...
This one got left out in the last round of method hiding.
This got lost in the last round of method hiding.
Change-Id: I3c6aa234dd29933cb32d0cd91830d47289e7e639
2012-09-24 19:11:30 -04:00