OSDN Git Service
Baligh Uddin [Tue, 12 Feb 2013 21:13:01 +0000 (21:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Daniel Sandler [Tue, 12 Feb 2013 19:59:54 +0000 (19:59 +0000)]
Merge "Historical notification access API."
Michael Jurka [Tue, 12 Feb 2013 19:56:53 +0000 (19:56 +0000)]
Merge "Fix Recents transition for RTL languages"
Wink Saville [Tue, 12 Feb 2013 19:55:12 +0000 (19:55 +0000)]
Merge "Turn off debug in CellInfoLte."
Daniel Sandler [Tue, 12 Feb 2013 13:14:52 +0000 (08:14 -0500)]
Historical notification access API.
Similar to getActiveNotifications(),
getHistoricalNotifications() returns a list of all
notifications that have been posted, in
reverse-chronological order. It currently includes duplicate
entries for notifications that have been updated (so it
really is tracking every notification that has been posted
to the system).
Change-Id: Icce8d6f96bbe76710c989fd0068ff971c6498605
Baligh Uddin [Tue, 12 Feb 2013 19:24:15 +0000 (11:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I06e0cc4a9f16f2356a25011fb5784eb5475a6591
Auto-generated-cl: translation import
Marco Nelissen [Tue, 12 Feb 2013 19:16:17 +0000 (11:16 -0800)]
am
789e3fa0: am
9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
789e3fa052747feb72e8ffdc778d5bc19a718c06':
Revert "use utf8_length() instead of local function, isValidUtf8()"
Marco Nelissen [Tue, 12 Feb 2013 19:14:48 +0000 (11:14 -0800)]
am
9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
# Via Gerrit Code Review
* commit '
9f03d4f921fab5757a791653891ce73c2d006e20':
Revert "use utf8_length() instead of local function, isValidUtf8()"
Robert Ly [Tue, 12 Feb 2013 19:02:43 +0000 (19:02 +0000)]
Merge "resolved conflicts for merge of
6db87978 to master"
Robert Ly [Tue, 12 Feb 2013 18:55:43 +0000 (10:55 -0800)]
resolved conflicts for merge of
6db87978 to master
Change-Id: If439f5730e32fb2044a1e464fab0f6afb6bf1d08
Dianne Hackborn [Tue, 12 Feb 2013 18:54:22 +0000 (18:54 +0000)]
Merge "App ops: the draw on top op now actually controls what is drawn."
Robert Ly [Tue, 12 Feb 2013 18:48:07 +0000 (10:48 -0800)]
am
f38aed8c: am
f303a7fd: am
a95a64dd: am
dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
# Via Android Git Automerger (3) and Android (Google) Code Review (2)
* commit '
f38aed8c2c0eaceac0176ff2ddec6db50f4a4080':
Revert "makefile changes for s.a.c"
Wink Saville [Tue, 12 Feb 2013 18:47:32 +0000 (10:47 -0800)]
Turn off debug in CellInfoLte.
Change-Id: Icf3ea5dad9eef71f644de2292db0b0d3960ced9d
Romain Guy [Tue, 12 Feb 2013 18:46:29 +0000 (18:46 +0000)]
Merge "Prevent crash when setting up a stencil-based clip Bug #
8177690"
Marco Nelissen [Tue, 12 Feb 2013 18:46:21 +0000 (18:46 +0000)]
Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
Robert Ly [Tue, 12 Feb 2013 18:44:55 +0000 (10:44 -0800)]
am
f303a7fd: am
a95a64dd: am
dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
# Via Android (Google) Code Review (2) and Android Git Automerger (2)
* commit '
f303a7fd774f97eca79bfa44eb7d25a394d0abf4':
Revert "makefile changes for s.a.c"
Robert Ly [Tue, 12 Feb 2013 18:43:16 +0000 (10:43 -0800)]
am
a95a64dd: am
dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit '
a95a64ddd6155e90308aa1368e2c8098d86e677f':
Revert "makefile changes for s.a.c"
Robert Ly [Tue, 12 Feb 2013 18:41:20 +0000 (10:41 -0800)]
am
dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
# Via Android (Google) Code Review
* commit '
dc8ee2066a45adc6a57157c550e65317c8650ca0':
Revert "makefile changes for s.a.c"
Dianne Hackborn [Tue, 12 Feb 2013 03:29:06 +0000 (19:29 -0800)]
App ops: the draw on top op now actually controls what is drawn.
Change-Id: Iccfc0723a0f92108a4f7d631d74efe21dbc6f157
Robert Ly [Tue, 12 Feb 2013 18:37:51 +0000 (18:37 +0000)]
Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
Marco Nelissen [Tue, 12 Feb 2013 18:33:41 +0000 (18:33 +0000)]
Revert "use utf8_length() instead of local function, isValidUtf8()"
This reverts commit
1a8b6c29aaa5a1591097daca0876808cc029cbda
Reason for revert: utf8_length handles a slightly different range than the checkjni code, so it's possible for a given string to pass the utf8_length check, but then fail the jni check.
Change-Id: I81e15c95edd8f89782d8ad9025e68502b9340f22
Irfan Sheriff [Tue, 12 Feb 2013 18:31:37 +0000 (18:31 +0000)]
Merge "Fix NPE"
Robert Ly [Tue, 12 Feb 2013 18:29:10 +0000 (18:29 +0000)]
Revert "makefile changes for s.a.c"
This reverts commit
4c01047ec7b06aabeeae273c7871caa6c3029b84
Change-Id: I4465cfa678717ff7c202347ae6ad36d12d5393bc
Irfan Sheriff [Tue, 12 Feb 2013 17:51:47 +0000 (09:51 -0800)]
Fix NPE
Supplicant sometimes reports 00:00:00:00:00:00 as group owner address causing
an NPE.
Avoid updating from peer list and let connection continue since group owner
address is not essential for data transfer to continue.
Bug:
8158711
Change-Id: I06ce88d7fb426fec4965087968f738dd2a7a7799
Wink Saville [Tue, 12 Feb 2013 18:03:21 +0000 (18:03 +0000)]
Merge "Fix record logging."
Michael Jurka [Tue, 12 Feb 2013 10:15:30 +0000 (10:15 +0000)]
Merge "Prevent SecurityException from crashing Recents"
Robert Ly [Tue, 12 Feb 2013 04:58:43 +0000 (20:58 -0800)]
remove sac make target to fix build
Change-Id: I44c51e12225cd0b1d82bfb70129fefa8ba66e8b4
Scott Main [Tue, 12 Feb 2013 02:15:10 +0000 (18:15 -0800)]
am
4cd50a12: am
b8656b3c: am
42ac0372: am
72091355: am
bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Android Git Automerger (4) and Scott Main (1)
* commit '
4cd50a1212ca0e94569eb04ac1a7f25967c7585c':
docs: nudge dashboard chart to the right to avoid overlap
Jeff Brown [Tue, 12 Feb 2013 02:14:53 +0000 (18:14 -0800)]
am
f98e18e6: am
d9f98c81: Fix build break due to merge.
# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit '
f98e18e68d82dbb508bf2deafa63bcdca643e125':
Fix build break due to merge.
Robert Ly [Tue, 12 Feb 2013 02:14:45 +0000 (18:14 -0800)]
am
a578ade2: am
1c4311cc: am
4af36f4e: am
96b1b403: am
4c01047e: makefile changes for s.a.c
# Via Android Git Automerger (4) and Robert Ly (1)
* commit '
a578ade219c07a04f7e8374939734de6ca7cc478':
makefile changes for s.a.c
Romain Guy [Tue, 12 Feb 2013 02:01:20 +0000 (18:01 -0800)]
Prevent crash when setting up a stencil-based clip
Bug #
8177690
Clear the layers before we setup the stencil to avoid dereferencing
the recently deleted rects.
Change-Id: I5dce5f965672f276f9490636d85b6018d3ab9422
Romain Guy [Tue, 12 Feb 2013 01:49:23 +0000 (01:49 +0000)]
Merge "Always honor fixed size children"
Svetoslav [Tue, 12 Feb 2013 01:48:47 +0000 (01:48 +0000)]
Merge "Optimize loading of resource name when reported to accessibility."
Romain Guy [Tue, 12 Feb 2013 01:43:59 +0000 (17:43 -0800)]
Always honor fixed size children
Change-Id: If49a9486c554223132663cd9f0dc388d102ebbff
Svetoslav [Mon, 11 Feb 2013 23:43:46 +0000 (15:43 -0800)]
Optimize loading of resource name when reported to accessibility.
Loading of the resource id name was unnecessarily complex and
was generating spam in the log as a result.
bug:
8153518
Change-Id: Ib2c1118fd36b86ba8ce803ba3190fa01ab06e8c3
Dirk Dougherty [Tue, 12 Feb 2013 01:34:23 +0000 (17:34 -0800)]
am
ef1d1793: am
c0614c44: am
b6efefb4: am
337d3e32: am
7d849491: Doc change: fix typos.
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit '
ef1d17938e9ae3cd02c4b72b331d3892f369138a':
Doc change: fix typos.
Dianne Hackborn [Tue, 12 Feb 2013 01:03:32 +0000 (17:03 -0800)]
Fix build.
Change-Id: Iaace063eaa65af842effa3e0b481a0629db58e42
Scott Main [Tue, 12 Feb 2013 00:59:42 +0000 (16:59 -0800)]
am
b8656b3c: am
42ac0372: am
72091355: am
bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Android Git Automerger (3) and Scott Main (1)
* commit '
b8656b3c7af99c8951459661fa5352adde5d2645':
docs: nudge dashboard chart to the right to avoid overlap
Scott Main [Tue, 12 Feb 2013 00:57:14 +0000 (16:57 -0800)]
am
42ac0372: am
72091355: am
bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
42ac0372159e3204f20de0ad94e51932aab4a030':
docs: nudge dashboard chart to the right to avoid overlap
Scott Main [Tue, 12 Feb 2013 00:55:08 +0000 (16:55 -0800)]
am
72091355: am
bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
7209135504313c27da4f277235e00db6851b9577':
docs: nudge dashboard chart to the right to avoid overlap
Scott Main [Tue, 12 Feb 2013 00:52:51 +0000 (16:52 -0800)]
am
bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Scott Main
* commit '
bfec2a01896959ba2bc9a995238eb31644ea8dc6':
docs: nudge dashboard chart to the right to avoid overlap
Dianne Hackborn [Tue, 12 Feb 2013 00:44:26 +0000 (00:44 +0000)]
Merge "Fix issue #
8176917: Stabillity : Native Crash :"
Dianne Hackborn [Tue, 12 Feb 2013 00:40:54 +0000 (00:40 +0000)]
Merge "App ops: cleanup, handle root and shell, perms."
Dianne Hackborn [Tue, 12 Feb 2013 00:18:42 +0000 (16:18 -0800)]
Fix issue #
8176917: Stabillity : Native Crash :
/system/lib/libandroidfw.so
Change-Id: I235470fac7ad0f5a5d3432006f4dfa69620e30d8
Wink Saville [Tue, 12 Feb 2013 00:16:02 +0000 (16:16 -0800)]
Fix record logging.
Change-Id: I246159dec9522e58ee88593000ac0f86aff4bb25
Robert Greenwalt [Mon, 11 Feb 2013 23:57:39 +0000 (23:57 +0000)]
Merge "Reintroduce the net.dns system properties <TEMP>"
Amith Yamasani [Mon, 11 Feb 2013 23:47:30 +0000 (15:47 -0800)]
Fix UserManager test
Change-Id: I927ffdda3dd5f69dc136e65c8069f2e480badfe9
Dianne Hackborn [Mon, 11 Feb 2013 18:52:46 +0000 (10:52 -0800)]
App ops: cleanup, handle root and shell, perms.
Rework how the shell user is defined so that it is
associated with an actual apk, instead of being a free
roaming uid with special permissions assigned to it.
This allows us to correctly account for its operations
in app ops.
Implement a special case for the root user in app ops --
it is always allowed, always with the package name "root".
Add various code to take care of cleaning up package state
from app ops -- when packages are uninstalled, and during
boot if any packages currently being stored no longer exist.
Also fix a bug in the activity manager to correctly grant
permissions in all cases when onNewIntent() is being called.
Change-Id: Iae9f6d793ee48b93518c984ad957e46ae4582581
Robert Greenwalt [Mon, 11 Feb 2013 23:25:10 +0000 (15:25 -0800)]
Reintroduce the net.dns system properties <TEMP>
Removing these properties broke video playback as they used
a custom dns resolver. We'll work together to resolve our
resolver issues in the future, but this was the easy fix to
get things working again.
bug:
8173236
Change-Id: I687dae59eda4fc449efc34eed11c3dc88a110ad0
Amith Yamasani [Mon, 11 Feb 2013 23:16:41 +0000 (23:16 +0000)]
Merge "Starting point for User Restrictions API"
Winson Chung [Mon, 11 Feb 2013 23:01:06 +0000 (23:01 +0000)]
Merge "Manually recycling bitmap memory when rotating ss, resetting canvas bitmap, adding logging. (Bug
7974275)"
Winson Chung [Mon, 11 Feb 2013 22:58:45 +0000 (14:58 -0800)]
Manually recycling bitmap memory when rotating ss, resetting canvas bitmap, adding logging. (Bug
7974275)
Change-Id: I1b0590a297610ee5fee4e68222144780ab6e55ec
Fabrice Di Meglio [Mon, 11 Feb 2013 22:42:56 +0000 (22:42 +0000)]
Merge "Fix bug #
7381967 Add RTL APIs to ViewParent"
Fabrice Di Meglio [Sat, 9 Feb 2013 02:15:07 +0000 (18:15 -0800)]
Fix bug #
7381967 Add RTL APIs to ViewParent
- add RTL apis to ViewParent
- remove awful and performance bottleneck casts in View during LayoutDirection,
TextDirection and TextAlignment resolutions.
Change-Id: I92a56b16382e13c28c1dad35f6f205620eb01bfe
Jeff Brown [Mon, 11 Feb 2013 22:39:54 +0000 (14:39 -0800)]
am
d9f98c81: Fix build break due to merge.
# Via Jean-Baptiste Queru
* commit '
d9f98c81068594c33c81b5b817391c6b4b895492':
Fix build break due to merge.
Scott Main [Mon, 11 Feb 2013 22:24:03 +0000 (14:24 -0800)]
docs: nudge dashboard chart to the right to avoid overlap
Change-Id: I852004b6dbd7ca8343a20f05da1166cff2d2898a
Robert Ly [Mon, 11 Feb 2013 22:17:33 +0000 (14:17 -0800)]
am
1c4311cc: am
4af36f4e: am
96b1b403: am
4c01047e: makefile changes for s.a.c
# Via Android Git Automerger (3) and Robert Ly (1)
* commit '
1c4311cc9c0e32d30ff17083f24fb7145336fcae':
makefile changes for s.a.c
Robert Ly [Mon, 11 Feb 2013 22:15:21 +0000 (14:15 -0800)]
am
4af36f4e: am
96b1b403: am
4c01047e: makefile changes for s.a.c
# Via Android Git Automerger (2) and Robert Ly (1)
* commit '
4af36f4ebea986a690df12659c4225c3a23484be':
makefile changes for s.a.c
Craig Mautner [Mon, 11 Feb 2013 22:13:48 +0000 (22:13 +0000)]
Merge "Make ActivityStack.mHistory private."
Robert Ly [Mon, 11 Feb 2013 22:13:12 +0000 (14:13 -0800)]
am
96b1b403: am
4c01047e: makefile changes for s.a.c
# Via Android Git Automerger (1) and Robert Ly (1)
* commit '
96b1b403b6ecf0daa2d7d0a8475e0d087790e457':
makefile changes for s.a.c
Robert Ly [Mon, 11 Feb 2013 22:10:00 +0000 (14:10 -0800)]
am
4c01047e: makefile changes for s.a.c
# Via Robert Ly
* commit '
4c01047ec7b06aabeeae273c7871caa6c3029b84':
makefile changes for s.a.c
Robert Ly [Fri, 8 Feb 2013 22:37:13 +0000 (14:37 -0800)]
makefile changes for s.a.c
Change-Id: I501cc140994b2822c3df1f00639076f17765f256
Svetoslav [Mon, 11 Feb 2013 21:03:08 +0000 (21:03 +0000)]
Merge "Refactoring of the Accessibility."
Svetoslav [Fri, 8 Feb 2013 03:21:42 +0000 (19:21 -0800)]
Refactoring of the Accessibility.
1. The accessibility manager service updates its internal state
based on which settings are enabled, what accessibility services
are installed and what features are requested by the enabled
services. It was trying to do the minimal amount of work to
react to contextual changes like these which resulted in missed
cases and complex code. Now there is a single method that reads
the contextual information and single method that reacts to
contextual changes. This makes the code much easier to maintain.
2. The accessibility manager service was not updating its internal
state when requested features from accessibility services change.
It was relying on changing system settings and reacting to the
settings change. This is problematic since the internal state is
not updated atomically which leads to race condition bugs. For
example, if touch exploration is enabled and a service requests
it is disabled, the internal state will not be updated but a
request for a settings change will be made. Now while the settings
change is propagating another request form the same service
comes to enable touch exploration but the system incorrectly
thinks touch exploration is enabled. At the end the feature is
disabled even though it was requested.
3. Fixed a potential NPE if the accessibility input filter's event
handler was nullified between processing two event batches.
4. Fixed a bug where, if magnification is enabled, it does not work
on the settings screen since the magnified bounds are not pushed
from the window manager to the accessibility manager.
Change-Id: Idf629a06480e12f0d88372762df6c024fe0d7856
Jeff Brown [Sat, 9 Feb 2013 01:16:31 +0000 (17:16 -0800)]
Fix build break due to merge.
Change-Id: I08c39690ee9de825ff51afc7d102ee622af6ba13
Dirk Dougherty [Mon, 11 Feb 2013 19:32:06 +0000 (11:32 -0800)]
am
c0614c44: am
b6efefb4: am
337d3e32: am
7d849491: Doc change: fix typos.
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '
c0614c4471363e983610e885bf63f101be4ae21c':
Doc change: fix typos.
Dirk Dougherty [Mon, 11 Feb 2013 19:29:16 +0000 (11:29 -0800)]
am
b6efefb4: am
337d3e32: am
7d849491: Doc change: fix typos.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '
b6efefb4bdb05afa4a0c45e78df981706040d99e':
Doc change: fix typos.
Jean-Michel Trivi [Mon, 11 Feb 2013 19:28:49 +0000 (19:28 +0000)]
Merge "Add support for querying whether the music stream is active remotely"
Dirk Dougherty [Mon, 11 Feb 2013 19:26:19 +0000 (11:26 -0800)]
am
337d3e32: am
7d849491: Doc change: fix typos.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
337d3e3240e52ca5321029fdd23d2f2a3e1201d8':
Doc change: fix typos.
Dirk Dougherty [Mon, 11 Feb 2013 19:23:28 +0000 (11:23 -0800)]
am
7d849491: Doc change: fix typos.
# Via Dirk Dougherty
* commit '
7d8494913292dcdbe25d046cbef6e349d904b41c':
Doc change: fix typos.
Dirk Dougherty [Mon, 11 Feb 2013 19:18:59 +0000 (11:18 -0800)]
Doc change: fix typos.
Change-Id: I58c8841c9bf23bc75e1b25d63af917ff56087fdc
Fabrice Di Meglio [Mon, 11 Feb 2013 18:50:47 +0000 (18:50 +0000)]
Merge "Fix bug #
8115437 Need to remove ArabicShaping from Framework"
Jean-Michel Trivi [Tue, 5 Feb 2013 00:24:09 +0000 (16:24 -0800)]
Add support for querying whether the music stream is active remotely
Bug
7485803
Change-Id: I554b44bd35b017fa4030a0d89779066c96594f2b
Craig Mautner [Mon, 11 Feb 2013 17:47:14 +0000 (17:47 +0000)]
Merge "Reset SensorEventListener when listener reenabled."
Craig Mautner [Thu, 17 Jan 2013 22:44:34 +0000 (14:44 -0800)]
Reset SensorEventListener when listener reenabled.
- Following disable and reenable of the WindowOrientationListener
the state was the same as before. State should be reset to default.
- Provide a Handler to the sensor task to deliver events on the
same Thread that WindowManagerPolicy operates on.
- Expand lock protection to all of WindowOrientationListener.
- Move WindowOrientationListener to policy package.
- Make SensorEventListenerImpl non-static.
Fixes bug
7964531.
Change-Id: I17cecf3d0b6d125cb3e4d7350c3adb3f62b684bd
Baligh Uddin [Mon, 11 Feb 2013 16:12:48 +0000 (08:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d6b97a7078b930416335dcf016bc820e1f09845
Auto-generated-cl: translation import
Adam Powell [Sat, 9 Feb 2013 02:38:01 +0000 (02:38 +0000)]
Merge "Fix setting action bar backgrounds after layout"
Adam Powell [Sat, 9 Feb 2013 01:32:24 +0000 (17:32 -0800)]
Fix setting action bar backgrounds after layout
Fix a bug that would prevent the drawable bounds from being set
correctly for action bar containers.
Change-Id: I396aa40e3d8f6e3b47bcd438e1f26bbfc7b20a7f
Dianne Hackborn [Sat, 9 Feb 2013 01:18:37 +0000 (01:18 +0000)]
Merge "Fix issue #
8133857: Tracking ANR in Gallery"
Dianne Hackborn [Fri, 8 Feb 2013 23:32:05 +0000 (15:32 -0800)]
Fix issue #
8133857: Tracking ANR in Gallery
Reworking the locking in resources so that we never hold the
state lock while calling in to potential long running operations.
This means the mTmpValue can no longer be final (since we need
to use it while the lock isn't held), so a new field needs to
be added as the lock and everything that touches mTmpValue must
deal with it being null, restoring the value in there when
possible, etc.
Change-Id: Ie5ffd0f66e5f2d0e869a62d72e7a55b1c74fe872
Jeff Brown [Sat, 9 Feb 2013 01:16:31 +0000 (17:16 -0800)]
Fix build break due to merge.
Change-Id: I08c39690ee9de825ff51afc7d102ee622af6ba13
Jeff Brown [Sat, 9 Feb 2013 01:03:42 +0000 (17:03 -0800)]
am
4fd60792: am
5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"
# By Tim Roes
# Via Android Git Automerger (1) and others
* commit '
4fd60792473711a10dc9b27faa1a35efe9e4d6a0':
Complete documentation of whereArgs (Issue #43061)
Jeff Brown [Sat, 9 Feb 2013 01:03:38 +0000 (17:03 -0800)]
am
64f4de03: am
fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Android Git Automerger (1) and others
* commit '
64f4de03037b279e389ca20297e9d5086f49564c':
frameworks/base: Added English UK keyboard layout for physical keyboards
Jeff Brown [Sat, 9 Feb 2013 00:58:14 +0000 (16:58 -0800)]
am
5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"
# By Tim Roes
# Via Gerrit Code Review (1) and Tim Roes (1)
* commit '
5262a1082663610a888d1145fd9676f7db41d397':
Complete documentation of whereArgs (Issue #43061)
Jeff Brown [Sat, 9 Feb 2013 00:58:09 +0000 (16:58 -0800)]
am
fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Gerrit Code Review (1) and Matt Beale (1)
* commit '
fa49a6b13ebf496ea01d5981f69084596d06d464':
frameworks/base: Added English UK keyboard layout for physical keyboards
Jeff Brown [Fri, 8 Feb 2013 23:56:04 +0000 (15:56 -0800)]
am
110fe9b3: am
fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (1) and others
* commit '
110fe9b303be527c30a8af95b6fb7afac12968b5':
Fix ViewRootImpl to find missing focus using D-pad.
Amith Yamasani [Mon, 17 Dec 2012 19:12:09 +0000 (11:12 -0800)]
Starting point for User Restrictions API
Restrictions saved as key/value pairs, mostly booleans right now
but might be expanded to other types later.
Save and restore restrictions in the user manager service.
Enforce some of the restrictions at the framework level. Some
are enforced (also) at the app level, such as in Settings.
Change-Id: Id11ffe129cb6a177e094edf79635727388c26f40
Jeff Brown [Fri, 8 Feb 2013 23:49:51 +0000 (23:49 +0000)]
Merge "Complete documentation of whereArgs (Issue #43061)"
Jeff Brown [Fri, 8 Feb 2013 23:49:46 +0000 (15:49 -0800)]
am
fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit '
fe1f3a1beff9f73f6a04bcc35239038a21bc38ff':
Fix ViewRootImpl to find missing focus using D-pad.
Jeff Brown [Fri, 8 Feb 2013 23:49:10 +0000 (23:49 +0000)]
Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
The Android Open Source Project [Fri, 8 Feb 2013 23:45:50 +0000 (15:45 -0800)]
am
4b71a472: (-s ours) Reconcile with jb-mr1.1-release - do not merge
# Via The Android Automerger (2) and The Android Open Source Project (1)
* commit '
4b71a472c0f254606e93b8f9f86f7df0e6dba522':
The Android Open Source Project [Fri, 8 Feb 2013 23:40:41 +0000 (15:40 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I728b304c185d7f0406b6d45334c10263bd38d769
Jeff Brown [Fri, 8 Feb 2013 23:29:11 +0000 (23:29 +0000)]
Merge "Fix ViewRootImpl to find missing focus using D-pad."
Craig Mautner [Fri, 8 Feb 2013 22:31:27 +0000 (14:31 -0800)]
Make ActivityStack.mHistory private.
Isolate the Activity history for later conversion to Task-based
management.
Change-Id: I4b6bf22de035c768aa705df0cc4f84486e8ede56
Romain Guy [Fri, 8 Feb 2013 22:01:05 +0000 (22:01 +0000)]
Merge "Deprecate useless BitmapDrawable constructor Bug #
2590549"
Romain Guy [Fri, 8 Feb 2013 21:58:53 +0000 (13:58 -0800)]
Deprecate useless BitmapDrawable constructor
Bug #
2590549
Change-Id: Icb45bf2d9836c43ed0825105f64d7b98afcdcdac
Romain Guy [Fri, 8 Feb 2013 21:57:24 +0000 (21:57 +0000)]
Merge "Apply the clip rect/region to drawLines()"
The Android Automerger [Fri, 8 Feb 2013 21:51:07 +0000 (13:51 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Romain Guy [Fri, 8 Feb 2013 21:46:40 +0000 (13:46 -0800)]
Apply the clip rect/region to drawLines()
Without the check to quickReject, drawConvexPath would never
setup the clip properly.
Change-Id: I23e5b25de3383c9e9b86eea4ee7a9552f8d9efb4
Dirk Dougherty [Fri, 8 Feb 2013 19:43:07 +0000 (11:43 -0800)]
am
b555029e: am
2e65e20c: am
9b8b4ae5: am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
b555029e411498b86efad38a1948e4cfb4f43dd1':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.