OSDN Git Service
Craig Mautner [Tue, 1 Oct 2013 00:07:07 +0000 (17:07 -0700)]
am
231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into klp-dev
* commit '
231bd6c514f15cb0b42a04d4fc7fc9631c743686':
Dismiss keyguard when resuming visible activities
Adam Powell [Tue, 1 Oct 2013 00:07:03 +0000 (17:07 -0700)]
am
8fb6d97a: Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev
* commit '
8fb6d97ad5671b4abc1940d8bc56cf7448e45c35':
Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu
Chet Haase [Tue, 1 Oct 2013 00:06:55 +0000 (17:06 -0700)]
am
033837dd: Merge "Make fading transitions work better" into klp-dev
* commit '
033837dd6bf32b33d9a67d340efd167f94bf80cf':
Make fading transitions work better
Raph Levien [Tue, 1 Oct 2013 00:06:29 +0000 (17:06 -0700)]
am
adf14902: Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev
* commit '
adf149029f701464c66cc5cacbbbc649c1319bcd':
Fix for Text fading on RTL app names is done at the beginning...
Scott Main [Tue, 1 Oct 2013 00:06:26 +0000 (17:06 -0700)]
am
aaf0f83c: am
ef4e5e61: am
194925f9: am
a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
* commit '
aaf0f83c69efd004420633fb577443de80eb35d6':
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
Jason Monk [Tue, 1 Oct 2013 00:06:23 +0000 (17:06 -0700)]
am
da51d36c: Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev
* commit '
da51d36c74f62a1c50f3960919cb74c5da178cd2':
Fix Sending PAC Broadcast before downloaded
Jim Miller [Mon, 30 Sep 2013 23:42:26 +0000 (16:42 -0700)]
am
398d7f61: Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev
* commit '
398d7f61866baab65e69b9107c36ba32bf824353':
Update navbar camera icon and widget background assets in keyguard.
Romain Guy [Mon, 30 Sep 2013 23:42:19 +0000 (16:42 -0700)]
am
33ed738d: Expose View.executeHardwareAction() Bug #
10911502
* commit '
33ed738d49dce3af5851d0566739e9ed593057a5':
Expose View.executeHardwareAction() Bug #
10911502
Craig Mautner [Mon, 30 Sep 2013 23:42:11 +0000 (16:42 -0700)]
am
c449613e: Merge "Revert behavior to perform onResume." into klp-dev
* commit '
c449613ec6ffed7b4605a6708a3341ab2dd5320f':
Revert behavior to perform onResume.
Victoria Lease [Mon, 30 Sep 2013 23:42:08 +0000 (16:42 -0700)]
am
a4eb894a: Merge "clarify Paint flag docs" into klp-dev
* commit '
a4eb894a55b07eeddb05d47558e6b2838d56af08':
clarify Paint flag docs
Romain Guy [Mon, 30 Sep 2013 23:23:05 +0000 (16:23 -0700)]
am
d6c1870d: am
5fceada3: Merge "Fragement, or Fragment: that is the question"
* commit '
d6c1870d434562a10e015915dd9da9f8a956661c':
Fragement, or Fragment: that is the question
Romain Guy [Mon, 30 Sep 2013 23:19:22 +0000 (16:19 -0700)]
am
5fceada3: Merge "Fragement, or Fragment: that is the question"
* commit '
5fceada31f0dc8f8e003e9c1d0a0ed0363711343':
Fragement, or Fragment: that is the question
Romain Guy [Mon, 30 Sep 2013 22:48:44 +0000 (22:48 +0000)]
Merge "Fragement, or Fragment: that is the question"
Cyril Mottier [Mon, 30 Sep 2013 20:42:26 +0000 (22:42 +0200)]
Fragement, or Fragment: that is the question
Change-Id: Iac3a14b9d2d7b4bd1e452db987b3c5c95dbefd3b
Elliott Hughes [Fri, 27 Sep 2013 22:41:25 +0000 (15:41 -0700)]
am
82e5d875: am
ebd397ad: Merge "Regenerate all the OpenGL stubs."
* commit '
82e5d8758a61f1a49700f67f6ddb69219528bad2':
Regenerate all the OpenGL stubs.
Elliott Hughes [Fri, 27 Sep 2013 22:37:56 +0000 (15:37 -0700)]
am
ebd397ad: Merge "Regenerate all the OpenGL stubs."
* commit '
ebd397ad9182c37487ba95aaa71ae6dcf0c9d762':
Regenerate all the OpenGL stubs.
Elliott Hughes [Fri, 27 Sep 2013 22:33:25 +0000 (22:33 +0000)]
Merge "Regenerate all the OpenGL stubs."
Nick Kralevich [Fri, 27 Sep 2013 16:37:56 +0000 (09:37 -0700)]
am
19f9f445: am
7a56d949: Merge "Fix SELinux.java doc errors"
* commit '
19f9f445bfe368f801f893aad6dbd372562746ac':
Fix SELinux.java doc errors
Nick Kralevich [Fri, 27 Sep 2013 16:35:01 +0000 (09:35 -0700)]
am
7a56d949: Merge "Fix SELinux.java doc errors"
* commit '
7a56d949ef524d00e4091827104ac2450e4ec9db':
Fix SELinux.java doc errors
Nick Kralevich [Fri, 27 Sep 2013 16:32:56 +0000 (16:32 +0000)]
Merge "Fix SELinux.java doc errors"
Craig Mautner [Fri, 27 Sep 2013 00:46:52 +0000 (00:46 +0000)]
Merge "Dismiss keyguard when resuming visible activities" into klp-dev
Adam Powell [Fri, 27 Sep 2013 00:46:09 +0000 (00:46 +0000)]
Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev
Craig Mautner [Thu, 26 Sep 2013 23:42:55 +0000 (16:42 -0700)]
Dismiss keyguard when resuming visible activities
If an activity is visible behind the keyguard when it is launched
by another activity then there would be no call to dismissKeyguard.
Because the other activity is pausing the call to dismissKeyguard
is skipped in startActivityLocked(). And because it is already
visible the call to ActivityRecord.windowsVisible() is never made and
the call to reportActivityVisibleLocked() which calls
dismissKeyguard() is also never made.
This change recognizes when an activity is resumed and visible and
calls dismissKeyguard() in that case.
Fixes bug
10732489.
Change-Id: I3de1350a55231aaa14dadc8709fd0fcf4960742c
Chet Haase [Fri, 27 Sep 2013 00:26:21 +0000 (00:26 +0000)]
Merge "Make fading transitions work better" into klp-dev
Raph Levien [Thu, 26 Sep 2013 23:31:48 +0000 (23:31 +0000)]
Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev
Scott Main [Thu, 26 Sep 2013 23:25:24 +0000 (16:25 -0700)]
am
ef4e5e61: am
194925f9: am
a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
* commit '
ef4e5e6182e020d0dd349848b38a33e0c33491b4':
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
Jason Monk [Thu, 26 Sep 2013 23:23:18 +0000 (23:23 +0000)]
Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev
Scott Main [Thu, 26 Sep 2013 23:23:06 +0000 (16:23 -0700)]
am
194925f9: am
a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
* commit '
194925f9e894d35991920edbaa0681c1aea48120':
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
Scott Main [Thu, 26 Sep 2013 23:20:41 +0000 (16:20 -0700)]
am
a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
* commit '
a8f519ff9cb38e97db34f5a7bac95a9e09ed5ade':
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
Scott Main [Wed, 25 Sep 2013 23:47:19 +0000 (16:47 -0700)]
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
Change-Id: I196ac5955477cd822bbf78a9cd4fd53a3d8fbd5f
Raph Levien [Thu, 26 Sep 2013 22:57:07 +0000 (15:57 -0700)]
Fix for Text fading on RTL app names is done at the beginning...
This is a fix for bug
10918591 [Android][bidid][HH] "Text fading on RTL
app names is done at the beginning of the text, not at the end."
The old logic for getting the fade edge was not symmetric with respect
to the text direction - when the text was centered, it basically
always placed the fade edge at the left, which of course is appropriate
for LTR text but not RTL. This patch makes the two paths symmetric
and sensitive to text direction.
Change-Id: Ief7604aeb659d474864468d2f102a53f5b43d09e
Jason Monk [Mon, 23 Sep 2013 17:32:39 +0000 (13:32 -0400)]
Fix Sending PAC Broadcast before downloaded
The PacManager now waits until the local proxy is bound and the PAC file
is downloaded before sending out the proxy broadcast.
Bug:
10895515
Change-Id: Iaa7fc0989b52453aeeb720b44df0fca0fcb959ca
Adam Powell [Thu, 26 Sep 2013 22:36:34 +0000 (15:36 -0700)]
Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu
Allow calling code to specify left/right/start/end gravity when
showing a popup attached to an anchor. This allows easy alignment of
either the right or left edges of the popup and anchor view.
Bug
10728401
Change-Id: Ie0844a04ea0576fa67b0972f5873aaa4c5b823f6
Jim Miller [Thu, 26 Sep 2013 22:27:15 +0000 (22:27 +0000)]
Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev
Romain Guy [Thu, 26 Sep 2013 21:57:30 +0000 (14:57 -0700)]
Expose View.executeHardwareAction()
Bug #
10911502
Views creating hardware resources need a way to safely interact
with the hardware. This new method invokes HardwareRenderer.safelyRun()
which executes a Runnable after making sure the hardawre rendering
context is in a valid state.
With the OpenGL backend, executeHardwareAction() tries to call
eglMakeCurrent() if needed. This method is not guaranteed to
work.
Change-Id: I38ec65132eeba85605cffb1a6de12b7a0184e213
Craig Mautner [Thu, 26 Sep 2013 21:43:23 +0000 (21:43 +0000)]
Merge "Revert behavior to perform onResume." into klp-dev
Victoria Lease [Thu, 26 Sep 2013 21:40:55 +0000 (21:40 +0000)]
Merge "clarify Paint flag docs" into klp-dev
Craig Mautner [Thu, 26 Sep 2013 19:40:16 +0000 (12:40 -0700)]
Revert behavior to perform onResume.
Back out changes from CLs ag/363992 and ag/363859. These introduced
the bugs found in bug
10917435 which is now fixed. Note that backing
out these changes reintroduces bug
10732489.
Change-Id: Ic5105dd4cfc8bf79c6f06188283d1ee3680c370c
Christopher Tate [Thu, 26 Sep 2013 21:14:54 +0000 (14:14 -0700)]
am
4e9c7d8b: Merge "Sigh." into klp-dev
* commit '
4e9c7d8ba3caa8b558e2a1de796c100a562445ae':
Sigh.
Svetoslav Ganov [Thu, 26 Sep 2013 21:14:51 +0000 (14:14 -0700)]
am
c6afd813: Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev
* commit '
c6afd813ac2ddaa576fc7866479e933627622248':
PackageManager#queryIntentServices breaks its contract.
Svetoslav Ganov [Thu, 26 Sep 2013 21:14:49 +0000 (14:14 -0700)]
am
2c854022: Merge "Choosing default paper size for the "Save to PDF" fake printer" into klp-dev
* commit '
2c854022bf7fb6d626b0e86dc0c16372774f2432':
Choosing default paper size for the "Save to PDF" fake printer
Christopher Tate [Thu, 26 Sep 2013 21:10:38 +0000 (21:10 +0000)]
Merge "Sigh." into klp-dev
Svetoslav Ganov [Thu, 26 Sep 2013 21:10:19 +0000 (21:10 +0000)]
Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev
Svetoslav Ganov [Thu, 26 Sep 2013 21:09:25 +0000 (21:09 +0000)]
Merge "Choosing default paper size for the "Save to PDF" fake printer" into klp-dev
Amith Yamasani [Thu, 26 Sep 2013 21:04:21 +0000 (14:04 -0700)]
am
d2534f8c: Merge "Don\'t remove restrictions files that are valid" into klp-dev
* commit '
d2534f8c05ccdf692f1e265ae719b67290d15050':
Don't remove restrictions files that are valid
Amith Yamasani [Thu, 26 Sep 2013 21:02:10 +0000 (21:02 +0000)]
Merge "Don't remove restrictions files that are valid" into klp-dev
Svetoslav Ganov [Thu, 26 Sep 2013 15:45:22 +0000 (08:45 -0700)]
Choosing default paper size for the "Save to PDF" fake printer
Change-Id: I1e2eb73fd1eb3b1e9812155b69b94cba261243c2
Victoria Lease [Tue, 24 Sep 2013 22:57:02 +0000 (15:57 -0700)]
clarify Paint flag docs
Bug:
10460797
Change-Id: Iae622b302cad3dc788f512b472e3a59ec227a8d7
Chet Haase [Fri, 20 Sep 2013 23:33:08 +0000 (16:33 -0700)]
Make fading transitions work better
Previously, a Fade transition would only affect a view if its
parent hierarchy was not also affected between the start/end states.
This caused problems for views which were removed from their parents
between scenes when their parents' visibility also changed between those
scenes. The effect would be that the transition would fade the parent...
but the child would no longer be in that parent, so the user would just see the
child view blink out.
This fix ensure that views are faded appropriately by fading them
regardless the parent hierarchy; if a view is removed from its
parent, fade it out.
Additionally, if that view has not been removed from its parent, but
its parent is no longer parented *and* scene being
transitioned from is based on a layout resource file (and thus
the views are considered temporary after transitioning), then it is
removed from its parent to be faded out in the overlay.
Also, renamed TextChange to ChangeText to be more consistent with
other transition class names.
Change-Id: I4e0e7dfc9e9d95c7a4ca586534b6d204c4f3bae0
Jeff Sharkey [Thu, 26 Sep 2013 20:37:21 +0000 (13:37 -0700)]
am
8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-dev
* commit '
8c6c04197e58be6f3e46ba6a38f5d16e4fb091fa':
Tighten flags enforcement, API to test Uris.
Jeff Sharkey [Thu, 26 Sep 2013 20:33:29 +0000 (20:33 +0000)]
Merge "Tighten flags enforcement, API to test Uris." into klp-dev
Zhijun He [Thu, 26 Sep 2013 20:30:23 +0000 (13:30 -0700)]
am
8f4e289f: Merge "Camera2: Fix focusRange type" into klp-dev
* commit '
8f4e289f8c1f4743a459b232b9e5ac9d58095139':
Camera2: Fix focusRange type
Zhijun He [Thu, 26 Sep 2013 20:28:19 +0000 (20:28 +0000)]
Merge "Camera2: Fix focusRange type" into klp-dev
Christopher Tate [Thu, 26 Sep 2013 20:11:55 +0000 (13:11 -0700)]
Sigh.
Bug
10746233
Change-Id: I18c84f2bd53a511fc86be42b5d72062650e5b289
Amith Yamasani [Thu, 26 Sep 2013 20:20:17 +0000 (13:20 -0700)]
Don't remove restrictions files that are valid
This fixes a bug in parsing the package name from a file name. The suffix
was not taken into account, resulting in all restrictions files being
removed on switching to a user.
Bug:
10947554
Change-Id: I62725bbbdc0e15609872de3896130d4acbc35386
Jeff Sharkey [Thu, 26 Sep 2013 18:32:30 +0000 (11:32 -0700)]
Tighten flags enforcement, API to test Uris.
Check and throw if callers request invalid grant flags. Add API to
test if a Uri is backend by a DocumentsProvider.
Bug:
10919391,
10935608
Change-Id: Ifa6afefb95983558c8c64dc15ddf650e9fe07080
John Spurlock [Thu, 26 Sep 2013 20:13:00 +0000 (13:13 -0700)]
am
91949b20: Merge "New battery meter view bolt shape + color." into klp-dev
* commit '
91949b20c9e430eaba8cf2cf21abe403eb298a94':
New battery meter view bolt shape + color.
John Spurlock [Thu, 26 Sep 2013 20:10:19 +0000 (20:10 +0000)]
Merge "New battery meter view bolt shape + color." into klp-dev
Vineeta Srivastava [Thu, 26 Sep 2013 20:01:53 +0000 (13:01 -0700)]
am
aeaecacc: Merge "telephony: Set roam though same named operator" into klp-dev
* commit '
aeaecacccac2ea9b3db310921707696c56afada4':
telephony: Set roam though same named operator
Vineeta Srivastava [Thu, 26 Sep 2013 19:59:20 +0000 (19:59 +0000)]
Merge "telephony: Set roam though same named operator" into klp-dev
Marco Nelissen [Thu, 26 Sep 2013 19:58:04 +0000 (12:58 -0700)]
am
2c702990: Merge "Fix logic in fallback ringtone handling" into klp-dev
* commit '
2c7029902961772a1531b6502e4fb45a3e6fb76f':
Fix logic in fallback ringtone handling
Marco Nelissen [Thu, 26 Sep 2013 19:56:12 +0000 (19:56 +0000)]
Merge "Fix logic in fallback ringtone handling" into klp-dev
Scott Main [Thu, 26 Sep 2013 19:54:30 +0000 (12:54 -0700)]
am
9f54a583: am
6d49f698: am
ce57e1a6: am
4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
* commit '
9f54a5834a5dacbf742ae17a63d7e5e290b6ccb3':
update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
Sungmin Choi [Wed, 25 Sep 2013 09:16:46 +0000 (02:16 -0700)]
telephony: Set roam though same named operator
Show roaming icon though same named operators.
Though same mcc and same operator name, some operator want to roam.
For example, users of 40485 should see the roaming icon as using 40483
network though same Reliance network.
To do this, add 40483 item to values-mcc404-mnc85/config.xml
Bug:
10699045,
10703022
Change-Id: Ife1024ef10a29e43e32040800b25feca9f51fb62
Conflicts:
core/res/res/values/config.xml
core/res/res/values/symbols.xml
Scott Main [Thu, 26 Sep 2013 19:51:09 +0000 (12:51 -0700)]
am
6d49f698: am
ce57e1a6: am
4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
* commit '
6d49f6980bff8c4ec15db169128b439c0b732ac5':
update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
Scott Main [Thu, 26 Sep 2013 19:48:04 +0000 (12:48 -0700)]
am
ce57e1a6: am
4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
* commit '
ce57e1a6f373c4f1c39b048adc1f2bbe6232be0e':
update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
Scott Main [Thu, 26 Sep 2013 19:45:22 +0000 (12:45 -0700)]
am
4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
* commit '
4c9ed63cc66c5558e3b0330b17df92e99290eaf7':
update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
Marco Nelissen [Thu, 26 Sep 2013 19:44:55 +0000 (12:44 -0700)]
Fix logic in fallback ringtone handling
The existing code would only play a fallback ringtone if the requested
ringtone was one of the three ringtone uris that are defined by settings,
and it wasn't set to "silent".
Now it also plays the fallback for custom ringtone uris.
b/
10891718
Change-Id: I79c2298c6497165e6845b98532cce0855347e50b
Scott Main [Thu, 26 Sep 2013 19:44:26 +0000 (12:44 -0700)]
am
fc8a982e: am
95fdf3d9: am
a37c524f: am
54f8facf: update action bar icon pack with xxhdpi assets bug:
9761668
* commit '
fc8a982e55b3d6308a35d8674a192972ecd6f632':
update action bar icon pack with xxhdpi assets bug:
9761668
John Spurlock [Thu, 26 Sep 2013 19:44:23 +0000 (12:44 -0700)]
am
e54eb7f9: Merge "Add RTL versions of wimax status bar icons." into klp-dev
* commit '
e54eb7f9441d279e585b37ca16ce220ed2dcd27c':
Add RTL versions of wimax status bar icons.
Scott Main [Thu, 26 Sep 2013 19:42:26 +0000 (12:42 -0700)]
am
95fdf3d9: am
a37c524f: am
54f8facf: update action bar icon pack with xxhdpi assets bug:
9761668
* commit '
95fdf3d91fc49956daea8cdaf30f7a578fdbeb8b':
update action bar icon pack with xxhdpi assets bug:
9761668
John Spurlock [Thu, 26 Sep 2013 19:41:56 +0000 (19:41 +0000)]
Merge "Add RTL versions of wimax status bar icons." into klp-dev
Scott Main [Thu, 26 Sep 2013 19:40:29 +0000 (12:40 -0700)]
am
a37c524f: am
54f8facf: update action bar icon pack with xxhdpi assets bug:
9761668
* commit '
a37c524ffc4a0387fac79e8ad4ab6319eeb99fa8':
update action bar icon pack with xxhdpi assets bug:
9761668
Scott Main [Thu, 26 Sep 2013 19:39:27 +0000 (12:39 -0700)]
update the nav drawer lesson to link to new action bar icon pack,
which now includes the nav drawer icon
Change-Id: I0d6452fa5b4856b96268763141d74dd8f83c221d
Scott Main [Thu, 26 Sep 2013 19:37:44 +0000 (12:37 -0700)]
am
54f8facf: update action bar icon pack with xxhdpi assets bug:
9761668
* commit '
54f8facfc8d103e6dd7211bbabfe36d083798731':
update action bar icon pack with xxhdpi assets bug:
9761668
John Spurlock [Thu, 26 Sep 2013 19:36:31 +0000 (15:36 -0400)]
Add RTL versions of wimax status bar icons.
Bug:
7968781
Change-Id: I9f03d92f7682416ad4b99ecfb18317842b85163d
Svetoslav Ganov [Thu, 26 Sep 2013 06:52:36 +0000 (23:52 -0700)]
PackageManager#queryIntentServices breaks its contract.
PackageManager#queryIntentServices javadoc contract states that this
method (and the like) never returns null, rather an empty list if
no result is found. However, there is a path in the PackageManagerService
that returns null, thus breaking the contract. Handling the null list
explicitly.
bug:
10930560
Change-Id: I708c51b8b7075e529145c8b0bf159efd6b697532
Scott Main [Thu, 26 Sep 2013 19:30:30 +0000 (12:30 -0700)]
update action bar icon pack with xxhdpi assets
bug:
9761668
Change-Id: Ib76dec4f90052c803c224f6489876644ee2f44ab
Svetoslav Ganov [Thu, 26 Sep 2013 19:25:10 +0000 (12:25 -0700)]
am
5cab967b: Merge "Adding hidden APIs for observing the print jobs state." into klp-dev
* commit '
5cab967bf2bab49777bfa86dff8b0f892192ede6':
Adding hidden APIs for observing the print jobs state.
Svetoslav Ganov [Thu, 26 Sep 2013 19:25:07 +0000 (12:25 -0700)]
am
3adc49c6: Merge "Disallow range selection if the document has unknown page count." into klp-dev
* commit '
3adc49c6780633b8bccc3b5b8dca10788c2288bc':
Disallow range selection if the document has unknown page count.
Svetoslav Ganov [Thu, 26 Sep 2013 19:22:19 +0000 (19:22 +0000)]
Merge "Adding hidden APIs for observing the print jobs state." into klp-dev
Svetoslav Ganov [Thu, 26 Sep 2013 19:21:30 +0000 (12:21 -0700)]
am
c9cfd605: Merge "Missed signal in FusedPrintersLoader." into klp-dev
* commit '
c9cfd605a24cf20df5248d73804c584168db64c9':
Missed signal in FusedPrintersLoader.
Svetoslav Ganov [Thu, 26 Sep 2013 19:21:27 +0000 (12:21 -0700)]
am
027ff385: Merge "Page range validation edge case handling." into klp-dev
* commit '
027ff3855d257e5179d43a1859bf56530d0f975a':
Page range validation edge case handling.
Svetoslav Ganov [Thu, 26 Sep 2013 19:21:06 +0000 (19:21 +0000)]
Merge "Disallow range selection if the document has unknown page count." into klp-dev
Svetoslav Ganov [Thu, 26 Sep 2013 19:20:28 +0000 (19:20 +0000)]
Merge "Missed signal in FusedPrintersLoader." into klp-dev
Svetoslav Ganov [Thu, 26 Sep 2013 19:19:39 +0000 (19:19 +0000)]
Merge "Page range validation edge case handling." into klp-dev
Martijn Coenen [Thu, 26 Sep 2013 18:52:28 +0000 (11:52 -0700)]
am
1de64c0a: Merge "Fix crash in ApduServiceInfo parsing." into klp-dev
* commit '
1de64c0aa55f74f5b2692dcac3b3350dacda4041':
Fix crash in ApduServiceInfo parsing.
Martijn Coenen [Thu, 26 Sep 2013 18:48:20 +0000 (18:48 +0000)]
Merge "Fix crash in ApduServiceInfo parsing." into klp-dev
Martijn Coenen [Thu, 26 Sep 2013 18:20:37 +0000 (11:20 -0700)]
Fix crash in ApduServiceInfo parsing.
Bug:
10949100
Change-Id: I181734074b071179ea5637a070714643508bc64b
Jeff Sharkey [Thu, 26 Sep 2013 18:18:42 +0000 (11:18 -0700)]
am
ef224156: Merge "Update external storage permission strings." into klp-dev
* commit '
ef2241563f8b15491fda198b49fe58e0ec316bfe':
Update external storage permission strings.
Jeff Sharkey [Thu, 26 Sep 2013 18:16:50 +0000 (18:16 +0000)]
Merge "Update external storage permission strings." into klp-dev
Adam Koch [Thu, 26 Sep 2013 18:14:02 +0000 (11:14 -0700)]
am
10fe8573: am
f0b67e1f: am
cf5a962b: am
e405da02: Doc fix: remove insecure sharing suggestions from training class Bug:
10841151
* commit '
10fe85739f8f87fedf474f5f1cc4b0caeece8039':
Doc fix: remove insecure sharing suggestions from training class Bug:
10841151
Adam Koch [Thu, 26 Sep 2013 18:12:24 +0000 (11:12 -0700)]
am
f0b67e1f: am
cf5a962b: am
e405da02: Doc fix: remove insecure sharing suggestions from training class Bug:
10841151
* commit '
f0b67e1f30a8d2825cc99004c1c9141bb866b719':
Doc fix: remove insecure sharing suggestions from training class Bug:
10841151
Adam Koch [Thu, 26 Sep 2013 18:10:34 +0000 (11:10 -0700)]
am
cf5a962b: am
e405da02: Doc fix: remove insecure sharing suggestions from training class Bug:
10841151
* commit '
cf5a962b05aabcdd2c7a25081772af2e7f2a62d5':
Doc fix: remove insecure sharing suggestions from training class Bug:
10841151
Adam Koch [Thu, 26 Sep 2013 18:06:17 +0000 (11:06 -0700)]
am
e405da02: Doc fix: remove insecure sharing suggestions from training class Bug:
10841151
* commit '
e405da02208145d2ea8de0759c0f0027d4560840':
Doc fix: remove insecure sharing suggestions from training class Bug:
10841151
Jeff Sharkey [Thu, 26 Sep 2013 18:01:56 +0000 (11:01 -0700)]
Update external storage permission strings.
Bug:
10681853
Change-Id: I92ee1a349b1dd5fcd08d1e7cb936a77774d72da6
Jeff Sharkey [Thu, 26 Sep 2013 18:00:48 +0000 (11:00 -0700)]
am
bb77d99c: Merge "Directories are always enabled; update assets." into klp-dev
* commit '
bb77d99c257bc4a3371548c4bc8ba7088fa76005':
Directories are always enabled; update assets.
Jeff Sharkey [Thu, 26 Sep 2013 17:58:41 +0000 (17:58 +0000)]
Merge "Directories are always enabled; update assets." into klp-dev
Adam Koch [Wed, 25 Sep 2013 20:30:26 +0000 (16:30 -0400)]
Doc fix: remove insecure sharing suggestions from training class
Bug:
10841151
Change-Id: I11de149d512340d098a8c23661cd6f6a342718d5
Jeff Sharkey [Thu, 26 Sep 2013 17:54:16 +0000 (10:54 -0700)]
Directories are always enabled; update assets.
Fix bug where item enabled state depended on FLAG_SUPPORTS_WRITE;
directories are now always enabled. Also unifies enabled testing.
Bug:
10903210,
10946731
Change-Id: I241533d273dfe4a2146bb322a8bd93066bf4ef55