OSDN Git Service
Geremy Condra [Thu, 31 Jan 2013 19:24:40 +0000 (19:24 +0000)]
Merge changes I4859c8db,I7643024d
* changes:
Add the TZInfo updater and relevant intent.
Fix ConfigUpdater for binary files.
Svetoslav [Thu, 31 Jan 2013 07:53:43 +0000 (07:53 +0000)]
Merge "Add accessibility actions for text editing."
Svetoslav [Thu, 31 Jan 2013 07:02:08 +0000 (23:02 -0800)]
Add accessibility actions for text editing.
Currently text editing is pretty hard (certain operations even
impossible) for a blind person. To address the issue this change
adds APIs that enable an accessibility service to perform basic
text editing operations such as copy, paste, cut, set selection,
extend selection while moving at a given granularity.
The new APIs enable an accessibility service to expose a gesture
driven efficient text editing facility.
bug:
8098384
Change-Id: I82b200138a3fdf4c0c316b774fc08a096ced29d0
Svetoslav [Thu, 31 Jan 2013 03:16:59 +0000 (03:16 +0000)]
Merge "Remove "enhance web scripts" from settings and make it requested by plug-ins."
Xia Wang [Thu, 31 Jan 2013 03:03:39 +0000 (19:03 -0800)]
am
63d25816: am
599f9611: am
f3ef10b1: am
2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android Git Automerger (3) and others
* commit '
63d258167637309c0c85725ecc9112a88bf57824':
Fix WiFi test:
Xia Wang [Thu, 31 Jan 2013 03:01:14 +0000 (19:01 -0800)]
am
599f9611: am
f3ef10b1: am
2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '
599f9611aab587d13b4d7bac94fc628c675591a1':
Fix WiFi test:
Xia Wang [Thu, 31 Jan 2013 02:59:22 +0000 (18:59 -0800)]
am
f3ef10b1: am
2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and others
* commit '
f3ef10b12b61891962eb6253e95c8c9eec82d383':
Fix WiFi test:
Xia Wang [Thu, 31 Jan 2013 02:57:50 +0000 (18:57 -0800)]
am
2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and Xia Wang (1)
* commit '
2297d1e78cc70d4e19d9e7c66d24fc494455166c':
Fix WiFi test:
Xia Wang [Thu, 31 Jan 2013 02:54:55 +0000 (02:54 +0000)]
Merge "Fix WiFi test:" into jb-mr1.1-dev
Xia Wang [Wed, 30 Jan 2013 23:02:21 +0000 (15:02 -0800)]
Fix WiFi test:
-- In environment where there are too many APs, sometimes, the AP will not show in the scan list.
Part of the reason is due to the change that the scanning on each frequency is shortened to save power.
to avoid that, change the test to connect without scanning.
-- Increase the timer to wait for WiFi to be connected
Change-Id: If1a72607b3c7ad13dbbf788607665986eaf5b6b3
Geremy Condra [Wed, 30 Jan 2013 19:20:26 +0000 (11:20 -0800)]
Add the TZInfo updater and relevant intent.
Also add a hook for ConfigUpdateInstallReciever subclasses to
change the delivery of data- in this case, from raw text to
b64 encoded binary.
Change-Id: I4859c8db1cc97c2427310a108b2fef03975df2b4
Jeff Sharkey [Thu, 31 Jan 2013 00:37:34 +0000 (00:37 +0000)]
Merge "Add wrapping support to IndentingPrintWriter."
Jeff Sharkey [Thu, 31 Jan 2013 00:35:04 +0000 (16:35 -0800)]
Add wrapping support to IndentingPrintWriter.
When created with a wrapping width, any content longer than the
requested width will be wrapped onto additional lines. This supports
use-cases like dumping lots of data with printPair().
Improve documentation and add tests to verify behavior.
Change-Id: Ibdfce198f0e69f4df7725544fd1cd02fa029c647
Wink Saville [Thu, 31 Jan 2013 00:32:36 +0000 (00:32 +0000)]
Merge "Revert "Clean up published network condition reporting.""
Wink Saville [Thu, 31 Jan 2013 00:30:13 +0000 (00:30 +0000)]
Revert "Clean up published network condition reporting."
In some cases causes grey ICON's.
This reverts commit
82413d0b2acad73b9a008e0c53392a54f9555cf8
Change-Id: I09f893d03651c3fb9fcb88ee9e5ac7ce6cb6e273
Romain Guy [Thu, 31 Jan 2013 00:27:55 +0000 (00:27 +0000)]
Merge "Return a copy of the read-only identity Matrix"
Romain Guy [Thu, 31 Jan 2013 00:25:50 +0000 (16:25 -0800)]
Return a copy of the read-only identity Matrix
An app trying to modify the returned matrix (despite what the
documentation says...) would crash when the matrix is identity.
Change-Id: I8aae06b712907085088fb9f0321352dd2c3462ac
Todd Poynor [Wed, 30 Jan 2013 23:20:18 +0000 (23:20 +0000)]
Merge "BatteryService: Treat USB charging ports and charging accessories as AC"
Todd Poynor [Wed, 30 Jan 2013 23:18:39 +0000 (23:18 +0000)]
Merge "BatteryService: Allow power supplies to switch type between AC and USB"
Todd Poynor [Wed, 30 Jan 2013 22:24:12 +0000 (14:24 -0800)]
BatteryService: Treat USB charging ports and charging accessories as AC
Change-Id: If98330b09a1fc44992bb96195804d434a4e20470
Baligh Uddin [Wed, 30 Jan 2013 19:51:57 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Wink Saville [Wed, 30 Jan 2013 19:43:48 +0000 (19:43 +0000)]
Merge "Cleanup StateMachine LogRec handling and get tests working."
Baligh Uddin [Wed, 30 Jan 2013 19:42:14 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Geremy Condra [Wed, 30 Jan 2013 19:19:54 +0000 (11:19 -0800)]
Fix ConfigUpdater for binary files.
Change-Id: I7643024d5d59dcb6c867ad80d32e24e8da83ba0d
Todd Poynor [Wed, 9 Jan 2013 05:00:39 +0000 (21:00 -0800)]
BatteryService: Allow power supplies to switch type between AC and USB
Accomodate power_supply drivers that switch between MAINS and USB type
according to the current power source. Re-read the type attribute when the
power supply is online.
Switch to String8 type for strings stored locally.
Change-Id: Iacce49bf3ad85f35a7295a54df43aff7f94f3100
Wink Saville [Wed, 30 Jan 2013 19:21:22 +0000 (11:21 -0800)]
Cleanup StateMachine LogRec handling and get tests working.
Change-Id: I13107e846812b16f1c95be11626500dbd7a13b2a
Dianne Hackborn [Wed, 30 Jan 2013 19:09:06 +0000 (19:09 +0000)]
Merge "Improve revoking access to content providers."
Jeff Sharkey [Wed, 30 Jan 2013 19:03:31 +0000 (19:03 +0000)]
Merge "Check text length when testing for newline."
Jeff Sharkey [Wed, 30 Jan 2013 18:58:40 +0000 (10:58 -0800)]
Check text length when testing for newline.
Also add tests to verify.
Bug:
8102140
Change-Id: I7e5dbff53caeb50bfa0fb4ea5dce73e3c742986a
Chris Craik [Wed, 30 Jan 2013 18:42:42 +0000 (18:42 +0000)]
Merge "Object-based DisplayList recording"
Nick Kralevich [Wed, 30 Jan 2013 17:51:40 +0000 (09:51 -0800)]
ZygoteInit: more dead code cleanup
ZYGOTE_FORK_MODE has been set to false since 2009, and the
code indicates that runForkMode() was "retained for reference only."
Remove this dead code. There will always be a reference to this code
in git.
Change-Id: Iddfdca8379fdc6521febea81e553de763b6f4fd0
Nick Kralevich [Wed, 30 Jan 2013 17:57:44 +0000 (17:57 +0000)]
Merge "Remove dead code."
Nick Kralevich [Wed, 30 Jan 2013 17:47:34 +0000 (17:47 +0000)]
Merge "ZygoteConnection.java: Remove dead code --peer-wait"
Nick Kralevich [Wed, 30 Jan 2013 17:29:15 +0000 (09:29 -0800)]
Remove dead code.
Setting capabiltities is handled by dalvik. This code
is never called.
Change-Id: I903952c43cf60ea59ec954c9168a7604d05ccaf7
Baligh Uddin [Wed, 30 Jan 2013 17:24:43 +0000 (09:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie7f5b90ff75d3ee01dbfd824cf6b3d7ecb4c2c9b
Auto-generated-cl: translation import
Baligh Uddin [Wed, 30 Jan 2013 17:11:14 +0000 (09:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I513162783e8b9b378765f59cb58d7fd30de66092
Auto-generated-cl: translation import
Nick Kralevich [Wed, 30 Jan 2013 16:45:03 +0000 (08:45 -0800)]
ZygoteConnection.java: Remove dead code --peer-wait
The last caller of this option was removed in
system/core commit
b94fd1abcbff1eacb8a2ad79c51de21ecf8f6d65
Change-Id: I9f3540c9e61b4a93038b43983fbb8badac08a2e3
Przemyslaw Szczepaniak [Wed, 9 Jan 2013 11:52:03 +0000 (11:52 +0000)]
Deprecate unused and implementation-specific parts of TTS API
Second changeset, first one was committed too hastily.
TTS Voice-data related API was originally written with
one engine in mind (pico sVox TTS). It exposes implementation
details that should be private to the engine implementation.
- Deprecating fields of ACTION_CHECK_TTS_DATA results that were
used by sVox language packs to find out location of voice data.
Those fields are TTS engine implementation details and should be
private:
EXTRA_VOICE_DATA_ROOT_DIRECTORY
EXTRA_VOICE_DATA_FILES
EXTRA_VOICE_DATA_FILES_INFO
- Deprecating fields of ACTION_CHECK_TTS_DATA request that are
providing unnescesary functionality (it can be easily done on client
side):
EXTRA_CHECK_VOICE_DATA_FOR
- Deprecating some of the return codes of ACTION_CHECK_TTS_DATA - they
are specific to sVox pico voice data and in all cases can be replaced
by CHECK_VOICE_DATA_FAIL result code.
CHECK_VOICE_DATA_BAD_DATA
CHECK_VOICE_DATA_MISSING_DATA
CHECK_VOICE_DATA_MISSING_VOLUME
- Changing semantics of ACTION_TTS_DATA_INSTALLED intent. It's now
more generic and covers any change of available voice data set (so, not only
adding languages, but also removing them should trigger broadcast. Adding and
removing features to existing locale (like embedded synthesis) should be marked
by broadcast as well).
- Deprecating its EXTRA_TTS_DATA_INSTALLED result field - client should discover
the change by running ACTION_CHECK_TTS_DATA intent.
- Making GetSampleText intent public again - it's used by most TTS engines to
provide unique demonstation data.
- Deprecating TextToSpeech.OnUtteranceCompletedListener - it was replaced
by UtteranceProgressListener in API level 15, but no one put deprecation tag
on it.
Change-Id: Ia58af7f218dc1568570712f435782d2003260e82
Kenny Root [Wed, 30 Jan 2013 07:01:51 +0000 (23:01 -0800)]
am
781bcd68: am
c3ee1d9a: am
7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Android Git Automerger (2) and others
* commit '
781bcd68ce7d701f5d36dd0d1b07d51ef937f0bc':
One more fix for incorrect indices.
Kenny Root [Wed, 30 Jan 2013 06:59:33 +0000 (22:59 -0800)]
am
c3ee1d9a: am
7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Android Git Automerger (1) and others
* commit '
c3ee1d9aea36bb7c33dee6211905d4c1ab2681a1':
One more fix for incorrect indices.
Kenny Root [Wed, 30 Jan 2013 06:56:40 +0000 (22:56 -0800)]
am
7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Gerrit Code Review (1) and Stephen Hines (1)
* commit '
7ad885e2e6c845dbec4f16cd71e859240741dbf9':
One more fix for incorrect indices.
Kenny Root [Wed, 30 Jan 2013 05:54:03 +0000 (05:54 +0000)]
Merge "One more fix for incorrect indices."
Dianne Hackborn [Wed, 30 Jan 2013 02:55:48 +0000 (18:55 -0800)]
Improve revoking access to content providers.
Providers can now hook into the revoked query and insert
calls, and the default implementation of query is a little better.
Change-Id: I29592a579aaf4a98686c6cf43e57f73275c58922
Satoshi Kataoka [Wed, 30 Jan 2013 02:41:46 +0000 (02:41 +0000)]
Merge "Do not turn on imes unexpectedly with unit tests"
Romain Guy [Wed, 30 Jan 2013 01:47:33 +0000 (01:47 +0000)]
Merge "Fix graphical corruption on QCOM GPU Bug #
7146141"
Romain Guy [Wed, 30 Jan 2013 01:26:25 +0000 (17:26 -0800)]
Fix graphical corruption on QCOM GPU
Bug #
7146141
The GL_QCOM_tiled_rendering extension requires careful use of
start/endTiling when attaching a renderbuffer dynamically.
Change-Id: I20036683ed3909ffaf40cc3d57a25257e35b6fa2
Doug Zongker [Wed, 30 Jan 2013 01:09:03 +0000 (17:09 -0800)]
am
9c4ba4fe: am
b616f0c2: add android.permission.LOOP_RADIO for access to loop radio device
# Via Android Git Automerger (1) and Doug Zongker (1)
* commit '
9c4ba4fe752b131b01aa402389c96eb8f24764b8':
add android.permission.LOOP_RADIO for access to loop radio device
Doug Zongker [Wed, 30 Jan 2013 01:01:01 +0000 (17:01 -0800)]
am
b616f0c2: add android.permission.LOOP_RADIO for access to loop radio device
# Via Doug Zongker
* commit '
b616f0c239ad61f818741909821b86aceff60b60':
add android.permission.LOOP_RADIO for access to loop radio device
Dianne Hackborn [Wed, 30 Jan 2013 00:12:48 +0000 (16:12 -0800)]
Maybe fix build.
Change-Id: Ibad8edb15e7cc332d6c29958a386d32a96f4e755
Dianne Hackborn [Tue, 29 Jan 2013 23:55:33 +0000 (23:55 +0000)]
Merge "Add GET_CONTENT protocol for allowing multiple selection."
Dianne Hackborn [Tue, 29 Jan 2013 23:42:11 +0000 (23:42 +0000)]
Merge "Improve configuration of default preferred apps."
Dianne Hackborn [Tue, 29 Jan 2013 23:18:29 +0000 (15:18 -0800)]
Improve configuration of default preferred apps.
The file that defines default preferred apps is now more
robust. It is no longer a raw dump of the package
manager settings, but instead a more general list of a
target activity and filter. When reading it, the remaining
information (match value, set of potential matches) is
determined dynamically.
Change-Id: I0edc6e0d2ed3dd2a6e2238992f18f7fc1f51d8d4
Svetoslav [Tue, 29 Jan 2013 09:04:35 +0000 (01:04 -0800)]
Remove "enhance web scripts" from settings and make it requested by plug-ins.
Currently we have an "enhance web accessibility" setting that has to be
enabled to make sure web content is accessible. We added the setting to
get user consent because we are injecting JavaScript-based screen-reader
pulled from the Google infrastructure. However, many users do not know
that and (as expected) do not read the user documentation, resulting in
critique for lacking accessibility support in WebViews with JavaScript
enabled (Browser, Gmail, etc).
To smoothen the user experience now "enhance web accessibility" is a
feature an accessibility plug-in can request, similarly to explore by
touch. Now a user does not need to know that she has to explicitly
enable the setting and web accessibility will work out-of-the-box.
Before we were showing a dialog when a plug-in tries to put the device
in a touch exploration mode. However, now that we have one more feature
a plug-in can request, showing two dialogs (assume a plug-in wants both
features) will mean that a user should potentially deal with three
dialogs, one for enabling the service, and one for each feature. We
could merge the dialogs but still the user has to poke two dialogs.
It seems that the permission mechanism is a perfect fit for getting
user permission for an app to do something, in this case to enable
an accessibility feature. We need a separate permission for explore
by touch and enhance web accessibility since the former changes the
interaction model and the latter injects JavaScript in web pages. It
is critical to get user consent for the script injection part so we
need a well-documented permission rather a vague umbrella permission
for poking accessibility features. To allow better grouping of the
accessibility permissions this patch adds a permission group as well.
bug:
8089372
Change-Id: Ic125514c34f191aea0416a469e4b3481ab3200b9
Daniel Sandler [Tue, 29 Jan 2013 20:52:43 +0000 (20:52 +0000)]
Merge "Implement support for method calls in the `content` tool."
Daniel Sandler [Tue, 29 Jan 2013 18:47:04 +0000 (13:47 -0500)]
Implement support for method calls in the `content` tool.
$ content call
--uri content://com.example
--method methodname
[--arg optional_string_arg]
[--extra name:s:foo --extra value:i:0]
The URI is just used to resolve the provider. --extra has
the same syntax as --bind.
Change-Id: I98cb89f0174a00e7c29ca0d8c8d809d453de3623
Michael Wright [Tue, 29 Jan 2013 19:09:09 +0000 (19:09 +0000)]
Merge "Changes documention for how input buttons should be labelled"
Doug Zongker [Tue, 29 Jan 2013 17:05:21 +0000 (09:05 -0800)]
add android.permission.LOOP_RADIO for access to loop radio device
Change-Id: I811d70fa67aa758122678809f32b8aade42ced0f
Svetoslav [Tue, 29 Jan 2013 11:22:24 +0000 (11:22 +0000)]
Merge "Update JavaDoc"
Svetoslav [Tue, 29 Jan 2013 11:21:37 +0000 (03:21 -0800)]
Update JavaDoc
Change-Id: I9644677eb715de1c4ba2f1608b38980f02bdf75d
Svetoslav [Tue, 29 Jan 2013 10:09:43 +0000 (10:09 +0000)]
Merge "Fixing the build"
Svetoslav [Tue, 29 Jan 2013 10:08:54 +0000 (02:08 -0800)]
Fixing the build
Change-Id: I8d47c7094efc8ff458cdac58a761d5f187c8fc32
Svetoslav [Tue, 29 Jan 2013 09:39:36 +0000 (09:39 +0000)]
Merge "Removing duplicated tests that use hidden APIs"
Svetoslav [Tue, 29 Jan 2013 09:37:54 +0000 (01:37 -0800)]
Removing duplicated tests that use hidden APIs
Change-Id: If3e32e8659fcb4dc2186fea668601a93f4556a73
Guang Zhu [Tue, 29 Jan 2013 08:36:42 +0000 (00:36 -0800)]
fix the build
broken docs
Change-Id: I802d33c8ef2147adf36a495145a615cb206b9936
Michael Wright [Tue, 29 Jan 2013 04:35:58 +0000 (20:35 -0800)]
Changes documention for how input buttons should be labelled
Change-Id: I7920d1359950f04a3eb63c36abbcc3d54faac068
Svetoslav [Tue, 29 Jan 2013 03:55:35 +0000 (19:55 -0800)]
Fixing the build
Change-Id: Ief7654775307c829a60e65217ae821aa6801303c
Svetoslav [Tue, 29 Jan 2013 03:19:44 +0000 (03:19 +0000)]
Merge changes Ie674e8b2,I0b9448c8
* changes:
AccessibilityNodeINfo cache not cleared when accessibility is disabled.
Display magnifier does not release its surface on destroy.
Svetoslav Ganov [Tue, 29 Jan 2013 03:16:40 +0000 (03:16 +0000)]
Merge "Adding UI test automation APIs."
Wink Saville [Tue, 29 Jan 2013 03:10:42 +0000 (03:10 +0000)]
Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip"
Benoit Goby [Tue, 29 Jan 2013 02:33:27 +0000 (02:33 +0000)]
Merge "UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted"
Jeff Brown [Tue, 29 Jan 2013 02:14:21 +0000 (02:14 +0000)]
Merge "Optimize Looper JNI code."
Selim Gurun [Tue, 29 Jan 2013 00:30:46 +0000 (16:30 -0800)]
Fix public comments for SslErrorHandler.
Fix documentation.
Change-Id: I56a485d2ed3b338f9acb6fa8d7e42cba88ad6291
Jeff Sharkey [Mon, 28 Jan 2013 23:58:30 +0000 (23:58 +0000)]
Merge "Use the resolved Context in ContentResolver."
Jeff Sharkey [Mon, 28 Jan 2013 23:52:43 +0000 (15:52 -0800)]
Use the resolved Context in ContentResolver.
Change-Id: If62b34a9f6d6305657a02d3f807a24eee63aecf6
Wink Saville [Mon, 28 Jan 2013 23:27:47 +0000 (15:27 -0800)]
Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
Dianne Hackborn [Mon, 28 Jan 2013 23:10:48 +0000 (15:10 -0800)]
Add GET_CONTENT protocol for allowing multiple selection.
Change-Id: I4c14d32112523d7ab603b2a4e374849dd1c3eff6
Michael Wright [Mon, 28 Jan 2013 22:32:44 +0000 (22:32 +0000)]
Merge "Add plumbing for Recent Apps keycode"
Jeff Brown [Mon, 28 Jan 2013 22:25:53 +0000 (14:25 -0800)]
Optimize Looper JNI code.
Use static native methods.
Release the native looper objects as soon as the Looper quits
instead of waiting until the GC finalizer to take care of it.
Change-Id: I02783e48782a8f972ec2138862f700ade33d8e78
Romain Guy [Mon, 28 Jan 2013 22:07:25 +0000 (22:07 +0000)]
Merge "Reinitialize hardware renderer after eglTerminate() Bug #
8066455"
Romain Guy [Mon, 28 Jan 2013 22:04:07 +0000 (14:04 -0800)]
Reinitialize hardware renderer after eglTerminate()
Bug #
8066455
ViewRootImpl was properly detecting that the renderer was not
ready to draw but would simply schedule another frame, thus sending
the systemui into an inifite redraw loop. This change reinitializes
the renderer if needed (if the renderer is requested but not enabled.)
This CL also fixes an issue caused by the default wallpaper. Since it
never calls eglTerminate(), managed contexts are never reclaimed.
Change-Id: Idb8caa672be8ee35f6e6a7e942d9abd8aa100967
Dianne Hackborn [Mon, 28 Jan 2013 20:35:47 +0000 (20:35 +0000)]
Merge "Fix bug where we could get stuck repeatedly launching an activity."
Fabrice Di Meglio [Mon, 28 Jan 2013 20:32:48 +0000 (20:32 +0000)]
Merge "Fix bug #
8051633 Recent Apps thumbnails in RTL mode (Arabic / Hebrew / Farsi) should be aligned"
Wink Saville [Mon, 28 Jan 2013 19:56:09 +0000 (19:56 +0000)]
Merge "Add protected log methods to StateMachine"
Amith Yamasani [Mon, 28 Jan 2013 19:44:05 +0000 (11:44 -0800)]
am
b3eab8ff: am
1f6178fd: am
abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (2) and others
* commit '
b3eab8ff6169ec6f9e5fe7c00a5dc8925e95b1e6':
Added focusable true on search_button for D-pad.
Adam Powell [Mon, 28 Jan 2013 19:44:02 +0000 (11:44 -0800)]
am
bb74d8b9: am
783fe429: am
e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (2) and others
* commit '
bb74d8b9f632bdda2f5639a9516a83f58374b936':
show SELECT ALL icon with text in landscape mode
Amith Yamasani [Mon, 28 Jan 2013 19:41:06 +0000 (11:41 -0800)]
am
1f6178fd: am
abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (1) and others
* commit '
1f6178fd0442338c94cef2fcf12e59c9ce1cf556':
Added focusable true on search_button for D-pad.
Adam Powell [Mon, 28 Jan 2013 19:41:03 +0000 (11:41 -0800)]
am
783fe429: am
e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '
783fe4295372cee8d024388221414c253802c995':
show SELECT ALL icon with text in landscape mode
Dianne Hackborn [Mon, 28 Jan 2013 19:36:23 +0000 (11:36 -0800)]
Fix bug where we could get stuck repeatedly launching an activity.
A previous change to avoid losing activities if their process
happens to be gone at the point of launch (by counting that
activity as having its state saved) has resulted in a problem
where an activity that crashes during launch will be repeatedly
relaunched.
This is fixed here by explicitly keeping track of our attempts
to launch the activity since it was last able to save its state,
and not keeping it around if it looks like the launch is
repeatedly failing.
Change-Id: Icefd952443b7eb1222f233db95e0157fc3dd72d1
Amith Yamasani [Mon, 28 Jan 2013 19:37:48 +0000 (11:37 -0800)]
am
abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit '
abcb9b96f8d1e3780cf63502ca86a00b3f314b39':
Added focusable true on search_button for D-pad.
Adam Powell [Mon, 28 Jan 2013 19:37:41 +0000 (11:37 -0800)]
am
e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '
e305e5f68df8338cb3c4bdcf099d23ec9abce564':
show SELECT ALL icon with text in landscape mode
Wink Saville [Mon, 28 Jan 2013 18:52:34 +0000 (10:52 -0800)]
Add protected log methods to StateMachine
This allow child classes to Override the logging and
have consistent behavior across StateMachines.
Change-Id: I7e23a44d08ca304ade2d7830fd0e307f63f1879e
Amith Yamasani [Mon, 28 Jan 2013 18:46:37 +0000 (18:46 +0000)]
Merge "Added focusable true on search_button for D-pad."
Adam Powell [Mon, 28 Jan 2013 18:44:10 +0000 (18:44 +0000)]
Merge "show SELECT ALL icon with text in landscape mode"
Amith Yamasani [Mon, 28 Jan 2013 18:33:55 +0000 (10:33 -0800)]
am
c28fde57: am
0b515aec: am
3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (2) and others
* commit '
c28fde57f0c7762913615b16d651d4e7991d6175':
Fix possible integer overflow in MtpStorage
Amith Yamasani [Mon, 28 Jan 2013 18:31:01 +0000 (10:31 -0800)]
am
0b515aec: am
3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (1) and others
* commit '
0b515aece642283a25c6a4416f0aecdaf17bdb58':
Fix possible integer overflow in MtpStorage
Amith Yamasani [Mon, 28 Jan 2013 18:28:38 +0000 (10:28 -0800)]
am
3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '
3cfca67b0f1e3f464274fa5d3b2e31e5288d8f38':
Fix possible integer overflow in MtpStorage
Amith Yamasani [Mon, 28 Jan 2013 18:09:59 +0000 (18:09 +0000)]
Merge "Fix possible integer overflow in MtpStorage"
Siva Velusamy [Mon, 28 Jan 2013 18:02:49 +0000 (18:02 +0000)]
Merge "Support invoking view methods from hierarchy viewer"
Baligh Uddin [Mon, 28 Jan 2013 17:49:24 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE"
Victoria Lease [Mon, 28 Jan 2013 17:07:39 +0000 (17:07 +0000)]
Merge "Annotate Locations coming from mock providers"