Romain Guy
484f3bdcd6
Merge "Add support for non-antialiased text"
2013-02-05 23:02:44 +00:00
Svetoslav
92826459d1
Fix a javaDoc error
...
Change-Id: Ia23660f102455aefad80cb75a8bbd8fc0d4455c3
2013-02-05 14:57:42 -08:00
Romain Guy
b969a0de65
Add support for non-antialiased text
...
Change-Id: I17c073955ab94abc9b409e5fcfbc675faa07c5ba
2013-02-05 14:44:43 -08:00
Svetoslav
506f65c304
Merge "Ensure touch explorer and magnifier get a well-formed event stream."
2013-02-05 22:35:02 +00:00
Svetoslav
dc3edbb0e5
Merge "Rename a member variable"
2013-02-05 22:32:23 +00:00
Svetoslav
22431a3b6f
Rename a member variable
...
Change-Id: I1f7a3b8119d84a1119637f79fcd3c29f8b79ef27
2013-02-05 14:31:39 -08:00
Craig Mautner
3fed9f185e
am e57ed27a: am 246a283c: am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"
...
# By Sangkyu Lee
# Via Android Git Automerger (2) and others
* commit 'e57ed27a142bdc3b626d10b3806eb24df064e8d3':
Fix unexpected rotation change when re-enabling auto-rotate
2013-02-05 14:30:08 -08:00
Craig Mautner
e57ed27a14
am 246a283c: am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"
...
# By Sangkyu Lee
# Via Android Git Automerger (1) and others
* commit '246a283c007e007181f8892df514dfe04121b7a5':
Fix unexpected rotation change when re-enabling auto-rotate
2013-02-05 14:26:28 -08:00
Craig Mautner
246a283c00
am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"
...
# By Sangkyu Lee
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit 'fd5a0b3681499cbee0d1156b3b6f93fc91320848':
Fix unexpected rotation change when re-enabling auto-rotate
2013-02-05 14:24:10 -08:00
Scott Main
b47fa1699a
docs: fix renderscript links that currently require redirect
...
Change-Id: Ie12ff2c4be5ca22ac43dfe3a16868c7bef8e4ae8
2013-02-05 14:23:13 -08:00
Svetoslav
eecedffe42
Renaming some APIs
...
Change-Id: I9e226d39648796f95dd0e86ffecbb3f93544243b
2013-02-05 14:07:15 -08:00
The Android Open Source Project
d36aa68ea2
am aee2de93: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
# Via The Android Automerger (8) and The Android Open Source Project (1)
* commit 'aee2de934d55c27f695d8fb10b775718871ecbd7':
2013-02-05 13:52:43 -08:00
The Android Open Source Project
aee2de934d
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I7375c870961b812350a960b43344619cdd9ed8ea
2013-02-05 13:50:17 -08:00
Svetoslav Ganov
c163c606f6
Merge "Handle WebKit selection changes synchronously."
2013-02-05 21:47:22 +00:00
Svetoslav
191bdba819
Merge "Set accessibility cursor position in non-editable views with content description."
2013-02-05 21:45:50 +00:00
Svetoslav
d0c83cccca
Set accessibility cursor position in non-editable views with content description.
...
While an accessibility service can set the cursor position in an editable
text field, it was not possible to set it for non-editable views with
content description. This patch enables that.
bug:8134469
Change-Id: I28b0ef1666b9e3ed5c0642718fbe63d4c9616569
2013-02-05 13:44:25 -08:00
JP Abgrall
a61bb2375c
Merge "LocationManagerService: Add debug flag lookup from properties"
2013-02-05 21:41:07 +00:00
Jeff Sharkey
b932319bff
Require that bugreport requesters have DUMP.
...
Bug: 8139970
Change-Id: I055855fa5450521122e54ed39df5981190b401bd
2013-02-05 13:32:18 -08:00
Craig Mautner
fd5a0b3681
Merge "Fix unexpected rotation change when re-enabling auto-rotate"
2013-02-05 21:31:12 +00:00
quddusc
da27e5a2c4
am a8ce4020: am 77c6f8ee: am a6a320ab: am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330
...
# Via Android Git Automerger (4) and quddusc (1)
* commit 'a8ce402078b84a112d13d8ea0de3fe123e1f2a97':
docs: Removed the -e runner subcommand option. Bug: 7562330
2013-02-05 12:39:08 -08:00
quddusc
a8ce402078
am 77c6f8ee: am a6a320ab: am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330
...
# Via Android Git Automerger (3) and quddusc (1)
* commit '77c6f8ee22c66c829ea91740d178ff3323e1cb67':
docs: Removed the -e runner subcommand option. Bug: 7562330
2013-02-05 12:36:11 -08:00
quddusc
77c6f8ee22
am a6a320ab: am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330
...
# Via Android Git Automerger (2) and quddusc (1)
* commit 'a6a320ab6699e17d22aea8fa21345e86cae0349c':
docs: Removed the -e runner subcommand option. Bug: 7562330
2013-02-05 12:33:52 -08:00
quddusc
a6a320ab66
am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330
...
# Via Android Git Automerger (1) and quddusc (1)
* commit '640d570d255988ed9942cda6df5f162328668437':
docs: Removed the -e runner subcommand option. Bug: 7562330
2013-02-05 12:31:45 -08:00
quddusc
640d570d25
am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330
...
# Via quddusc
* commit '1247fbd43fc9d5492cb97d6313e851a6518ab4b8':
docs: Removed the -e runner subcommand option. Bug: 7562330
2013-02-05 12:29:08 -08:00
The Android Automerger
afd51f18e5
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2013-02-05 12:24:23 -08:00
Dianne Hackborn
f51f61269a
App ops: new operations for SMS.
...
Implementation required a new framework feature
to associate an app op with a broadcast.
Change-Id: I4ff41a52f7ad4ee8fd80cbf7b394f04d6c4315b3
2013-02-05 11:56:12 -08:00
quddusc
1247fbd43f
docs: Removed the -e runner subcommand option.
...
Bug: 7562330
Change-Id: I5fb7ee00583a8c25745796721ded8f6cba6f09ca
2013-02-05 11:37:46 -08:00
Victoria Lease
09eeaecf74
refactor isAllowedBySettingsLocked()
...
This commit splits LocationManagerService.isAllowedBySettingsLocked()
into isAllowedByUserSettingsRogkei(), which takes a UID argument, and
isAllowedByCurrentUserSettingsLocked(), which does not. This removes
the need to generate synthetic UIDs with arbitrary application IDs
and makes more explicit when LocationManagerService is acting on
behalf of a caller and when it is acting on behalf of the device's
current active user.
Change-Id: I2cb8fb52687d2629848e5a4b66a4bda8f0f66fe1
2013-02-05 11:34:13 -08:00
Baligh Uddin
b861479108
Merge "Import translations. DO NOT MERGE"
2013-02-05 19:23:46 +00:00
Alon Albert
0a35dd5660
Copy EVENT_COLOR_KEY as String
...
Change-Id: I84eda41d0b9c091f3d152cc3e899cb40b52ed949
2013-02-05 11:07:56 -08:00
Derek Sollenberger
6c0307dd0a
Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'
...
bug: 6906025
2013-02-05 13:53:47 -05:00
Robert Ly
10c66163a8
am a2cd828b: am 9fcde2e7: am cb815699: am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
...
# Via Android Git Automerger (5) and others
* commit 'a2cd828b749c444d55c2c41c7dbb85088ff94b9f':
docs: update javadocs for gms and gcm
2013-02-05 10:32:32 -08:00
Robert Ly
a2cd828b74
am 9fcde2e7: am cb815699: am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
...
# Via Android Git Automerger (4) and others
* commit '9fcde2e7466c29b302cc15ed2d1233f93d7f0b0e':
docs: update javadocs for gms and gcm
2013-02-05 10:29:49 -08:00
Daniel Sandler
8bc623a16e
am fc12f1e3: Merge "Log messages to debug stuck status bars."
...
# Via Android (Google) Code Review (1) and Daniel Sandler (1)
* commit 'fc12f1e37bfa0f9240ed5f6af999a9fbba507fb0':
Log messages to debug stuck status bars.
2013-02-05 10:29:05 -08:00
Daniel Sandler
fc12f1e37b
Merge "Log messages to debug stuck status bars."
2013-02-05 18:25:50 +00:00
Robert Ly
9fcde2e746
am cb815699: am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
...
# Via Android Git Automerger (3) and others
* commit 'cb8156996a3bf5f75ea3dd7c289970bae32079ce':
docs: update javadocs for gms and gcm
2013-02-05 10:23:04 -08:00
Robert Ly
cb8156996a
am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
...
# Via Android Git Automerger (2) and others
* commit '00e9db5d927e1c725665159f6b5c15e0c33a4c1b':
docs: update javadocs for gms and gcm
2013-02-05 10:21:41 -08:00
Robert Ly
00e9db5d92
am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and others
* commit 'b23a35a3b9f44f3f673e9cacc3684d034414df27':
docs: update javadocs for gms and gcm
2013-02-05 10:20:42 -08:00
Daniel Sandler
2b99a49c2e
Log messages to debug stuck status bars.
...
Bug: 7686690
Change-Id: If9660767a8ce6315dcd4b0c52f377069fefeb7a1
2013-02-05 13:18:07 -05:00
Derek Sollenberger
f5db9b8ed4
Merge "Changes needed to roll Skia to r7527." into master-chromium
2013-02-05 18:17:56 +00:00
Robert Ly
b23a35a3b9
am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'ba84a04a2f98683f08cc7c73ec60341dc77d1eb9':
docs: update javadocs for gms and gcm
2013-02-05 10:15:57 -08:00
Robert Ly
ba84a04a2f
Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
2013-02-05 18:12:56 +00:00
Victoria Lease
63af7a113b
am 080df3f3: Merge "dual-mode switching single/multiuser ServiceWatcher"
...
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit '080df3f38fc47f15ad321fff00689dcd07e1d075':
dual-mode switching single/multiuser ServiceWatcher
2013-02-05 09:45:16 -08:00
Victoria Lease
080df3f38f
Merge "dual-mode switching single/multiuser ServiceWatcher"
2013-02-05 17:38:48 +00:00
Alon Albert
59b3cfee69
am 2d6ef862: Merge "Add EVENT_COLOR\'s to Event Entity Iterator"
...
# Via Alon Albert (1) and Android (Google) Code Review (1)
* commit '2d6ef86241e981bff217891e52f2b689dae9a6c1':
Add EVENT_COLOR's to Event Entity Iterator
2013-02-05 09:35:19 -08:00
Alon Albert
2d6ef86241
Merge "Add EVENT_COLOR's to Event Entity Iterator"
2013-02-05 17:30:50 +00:00
Robert Ly
f6f5cf484c
docs: update javadocs for gms and gcm
...
Change-Id: If5c80d3fac68a6351b652a19c199de1107ebd593
2013-02-05 09:26:35 -08:00
Martin Kosiba
3bbac97856
am 5ee743ee: Ensure the WebView provider is created onVisibilityChanged.
...
# Via Marcin Kosiba
* commit '5ee743eef7161aeef8102f4fc46012d3e423c5ca':
Ensure the WebView provider is created onVisibilityChanged.
2013-02-05 07:29:37 -08:00
Martin Kosiba
5ee743eef7
Ensure the WebView provider is created onVisibilityChanged.
...
It is possible for onVisibilityChanged to be called during
WebView construciton.
BUG=7622923
Change-Id: Ie87dae537e1e6dd44d96e9e56982abbc134a31a0
2013-02-05 15:26:39 +00:00
Mathias Agopian
7f84c065fa
allow the framework to access a Sensor's handle
...
this is needed in another CL to fix an issue where
sensors power usage is always reported as 0.
Change-Id: Ie496b98bf4b7e69911bdc99bee14cc924e1d71e8
2013-02-04 19:22:47 -08:00