OSDN Git Service
Baligh Uddin [Fri, 2 Aug 2013 16:28:13 +0000 (16:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 2 Aug 2013 16:26:57 +0000 (16:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 2 Aug 2013 16:26:15 +0000 (16:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Satoshi Kataoka [Fri, 2 Aug 2013 07:22:04 +0000 (16:22 +0900)]
Add a comment on the spell checker framework
Change-Id: Ibd826d68074d8524cbeaae296ce483f8b10c3d07
Satoshi Kataoka [Fri, 2 Aug 2013 03:44:58 +0000 (03:44 +0000)]
Merge "Update the comment of Settings.ACTION_USER_DICTIONARY_SETTINGS"
Dianne Hackborn [Fri, 2 Aug 2013 03:34:06 +0000 (03:34 +0000)]
Merge "Try to improve PSS collection."
Dianne Hackborn [Thu, 1 Aug 2013 17:50:28 +0000 (10:50 -0700)]
Try to improve PSS collection.
The goal is to collect PSS data from processes when they
are in as stable a state as possible. We now have tables
for the durations to use for PSS collection based on
process state, and scheduling of collection is all driven
by process state changes.
Change-Id: I95e076f6971b9c093118e53dc8240fb3f5bad3b2
Satoshi Kataoka [Fri, 2 Aug 2013 03:22:26 +0000 (03:22 +0000)]
Merge "Small cleanup on InputMethodInfo"
Satoshi Kataoka [Thu, 1 Aug 2013 07:50:48 +0000 (16:50 +0900)]
Small cleanup on InputMethodInfo
Change-Id: I7879a8d9fe83fcd7362ecc4ab60460a3212ac8c4
Adam Powell [Thu, 1 Aug 2013 23:20:51 +0000 (23:20 +0000)]
Merge "Fix a regression where android:windowContentOverlay did not draw properly."
David Christie [Thu, 1 Aug 2013 23:13:47 +0000 (23:13 +0000)]
Merge "Allow a particular LocationRequest to be excluded from AppOps monitoring as long as the client as the appropriate permission (UPDATE_DEVICE_STATS)."
Romain Guy [Thu, 1 Aug 2013 23:09:21 +0000 (23:09 +0000)]
Merge "Fix region clipping bugs See external bug #58344"
Adam Powell [Wed, 31 Jul 2013 20:58:43 +0000 (13:58 -0700)]
Fix a regression where android:windowContentOverlay did not draw properly.
This was the victim of an earlier refactoring. Have the
ActionBarOverlayLayout draw this directly over the content so that it
can stay properly in sync with any animations and also remove an extra
couple of views from the decor layout.
Some apps now expect the broken behavior in default themes. Protect
them from themselves until they bump their targetSdkVersion.
Public bug https://code.google.com/p/android/issues/detail?id=58280
Change-Id: I4284503577e322f3e68d4a7fabda8441d3749b98
Scott Main [Thu, 1 Aug 2013 23:01:17 +0000 (16:01 -0700)]
am
a5da1865: am
9210aea5: am
218120e0: Merge "dashboard update for 8/1" into jb-mr2-docs
* commit '
a5da186523620ad740608fbd864bce22e04b86d6':
dashboard update for 8/1
Scott Main [Thu, 1 Aug 2013 22:58:53 +0000 (15:58 -0700)]
am
9210aea5: am
218120e0: Merge "dashboard update for 8/1" into jb-mr2-docs
* commit '
9210aea5accb872527ba1d54ba0760340ad8f1ba':
dashboard update for 8/1
Scott Main [Thu, 1 Aug 2013 22:57:08 +0000 (15:57 -0700)]
am
218120e0: Merge "dashboard update for 8/1" into jb-mr2-docs
* commit '
218120e0795bc4aee1b29a43da25a8ea7e8edf71':
dashboard update for 8/1
Scott Main [Thu, 1 Aug 2013 22:54:05 +0000 (22:54 +0000)]
Merge "dashboard update for 8/1" into jb-mr2-docs
Scott Main [Thu, 1 Aug 2013 22:23:19 +0000 (15:23 -0700)]
dashboard update for 8/1
Change-Id: I8541646e13d20186f79dd8a548b1ff21602793b6
Scott Main [Thu, 1 Aug 2013 22:46:50 +0000 (15:46 -0700)]
am
54403d8a: am
f5ad5b26: am
8709fb2a: Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221" into jb-mr2-docs
* commit '
54403d8a271ad2e640833857d443f671547a1132':
update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221
Scott Main [Thu, 1 Aug 2013 22:42:54 +0000 (15:42 -0700)]
am
f5ad5b26: am
8709fb2a: Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221" into jb-mr2-docs
* commit '
f5ad5b2635d0a46c9a3e09543431a73e915ba4c6':
update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221
Scott Main [Thu, 1 Aug 2013 22:39:19 +0000 (15:39 -0700)]
am
8709fb2a: Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221" into jb-mr2-docs
* commit '
8709fb2a7175faa3b53cec7869f4b7594371b882':
update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221
Scott Main [Thu, 1 Aug 2013 22:36:03 +0000 (22:36 +0000)]
Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221" into jb-mr2-docs
Romain Guy [Thu, 1 Aug 2013 22:29:25 +0000 (15:29 -0700)]
Fix region clipping bugs
See external bug #58344
Change-Id: Iecd6c41fc8076cd76add2335d3442a6dd8878f12
Scott Main [Thu, 1 Aug 2013 22:27:46 +0000 (15:27 -0700)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Scott Main [Thu, 1 Aug 2013 22:27:41 +0000 (15:27 -0700)]
Fabrice Di Meglio [Thu, 1 Aug 2013 22:27:25 +0000 (22:27 +0000)]
Merge "Add automatic Drawable mirroring capability when in RTL layout direction"
Scott Main [Thu, 1 Aug 2013 22:25:55 +0000 (15:25 -0700)]
Scott Main [Thu, 1 Aug 2013 22:22:28 +0000 (15:22 -0700)]
Scott Main [Thu, 1 Aug 2013 22:22:08 +0000 (15:22 -0700)]
am
fca04b87: am
3db57cf1: am
c4c7463f: add note about VideoView "wrap_content" layout issue bug:
9364101
* commit '
fca04b873190a8e5db66de4596dbb9bc479be5af':
add note about VideoView "wrap_content" layout issue bug:
9364101
Scott Main [Thu, 1 Aug 2013 22:20:24 +0000 (15:20 -0700)]
am
3db57cf1: am
c4c7463f: add note about VideoView "wrap_content" layout issue bug:
9364101
* commit '
3db57cf19d59d1ed39d531137f6fd698befbb348':
add note about VideoView "wrap_content" layout issue bug:
9364101
Fabrice Di Meglio [Tue, 25 Jun 2013 02:22:25 +0000 (19:22 -0700)]
Add automatic Drawable mirroring capability when in RTL layout direction
- default value is "no mirroring"
- introduce android:autoMirrored as a new attribute for Drawable,
BitmapDrawable, LayerDrawable, StateListDrawable and NinePatchDrawable
- setting android:autoMirrored="true" means that the drawable will
be mirrored when the layout direction is RTL (right-to-left)
- also fix an issue with ImageView drawable layout direction not
updated correctly when RTL properties were changed
See bug #
7034321 Need Drawable RTL support
Change-Id: If595ee5106c786f38e786d3a032e182f784a9d97
Scott Main [Thu, 1 Aug 2013 22:14:52 +0000 (15:14 -0700)]
am
c4c7463f: add note about VideoView "wrap_content" layout issue bug:
9364101
* commit '
c4c7463f546ffb2eec7985c0a3d0203cbb8381bb':
add note about VideoView "wrap_content" layout issue bug:
9364101
Scott Main [Thu, 1 Aug 2013 22:13:06 +0000 (15:13 -0700)]
fix toc link
Change-Id: If2509e23db7f4f189f7521846598424cff2c2882
Scott Main [Thu, 1 Aug 2013 22:09:12 +0000 (15:09 -0700)]
am
eb221285: am
fba14236: am
4633a50b: Merge "new class on using action bar for training basics" into jb-mr2-docs
* commit '
eb22128596fa9da0b4bd4e4a237f4d4f9a81821f':
new class on using action bar for training basics
Dirk Dougherty [Thu, 1 Aug 2013 22:09:09 +0000 (15:09 -0700)]
am
3ba6747b: am
31bd3350: am
f518398e: Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs
* commit '
3ba6747b3cdb83fc2ae005dd2e309fdc7d3095fb':
Doc Update: Delete this unpublished cruft.
Jean-Michel Trivi [Thu, 1 Aug 2013 22:03:38 +0000 (22:03 +0000)]
Merge "Remove outdated comment in MediaFocusControl"
Scott Main [Thu, 1 Aug 2013 22:03:36 +0000 (15:03 -0700)]
am
fba14236: am
4633a50b: Merge "new class on using action bar for training basics" into jb-mr2-docs
* commit '
fba1423687f24063e87439b0ae26a12882bb4780':
new class on using action bar for training basics
Scott Main [Thu, 1 Aug 2013 17:54:16 +0000 (10:54 -0700)]
add note about VideoView "wrap_content" layout issue
bug:
9364101
Change-Id: I21881b30f338e9cdd7ffaa509edcf71e9478ded5
Scott Main [Thu, 1 Aug 2013 22:01:13 +0000 (15:01 -0700)]
am
4633a50b: Merge "new class on using action bar for training basics" into jb-mr2-docs
* commit '
4633a50b6ddf630543e7778e00e084106e503c38':
new class on using action bar for training basics
Scott Main [Thu, 1 Aug 2013 21:58:57 +0000 (21:58 +0000)]
Merge "new class on using action bar for training basics" into jb-mr2-docs
Scott Main [Sat, 20 Jul 2013 02:04:45 +0000 (19:04 -0700)]
new class on using action bar for training basics
Change-Id: I478a9fb7989a961ebefeee55dc67e9a59c054bb0
Fabrice Di Meglio [Thu, 1 Aug 2013 21:50:13 +0000 (21:50 +0000)]
Merge "Fix Paint Shader copy"
Dirk Dougherty [Thu, 1 Aug 2013 21:48:54 +0000 (14:48 -0700)]
am
31bd3350: am
f518398e: Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs
* commit '
31bd33507bea5c4c2f3f8c6bf30bfb01daa998fd':
Doc Update: Delete this unpublished cruft.
Dirk Dougherty [Thu, 1 Aug 2013 21:45:28 +0000 (14:45 -0700)]
am
f518398e: Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs
* commit '
f518398e4c0838c85a7ce988f8ce17b6a8238ffa':
Doc Update: Delete this unpublished cruft.
Dirk Dougherty [Thu, 1 Aug 2013 21:41:29 +0000 (21:41 +0000)]
Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs
Jean-Michel Trivi [Thu, 1 Aug 2013 21:36:32 +0000 (14:36 -0700)]
Remove outdated comment in MediaFocusControl
The stream type is used in audio focus to better deal with
RemoteControlClient/Display in the case of notifications
during media playback. This comment is therefore outdated.
Change-Id: Ifa33bc4c0fbf065d8288ff5fdfaf1bc67b2a337e
Fabrice Di Meglio [Wed, 31 Jul 2013 01:58:19 +0000 (18:58 -0700)]
Fix Paint Shader copy
- Paint.setClassVariablesFrom(Paint paint) was using the same Shader
for the copy as the initial Paint. Make sure that we are using a copy.
- implement a copy() API for shaders
See bug #
7034321 Need Drawable RTL support
Change-Id: I4b9cee386edc72ad670723266333b85f4d2b0ab8
David Christie [Tue, 30 Jul 2013 18:36:48 +0000 (11:36 -0700)]
Allow a particular LocationRequest to be excluded from
AppOps monitoring as long as the client as the appropriate
permission (UPDATE_DEVICE_STATS).
Change-Id: I7223a53bc1551e6498302a22eb310c8c5b5684b0
Sascha Prueter [Thu, 1 Aug 2013 20:59:09 +0000 (13:59 -0700)]
am
95990fe4: am
aa268f8f: am
d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev
* commit '
95990fe4c38641ea574efe9224ae279db61cde0f':
Add version identifier to app ops.
Sascha Prueter [Thu, 1 Aug 2013 20:55:43 +0000 (13:55 -0700)]
am
aa268f8f: am
d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev
* commit '
aa268f8fb2855335fc0d4f181cbf91505448e5eb':
Add version identifier to app ops.
Sascha Prueter [Thu, 1 Aug 2013 20:52:55 +0000 (13:52 -0700)]
am
d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev
* commit '
d364859ce657c6b096cadc703485ccef7979c582':
Add version identifier to app ops.
Sascha Prueter [Thu, 1 Aug 2013 20:50:01 +0000 (20:50 +0000)]
Merge "Add version identifier to app ops." into jb-mr2-dev
Amith Yamasani [Thu, 1 Aug 2013 19:45:20 +0000 (19:45 +0000)]
Merge "Fix javadoc for new API"
Amith Yamasani [Thu, 1 Aug 2013 19:44:01 +0000 (12:44 -0700)]
Fix javadoc for new API
Change-Id: I31d3eb877552029a346f956414227aac42e5582b
David Christie [Thu, 1 Aug 2013 19:24:53 +0000 (19:24 +0000)]
Merge "Add new app op to monitor high power location requests."
Scott Main [Thu, 1 Aug 2013 18:49:12 +0000 (11:49 -0700)]
am
3e2b513c: am
a7da9423: am
27c57555: fix misc broken links
* commit '
3e2b513cc21f5ae59bd7304aada2afabc54735cb':
fix misc broken links
Scott Main [Thu, 1 Aug 2013 18:49:05 +0000 (11:49 -0700)]
am
a9e8364d: am
9cbfea76: am
cc0be914: add search suggest tags for "tabs"
* commit '
a9e8364ddec69abe5f61fb595491fb624b8eb031':
add search suggest tags for "tabs"
Scott Main [Thu, 1 Aug 2013 18:49:02 +0000 (11:49 -0700)]
am
a25f983d: am
fb56b4f7: add search suggest tags for "tabs"
* commit '
a25f983d3e3706f17299f3de6ff59acea18db3ac':
add search suggest tags for "tabs"
Scott Main [Thu, 1 Aug 2013 18:46:23 +0000 (11:46 -0700)]
am
a7da9423: am
27c57555: fix misc broken links
* commit '
a7da9423f368dca38eb6235bfcac94b446aa7bcd':
fix misc broken links
Scott Main [Thu, 1 Aug 2013 18:46:19 +0000 (11:46 -0700)]
am
9cbfea76: am
cc0be914: add search suggest tags for "tabs"
* commit '
9cbfea760fe896638d7b4fec41f71abe0738d265':
add search suggest tags for "tabs"
Scott Main [Thu, 1 Aug 2013 18:46:16 +0000 (11:46 -0700)]
am
fb56b4f7: add search suggest tags for "tabs"
* commit '
fb56b4f7995cf7effffa2e18f26b40d9c4186482':
add search suggest tags for "tabs"
Scott Main [Thu, 1 Aug 2013 18:42:31 +0000 (11:42 -0700)]
am
27c57555: fix misc broken links
* commit '
27c57555db9d626f0c20d68d75dd5a3e9832c9b9':
fix misc broken links
Scott Main [Thu, 1 Aug 2013 18:42:28 +0000 (11:42 -0700)]
am
cc0be914: add search suggest tags for "tabs"
* commit '
cc0be914a9d8f733a82ecb22d56169a32492cb8f':
add search suggest tags for "tabs"
Scott Main [Wed, 31 Jul 2013 17:58:48 +0000 (10:58 -0700)]
add search suggest tags for "tabs"
Change-Id: Ic80228c1293811d85a8177c8800e7c68b84fee4e
Jeff Sharkey [Thu, 1 Aug 2013 18:38:55 +0000 (18:38 +0000)]
Merge "XML metadata for storage backend; custom icons."
Jeff Sharkey [Thu, 1 Aug 2013 18:01:47 +0000 (11:01 -0700)]
XML metadata for storage backend; custom icons.
Introduce XML metadata for storage backends, used to indicate if
custom roots should be queried, and provide any custom MIME type
icons inside that backend.
Parse metadata and resolve custom icons in UI.
Change-Id: Iec026c0b10845edff7a345d9389691ddf2c87a0e
Scott Main [Thu, 1 Aug 2013 18:31:38 +0000 (11:31 -0700)]
fix misc broken links
Change-Id: Iecd3462e752eddd0aa2feea3a7e9cf5ff2d92dd3
Dianne Hackborn [Thu, 1 Aug 2013 18:09:27 +0000 (11:09 -0700)]
Add version identifier to app ops.
All old versions drop their modes except for the notification op
(which is the only one there is currently a user-visible control for).
Change-Id: I9e09cebe63e9ea81f2adc01aef7d1a5a59f57a56
Ben Murdoch [Thu, 1 Aug 2013 18:14:32 +0000 (18:14 +0000)]
Merge "Revert "Revert "Flag-flip: set chromium to be the default WebView"""
Katie McCormick [Thu, 1 Aug 2013 17:36:13 +0000 (10:36 -0700)]
Doc Update: Delete this unpublished cruft.
Change-Id: I8ab8a4ddea64a2b0916c4c7d18cd56fe14856bda
(cherry picked from commit
d3d242e268ad4517d7ff20c1f221b1d4d7d3347f)
Baligh Uddin [Thu, 1 Aug 2013 17:54:29 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I412cb6d16cfd7efb9befa89fbaaf46aba6839b46
Auto-generated-cl: translation import
Baligh Uddin [Thu, 1 Aug 2013 17:40:33 +0000 (10:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5628a9909d4231d5648d64bdd11cad65bf4a882f
Auto-generated-cl: translation import
Baligh Uddin [Thu, 1 Aug 2013 17:24:34 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I521eae27b6864e350d4a81c669b5ada426f150dc
Auto-generated-cl: translation import
Amith Yamasani [Thu, 1 Aug 2013 17:18:03 +0000 (17:18 +0000)]
Merge "PreferenceActivity Fragment security"
Romain Guy [Thu, 1 Aug 2013 16:46:04 +0000 (16:46 +0000)]
Merge "Add missing alpha channel to built-in colors"
Romain Guy [Thu, 1 Aug 2013 16:43:26 +0000 (09:43 -0700)]
Add missing alpha channel to built-in colors
Change-Id: I911c17b623513b2715668d0f91604b28c32a969a
Daniel Sandler [Thu, 1 Aug 2013 16:35:16 +0000 (09:35 -0700)]
am
9e6f26a8: am
f3e2f8fe: am
9eb434c3: Allow the user to block notifications for foreground services.
* commit '
9e6f26a8e1e69b1c49676d60a5ebe36c0a0f23f9':
Allow the user to block notifications for foreground services.
Daniel Sandler [Thu, 1 Aug 2013 16:32:40 +0000 (09:32 -0700)]
am
f3e2f8fe: am
9eb434c3: Allow the user to block notifications for foreground services.
* commit '
f3e2f8feef1a22708cc7ce1a7bc5d914bb53933d':
Allow the user to block notifications for foreground services.
Daniel Sandler [Thu, 1 Aug 2013 16:29:45 +0000 (09:29 -0700)]
am
9eb434c3: Allow the user to block notifications for foreground services.
* commit '
9eb434c3899ce4791ca58affcbe673e5a96ff6b9':
Allow the user to block notifications for foreground services.
Jean-Michel Trivi [Thu, 1 Aug 2013 00:11:12 +0000 (17:11 -0700)]
Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE
Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE
Update android.media.AudioManager.requestAudioFocus() javadoc for the
new focus type.
Bug
8251963
Change-Id: I7cd69faaf5f0169ee462b91d0aaa75dc6b092107
Jean-Michel Trivi [Thu, 1 Aug 2013 16:07:08 +0000 (16:07 +0000)]
Merge "Notification muting conditional to exclusive audio focus request"
Victoria Lease [Thu, 1 Aug 2013 14:40:53 +0000 (14:40 +0000)]
Merge "Support RGBA fonts and bitmap fonts (and RGBA bitmap fonts)"
Ben Murdoch [Thu, 1 Aug 2013 12:14:53 +0000 (12:14 +0000)]
Revert "Revert "Flag-flip: set chromium to be the default WebView""
Turn the flag back on.
This reverts commit
c9f10b6be981ed4b0c4b2f0e2409d0626a3d4016.
Change-Id: I1a77bdf7f59a6868fd8ab30687062f34fc914bc6
Satoshi Kataoka [Thu, 1 Aug 2013 08:26:46 +0000 (08:26 +0000)]
Merge "Cleanup InputMethodSubtype and add "isAsciiCapable"."
Satoshi Kataoka [Tue, 12 Mar 2013 05:40:04 +0000 (14:40 +0900)]
Cleanup InputMethodSubtype and add "isAsciiCapable".
Bug:
8364845
Change-Id: Ic3ace4b6e0432d56696bcbc0be336aec1dc744a5
Lorenzo Colitti [Thu, 1 Aug 2013 06:44:28 +0000 (06:44 +0000)]
Merge "Add accessors for all addresses and clarify compare* methods"
Daniel Sandler [Thu, 1 Aug 2013 00:21:07 +0000 (20:21 -0400)]
Allow the user to block notifications for foreground services.
Stepping carefully around the fix in change Idc788527, we
perform security (and AppOps, and therefore user block)
checks against the uid passed to enqueueNotificationInternal
rather than the Binder caller.
Bug:
9502541
Change-Id: I91745db92823381df75721c1b8f11013a7fa4ecc
Jeff Sharkey [Thu, 1 Aug 2013 04:05:51 +0000 (04:05 +0000)]
Merge "Sliding drawer for roots, move sorting, search."
Jeff Sharkey [Thu, 1 Aug 2013 03:53:22 +0000 (20:53 -0700)]
Sliding drawer for roots, move sorting, search.
Move backend root exploration into sliding drawer, and adjust action
bar when moving between modes. Moves sorting into action bar spinner
instead of separate dialog. Also add initial search support.
Change-Id: I70189911ba56ae6bd93d5c503a8600acd6d6c0c5
Satoshi Kataoka [Thu, 1 Aug 2013 03:12:35 +0000 (03:12 +0000)]
Merge "Add a debug utility for InputMethodUtils"
Satoshi Kataoka [Wed, 31 Jul 2013 14:11:54 +0000 (23:11 +0900)]
Add a debug utility for InputMethodUtils
Change-Id: I59f6001bf20640e36e19b09cf117b8579120ba7d
Satoshi Kataoka [Tue, 30 Jul 2013 05:25:11 +0000 (14:25 +0900)]
Update the comment of Settings.ACTION_USER_DICTIONARY_SETTINGS
to make an implementation of a corresponding activity mandatory.
Change-Id: Ia6bae2ddf0697779e5133464803b0c0e04c2d4c1
Svetoslav Ganov [Thu, 1 Aug 2013 02:16:19 +0000 (02:16 +0000)]
Merge "Iteration of the print sub-system."
Svetoslav Ganov [Thu, 1 Aug 2013 00:25:13 +0000 (17:25 -0700)]
Iteration of the print sub-system.
1. Added APIs for adding partially initialized PrintInfo objects
enabling light-weight lookps for print serivces that want to
populate the list of available printers without querying each
of them for its capabilities. This includes APIs for the system
to request from a print service to update certain printers.
2. Fixed a bug in PrinterId#equals().
3. Added equals and hasCode implementaion to PrinterInfo. Also
the defaul in PrinterInfo are now an array instead of a
SparseArray - cheaper.
4. Now PrintJobConfigActivity works with partially specified
printers. Specifically, if such a printer is selected the
activity is requesting from the print service to update
the printer. We are currently not handling the timeout case.
It also handles udpated pritners.
Change-Id: I5e83e924ef597c9e22cbd06a971d4f4d3bd3a9c1
Adam Powell [Thu, 1 Aug 2013 01:56:14 +0000 (01:56 +0000)]
Merge "Revert "Import xxhdpi framework drawables from UX export""
Adam Powell [Thu, 1 Aug 2013 01:55:19 +0000 (01:55 +0000)]
Revert "Import xxhdpi framework drawables from UX export"
This reverts commit
843c7b6b90e97686bc7d7ebaa48343c3bd99d98c.
Change-Id: I819525e3dfa70d83ea16bfca46db7375c6800aaa
Elliott Hughes [Thu, 1 Aug 2013 01:25:47 +0000 (18:25 -0700)]
resolved conflicts for merge of
368d81fe to master
Change-Id: I4bc59cd9a54cbc1b62ac135cf86dc73ac85968d5
Dianne Hackborn [Thu, 1 Aug 2013 01:14:57 +0000 (01:14 +0000)]
Merge "Fix issue #
10115327: MapCollections need to implement equals"
Elliott Hughes [Thu, 1 Aug 2013 00:57:22 +0000 (17:57 -0700)]
am
c67b2ed5: Merge changes I80eaecff,Ia2b4f79b
* commit '
c67b2ed50226c4758d0fc1434d39f6add6a0a533':
Switch Process.myTid over to the libcore JNI too.
Replace native Process getpid/getuid with calls to libcore equivalents.
Dianne Hackborn [Thu, 1 Aug 2013 00:52:07 +0000 (17:52 -0700)]
Fix issue #
10115327: MapCollections need to implement equals
Change-Id: I8e7b6dd092442f3870aa1a36bd2a7cd974177146