OSDN Git Service
Svetoslav Ganov [Wed, 13 Nov 2013 22:24:23 +0000 (14:24 -0800)]
am
d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev
* commit '
d697ba73b5a5fc5dc502a117a8f06e8f1a5359b9':
Fix NPE at PrintSpooler in Japanese environment.
Svetoslav Ganov [Wed, 13 Nov 2013 22:19:56 +0000 (22:19 +0000)]
Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev
Svetoslav [Wed, 13 Nov 2013 21:34:00 +0000 (13:34 -0800)]
am
14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev
* commit '
14f300803b7d16a3c9632cb626529e873e4813f1':
Update the PrintDocumentAdapter docs.
Svetoslav [Wed, 13 Nov 2013 21:30:57 +0000 (21:30 +0000)]
Merge "Update the PrintDocumentAdapter docs." into klp-dev
Dirk Dougherty [Wed, 13 Nov 2013 21:15:42 +0000 (21:15 +0000)]
am
90b7f631: Doc change: fix typo.
* commit '
90b7f6311849fb68d2bc5fa0affb86c7e5d3a3b0':
Doc change: fix typo.
Dirk Dougherty [Wed, 13 Nov 2013 21:08:46 +0000 (13:08 -0800)]
Doc change: fix typo.
Change-Id: I74932b2dff099af1ba2bc048575586fd9e3593a5
Baligh Uddin [Wed, 13 Nov 2013 21:07:52 +0000 (13:07 -0800)]
am
2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2a22627e179cdb767c709dc68d78b4903d9239f9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 13 Nov 2013 21:07:49 +0000 (13:07 -0800)]
am
5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5cc3ddf16fee6d6aa8439e6ebcb3f3feeec98608':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 13 Nov 2013 21:04:25 +0000 (21:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 21:04:06 +0000 (21:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 20:24:32 +0000 (12:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3b40e99b029a65ade59ec8f7ad06c0a143895269
Auto-generated-cl: translation import
Christopher Tate [Wed, 13 Nov 2013 20:07:22 +0000 (12:07 -0800)]
am
0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev
* commit '
0b2c2b10053afd7a525dbf8a4eb0f0aaf98739b3':
Support preferred activities with zero or one scheme in the filter
Daniel Sandler [Wed, 13 Nov 2013 20:07:20 +0000 (12:07 -0800)]
am
31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev
* commit '
31f7c912f0b6a2cfa2ea0f0b3a9022e8323f5542':
Bespoke, handcrafted, artisanal assist affordance assets.
Daniel Sandler [Wed, 13 Nov 2013 20:07:16 +0000 (12:07 -0800)]
am
42498417: Merge "DessertCase fixes:" into klp-dev
* commit '
424984172bb2a89dd06cc49fd5a3665bc7c85e5c':
DessertCase fixes:
Daniel Sandler [Wed, 13 Nov 2013 20:07:13 +0000 (12:07 -0800)]
am
f554042a: Merge "Switch DeadZone to Slog." into klp-dev
* commit '
f554042a9582c5b4ad1b0d41bc08a0caad470798':
Switch DeadZone to Slog.
John Huang [Wed, 13 Nov 2013 20:07:10 +0000 (12:07 -0800)]
am
54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev
* commit '
54ca906604c2ff0a58274e5d1b66cdba4df8c3d8':
Get rid of a race in NsdService in stopResolveService and getAddrInfo
Baligh Uddin [Wed, 13 Nov 2013 19:54:28 +0000 (11:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id312643b2e858fa84f81b37975a1757ff1773b87
Auto-generated-cl: translation import
Keiji Ariyama [Wed, 13 Nov 2013 12:28:47 +0000 (21:28 +0900)]
Fix NPE at PrintSpooler in Japanese environment.
MediaSize ID have to be upper cases.
Change-Id: I84af01dbd185df210b5ebb1de282a4091e06df05
Related-issue: https://code.google.com/p/android/issues/detail?id=61984
Christopher Tate [Wed, 13 Nov 2013 19:33:46 +0000 (19:33 +0000)]
Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev
Daniel Sandler [Wed, 13 Nov 2013 19:32:42 +0000 (19:32 +0000)]
Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev
Daniel Sandler [Wed, 13 Nov 2013 19:32:27 +0000 (19:32 +0000)]
Merge "DessertCase fixes:" into klp-dev
Daniel Sandler [Wed, 13 Nov 2013 19:32:24 +0000 (19:32 +0000)]
Merge "Switch DeadZone to Slog." into klp-dev
John Huang [Wed, 13 Nov 2013 19:13:59 +0000 (19:13 +0000)]
Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev
Raphael Moll [Wed, 13 Nov 2013 18:13:08 +0000 (18:13 +0000)]
am
7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs
* commit '
7b0d9a50b4f19dfd89a20b5fd004a014ae8ec02b':
Android Studio download for 0.3.2
Raphael Moll [Wed, 13 Nov 2013 18:09:19 +0000 (18:09 +0000)]
Merge "Android Studio download for 0.3.2" into klp-docs
Jeff Brown [Wed, 13 Nov 2013 16:54:27 +0000 (08:54 -0800)]
am
41b92b00: Merge "Finalize assets for screen casting." into klp-dev
* commit '
41b92b008e03be95db938e0238ccb9373c2aaadc':
Finalize assets for screen casting.
Jeff Brown [Wed, 13 Nov 2013 16:51:53 +0000 (16:51 +0000)]
Merge "Finalize assets for screen casting." into klp-dev
John Spurlock [Wed, 13 Nov 2013 16:45:46 +0000 (08:45 -0800)]
am
7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev
* commit '
7d667ee2de2c6add257466d9648024d7e8402926':
Ensure wallpaper hint is at least as large as the display.
John Spurlock [Wed, 13 Nov 2013 16:41:43 +0000 (16:41 +0000)]
Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev
Deepanshu Gupta [Wed, 13 Nov 2013 16:40:08 +0000 (08:40 -0800)]
am
78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
* commit '
78cfdf31b7c48589ea3a148ec1d6d573235bc06b':
Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
Deepanshu Gupta [Mon, 11 Nov 2013 14:14:11 +0000 (19:44 +0530)]
Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
Issue: https://code.google.com/p/android/issues/detail?id=60167
Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005
Jeff Brown [Wed, 13 Nov 2013 08:45:18 +0000 (00:45 -0800)]
Finalize assets for screen casting.
Extend wifi display connection timeout.
Show a notification while connecting to wifi display.
Ensure that remote display providers are really trusted before
connecting to them.
Bug:
11257292
Change-Id: Iad0caaa30d7946df818bc75ade071f2e377f8a53
Jean Chalard [Wed, 13 Nov 2013 06:27:47 +0000 (22:27 -0800)]
am
218ecd43: Fix the docs build
* commit '
218ecd43946001f07b60757db130ef5585d474d3':
Fix the docs build
Jean Chalard [Wed, 13 Nov 2013 06:20:38 +0000 (15:20 +0900)]
Fix the docs build
Change-Id: I05f1f39aaa9d72201a7fd06377799246039cd505
Jean Chalard [Wed, 13 Nov 2013 05:22:03 +0000 (21:22 -0800)]
am
7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev
* commit '
7d57b7a35bd64d271b666f16aa1e85a4c2b99ca7':
Improve documentation for InputType and EditorInfo.
Jean Chalard [Wed, 13 Nov 2013 05:19:34 +0000 (05:19 +0000)]
Merge "Improve documentation for InputType and EditorInfo." into klp-dev
Dirk Dougherty [Wed, 13 Nov 2013 04:45:12 +0000 (04:45 +0000)]
am
ee8f2a64: Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs
* commit '
ee8f2a647eb08ab39d6f622cef3cdad20d79463a':
Doc change: Update Play for Edu docs for full launch.
Dirk Dougherty [Wed, 13 Nov 2013 04:25:52 +0000 (04:25 +0000)]
Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs
Dirk Dougherty [Fri, 11 Oct 2013 23:09:40 +0000 (16:09 -0700)]
Doc change: Update Play for Edu docs for full launch.
Change-Id: I50a1bfa6087383a5e7a10051e9a73ada96980297
Daniel Sandler [Wed, 13 Nov 2013 02:50:18 +0000 (21:50 -0500)]
DessertCase fixes:
- No more crashing on first launch of the easter egg
- Use IMMERSIVE_STICKY to avoid getting stuck with bars
Bug:
11319125
Change-Id: I4522feb36c29be8446715ba67d454a2012d181ca
Scott Main [Wed, 13 Nov 2013 02:53:40 +0000 (02:53 +0000)]
am
29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs
* commit '
29610421a32501661d6c20136c76ec426d6500fb':
Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
Scott Main [Wed, 13 Nov 2013 02:50:49 +0000 (02:50 +0000)]
Merge "Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs
Scott Main [Thu, 13 Jun 2013 19:38:55 +0000 (12:38 -0700)]
Revised some text while reading up on traceview.
this is what's left of this older CL that was left for dead:
I5528b476d8110df51d45aaf690d878f72bc75c9f
Change-Id: I42f784d693c0a2a2e2e8ed4c582cbc10180191e7
Daniel Sandler [Wed, 13 Nov 2013 01:51:54 +0000 (20:51 -0500)]
Bespoke, handcrafted, artisanal assist affordance assets.
Bug:
11243771
Change-Id: I6eb320ca78ccafc435259d30df95582aa7e3c53c
Daniel Sandler [Wed, 13 Nov 2013 01:33:34 +0000 (20:33 -0500)]
Switch DeadZone to Slog.
Should help us identify stray clicks further back in time
thanks to the longer system log buffer.
Bug:
11273982
Change-Id: Ie2bf445622afff3dbc903adad6c0497954fa5fe0
Adam Powell [Wed, 13 Nov 2013 01:05:56 +0000 (17:05 -0800)]
am
2229ca03: Fix an action bar accessibility regression
* commit '
2229ca031a326491feea5832e5337e9f8a602dca':
Fix an action bar accessibility regression
Adam Powell [Wed, 13 Nov 2013 00:20:46 +0000 (16:20 -0800)]
Fix an action bar accessibility regression
A previous fix introduced a problem with building content descriptions
for accessibility of the home/up button in one code path while setting
display options flags. Correct the issue and also refresh content
descriptions immediately when setting related attributes one at a
time.
Bug
11542264
Change-Id: I40d07036d1026e8e40c77c47ac377c82edd827b4
Svetoslav [Wed, 13 Nov 2013 00:20:55 +0000 (16:20 -0800)]
Update the PrintDocumentAdapter docs.
This change adds some clarification when a cancellation will be
requested during a layout or write. It also clarifies from which
thread the layout and write callbacks can be invoked.
Change-Id: Id20ff04c6fca8315849ed4a6c329da1b12bb6836
Craig Mautner [Tue, 12 Nov 2013 23:58:28 +0000 (15:58 -0800)]
am
6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev
* commit '
6cd206b2aa0039c215fc0a4cc487471c4b3f1496':
Relayout windows that handle their own config change.
Dirk Dougherty [Tue, 12 Nov 2013 23:57:28 +0000 (23:57 +0000)]
am
2a91ecb1: Doc change: More updates to the design guidelines.
* commit '
2a91ecb12982799001278752fc56464f9ececc60':
Doc change: More updates to the design guidelines.
Craig Mautner [Tue, 12 Nov 2013 23:56:21 +0000 (23:56 +0000)]
Merge "Relayout windows that handle their own config change." into klp-dev
Dirk Dougherty [Wed, 6 Nov 2013 03:06:27 +0000 (19:06 -0800)]
Doc change: More updates to the design guidelines.
Change-Id: Ia21cc7bfc97e7347f4dfa5d9d25d87c4be70be9d
Vinit Deshapnde [Tue, 12 Nov 2013 23:36:37 +0000 (15:36 -0800)]
Get rid of a race in NsdService in stopResolveService and getAddrInfo
Both requests are made using same id; and there is a chance that
stopResolve() is not fully completed when getAddrInfo() is issued. That
results getAddrInfo() failure, because both are using same requestId.
This change fixes this problem by creating a new unique id to call
getAddrInfo() with.
Bug:
11597153
Change-Id: I56bd78740e8a40bd31c52705dc797486aff53a50
Amith Yamasani [Tue, 12 Nov 2013 22:51:06 +0000 (14:51 -0800)]
am
48dab493: Merge "Fix inconsistency in reporting device admin active state." into klp-dev
* commit '
48dab493b927f4a71687ccd557084ccee195de73':
Fix inconsistency in reporting device admin active state.
Amith Yamasani [Tue, 12 Nov 2013 22:47:55 +0000 (22:47 +0000)]
Merge "Fix inconsistency in reporting device admin active state." into klp-dev
Craig Mautner [Tue, 12 Nov 2013 22:02:52 +0000 (14:02 -0800)]
Relayout windows that handle their own config change.
If a window claims to handle its own configuration change then we
won't destroy and recreate its window on a configuration change.
Normally that recreation triggers the first layout following
orientation change because mHaveFrame is false. Windows that handle
their own configuration changes never got a relayout pass following a
change in orientation.
This change passes the configuration changes that an application
handles into the AppWindowToken. If the app says it handles
orientation or screen size changes then a relayout will occur when the
configuration has changed.
Fixes bug
11647107.
Change-Id: Ie8d49fd050442ebbdcf0b805087894e3a2fc4be9
Christopher Tate [Tue, 12 Nov 2013 01:43:43 +0000 (17:43 -0800)]
Support preferred activities with zero or one scheme in the filter
Also use the existing full PreferredActivity match machinery instead
of the existing direct comparison now that the intent filters can
be more flexible.
Bug
11482259
Change-Id: Icb649ca60ecfbdb9ee3c256ee512d3f3f989e05f
Adam Koch [Tue, 12 Nov 2013 19:53:17 +0000 (19:53 +0000)]
am
e95c167c: Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs
* commit '
e95c167c98157c3b91847a969980c1f293eb1e3f':
Bitmapfun Sample: Minor updates/fixes.
Adam Koch [Tue, 12 Nov 2013 19:45:22 +0000 (19:45 +0000)]
Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs
Scott Main [Tue, 12 Nov 2013 19:33:43 +0000 (19:33 +0000)]
am
45d93219: fix typo in caption and XML spacing
* commit '
45d9321963a51470dc1aadf6ec9193cb881eed06':
fix typo in caption and XML spacing
Craig Mautner [Tue, 12 Nov 2013 19:20:19 +0000 (11:20 -0800)]
am
c641de01: Merge "Add event logging for tasks and stacks." into klp-dev
* commit '
c641de017ae0b15bbc13f43fd14fca6b1523ec02':
Add event logging for tasks and stacks.
Craig Mautner [Tue, 12 Nov 2013 19:15:23 +0000 (19:15 +0000)]
Merge "Add event logging for tasks and stacks." into klp-dev
Fabrice Di Meglio [Tue, 12 Nov 2013 19:06:47 +0000 (11:06 -0800)]
am
3f183a23: Merge "Fix bug #
11586041 Regression: text truncation in Clock" into klp-dev
* commit '
3f183a234bef643080d4f9dce44bcaa68e5d4694':
Fix bug #
11586041 Regression: text truncation in Clock
Fabrice Di Meglio [Tue, 12 Nov 2013 19:03:48 +0000 (19:03 +0000)]
Merge "Fix bug #
11586041 Regression: text truncation in Clock" into klp-dev
Scott Main [Tue, 12 Nov 2013 18:54:53 +0000 (10:54 -0800)]
fix typo in caption and XML spacing
Change-Id: I28adb9e6b5fb96f9f25a62766a197bb0a06bfdd0
Glenn Kasten [Tue, 12 Nov 2013 18:45:00 +0000 (10:45 -0800)]
am
8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev
* commit '
8a0d133cd7a7f7a9fb5289198d2be25e021788f5':
Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)
Glenn Kasten [Tue, 12 Nov 2013 18:40:42 +0000 (18:40 +0000)]
Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev
Eino-Ville Talvala [Tue, 12 Nov 2013 18:29:18 +0000 (10:29 -0800)]
am
4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev
* commit '
4d12d8bef6d04c16fc18f10437ffc49bcdfabf9b':
Camera2: Add support for partial result metadata quirk
Eino-Ville Talvala [Tue, 12 Nov 2013 18:27:06 +0000 (18:27 +0000)]
Merge "Camera2: Add support for partial result metadata quirk" into klp-dev
Craig Mautner [Tue, 12 Nov 2013 16:31:15 +0000 (08:31 -0800)]
Add event logging for tasks and stacks.
Also remove crufty write-only DisplayContent.mStackHistory.
Change-Id: I62b2b53dc02377c5d0d3b79df70b1990eed87d23
Scott Main [Tue, 12 Nov 2013 17:56:03 +0000 (17:56 +0000)]
am
44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug:
8073630
* commit '
44895333dad66be0ab5350b039d828f3da2a1b73':
clarify that ANDROID_ID is unique for each user in multi-user environment. bug:
8073630
Scott Main [Tue, 12 Nov 2013 17:23:13 +0000 (09:23 -0800)]
clarify that ANDROID_ID is unique for each user in multi-user environment.
bug:
8073630
Change-Id: Iff18e892a1e0422a85edd83f97ba4285f2171f74
John Spurlock [Mon, 4 Nov 2013 18:48:38 +0000 (13:48 -0500)]
Ensure wallpaper hint is at least as large as the display.
Bug:
11332853
Bug:
11606952
Change-Id: I1840d7b723015c379da8eab7e22aa478d56adeb3
Jeff Brown [Tue, 12 Nov 2013 06:01:22 +0000 (22:01 -0800)]
am
c481a634: Merge "UI tweaks." into klp-dev
* commit '
c481a634f4db6e95bc03b22b72414ba12da99f4b':
UI tweaks.
Jeff Brown [Tue, 12 Nov 2013 05:57:48 +0000 (05:57 +0000)]
Merge "UI tweaks." into klp-dev
Jeff Brown [Tue, 12 Nov 2013 01:55:08 +0000 (17:55 -0800)]
UI tweaks.
Hide disabled routes from the chooser.
Fix layout of chooser dialog when the settings button is visible and
the list is very long to prevent truncation of the settings button.
Fix an issue when we fake the route connecting status when a route
is selected. The route changed notification needs to be propagated
to apps. Fake it better.
Immediately disconnect from a route when the connection is lost or
a connection attempt fails. Added a few new test displays for this
case.
Bug:
11257292
Change-Id: I360ab5dc937ad60d97592eab54b19f034519645e
Jean Chalard [Mon, 11 Nov 2013 08:47:51 +0000 (17:47 +0900)]
Improve documentation for InputType and EditorInfo.
Bug:
11245912
Change-Id: Ie92ba20079461f7f0e30d969ba3692fec3a3b97f
Svetoslav [Tue, 12 Nov 2013 04:02:53 +0000 (20:02 -0800)]
am
512c722f: Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev
* commit '
512c722f14bf9ddad5c280c7bff4106410114ad7':
PreferencesFragment showing the breadcrumb area in single pane mode.
Svetoslav [Tue, 12 Nov 2013 04:01:16 +0000 (04:01 +0000)]
Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev
Svetoslav [Tue, 12 Nov 2013 02:20:25 +0000 (18:20 -0800)]
PreferencesFragment showing the breadcrumb area in single pane mode.
If the PreferenceActivity is running in a single pane mode we are
not showing the headers and the breadcrumb area. However, when this
activity is restarted and has a saved state to restore we are trying
to use headers even in a single pane mode. As a result the breadcrumb
area is shown and the content is shifted to the bottom with an empty
space at the top. This change ignores the saved headers from the
saved instance state in a single pane mode. Note that in such a case
these headers are null anyway as we do not use them.
bug:
11242762
Change-Id: I2828bc82762695d9c93fb4ca43933598a9b12b87
Dianne Hackborn [Tue, 12 Nov 2013 02:01:15 +0000 (18:01 -0800)]
am
596e409e: Merge "Work on issue #
11634365: Leaking restarting services" into klp-dev
* commit '
596e409ec9703e5071bb9a0de08787cde7745f7a':
Work on issue #
11634365: Leaking restarting services
John Spurlock [Tue, 12 Nov 2013 02:01:12 +0000 (18:01 -0800)]
am
778eaf4b: Merge "Disallow transient status bar on the keyguard." into klp-dev
* commit '
778eaf4bece18d08e91df1d405337a18c3abcd57':
Disallow transient status bar on the keyguard.
Scott Main [Tue, 12 Nov 2013 01:58:49 +0000 (01:58 +0000)]
am
4c6b1afb: fix typo and clarify meminfo discussion bug:
11589682
* commit '
4c6b1afb5b1c750b762ec446604834676f1e306b':
fix typo and clarify meminfo discussion bug:
11589682
Dianne Hackborn [Tue, 12 Nov 2013 01:36:10 +0000 (01:36 +0000)]
Merge "Work on issue #
11634365: Leaking restarting services" into klp-dev
Scott Main [Tue, 12 Nov 2013 01:33:32 +0000 (17:33 -0800)]
fix typo and clarify meminfo discussion
bug:
11589682
Change-Id: I3b46e6e2ae768284270b3e46c39c7cf14e65d7f7
John Spurlock [Tue, 12 Nov 2013 01:28:40 +0000 (01:28 +0000)]
Merge "Disallow transient status bar on the keyguard." into klp-dev
Dianne Hackborn [Tue, 12 Nov 2013 01:25:37 +0000 (17:25 -0800)]
Work on issue #
11634365: Leaking restarting services
Tighten up some flows to try to avoid any chance of leaving
a restarting service on the list, add a log to the only remaining
place I could find that we could get in to trouble for some
reason.
Change-Id: Iffb9be9d97deefc6cf0c5790eedfeb6e4e8a36bc
Fabrice Di Meglio [Fri, 8 Nov 2013 22:54:04 +0000 (14:54 -0800)]
Fix bug #
11586041 Regression: text truncation in Clock
Background padding should be used only and only if
- no padding is already defined into a layout file
- an explicit call to setBackground() / setBackgroundDrawable() has been done
Change-Id: I0a732c61b898e006ee86377bcbe7691740d68111
Jatin Lodhia [Mon, 11 Nov 2013 23:54:31 +0000 (15:54 -0800)]
am
09e7e0ef: Delegate existence of account check to Authenticator.
* commit '
09e7e0ef8bcd8b7b78b79fb570de2032871f0c97':
Delegate existence of account check to Authenticator.
Jatin Lodhia [Thu, 7 Nov 2013 08:14:25 +0000 (00:14 -0800)]
Delegate existence of account check to Authenticator.
Current AccountManager code for getAuthToken checks if the account
in the request exists. If the account does not exist then it throws
an exception which leads to a runtime exception being thrown by
AccountManager in the client. In perticular, Checkin client code
hits this issue when accounts are deleted by user. As the exception
is thrown from the getAuthToken method call and is a RuntimeException
it is not caught by the client. Futhermore, Checkin runs in one of the
important processes and this exception makes the process crash.
This cl, does the following:
1) Delegates the account exists check to Authentictor which in turn
would cause an AuthenticatorException which is a checked exception.
2) Replaces some of the runtime exceptions thrown by AccountManagerService
with calling AccountManagerResponse.onError() which causes more graceful
failure on the client.
3) Correctly passes on the error returned by Authenticator to
AccountManager. Earlier if Authenticator returned an error code to
the AccountManager, it ignored the error and returned null token to the
client which was incorrect.
Bug:
10856295
Change-Id: Ie250fec601d46f6dfecd74677b478bfd4e9dcfad
Jean-Michel Trivi [Mon, 11 Nov 2013 23:47:36 +0000 (15:47 -0800)]
am
fed822cb: Merge "Fix Tethys asset" into klp-dev
* commit '
fed822cb8e17579dfa792b40ebe82683088e7779':
Fix Tethys asset
Jean-Michel Trivi [Mon, 11 Nov 2013 23:44:27 +0000 (23:44 +0000)]
Merge "Fix Tethys asset" into klp-dev
Jeff Sharkey [Mon, 11 Nov 2013 23:19:44 +0000 (15:19 -0800)]
am
55d12486: Merge "Give storage provider access to secondary devices." into klp-dev
* commit '
55d12486df5e801dc8e74d96abdf87a250bc0ba1':
Give storage provider access to secondary devices.
Jeff Sharkey [Mon, 11 Nov 2013 23:16:38 +0000 (23:16 +0000)]
Merge "Give storage provider access to secondary devices." into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 22:41:14 +0000 (14:41 -0800)]
am
840587b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
840587b309d52d31f9b4f3dc6e709145a9c96d6d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:41:12 +0000 (14:41 -0800)]
am
082c7dbc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
082c7dbc02962b321d6d6efddd683d056579b29d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:41:09 +0000 (14:41 -0800)]
am
c0c41cbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c0c41cbee8c8cee2639bdb63860c378d6522feaa':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:39:34 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 22:39:20 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 22:39:03 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev