OSDN Git Service
Vikram Aggarwal [Mon, 8 Oct 2012 17:04:04 +0000 (10:04 -0700)]
am
c3ebad20: Remove verbose logging
* commit '
c3ebad20f24299a680caa4ab70e22e9042df405e':
Remove verbose logging
Vikram Aggarwal [Mon, 8 Oct 2012 16:11:06 +0000 (09:11 -0700)]
Remove verbose logging
Bug:
7302014 CryptKeeper logs PII data
Change-Id: I4dec3a827a5b6880b1c0995b8adebf34315c4773
Baligh Uddin [Mon, 8 Oct 2012 14:55:08 +0000 (07:55 -0700)]
am
df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
df54b396941adb14107ce54a61b78f2a9378ec09':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 14:54:28 +0000 (07:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 8 Oct 2012 14:53:45 +0000 (07:53 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Amith Yamasani [Sun, 7 Oct 2012 21:04:10 +0000 (14:04 -0700)]
am
29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev
* commit '
29707a501c6f61108e479a6129e89791dc5a1f36':
Fix layout for decryption password entry.
Amith Yamasani [Sun, 7 Oct 2012 21:02:25 +0000 (14:02 -0700)]
Merge "Fix layout for decryption password entry." into jb-mr1-dev
Svetoslav Ganov [Sun, 7 Oct 2012 19:03:45 +0000 (12:03 -0700)]
am
7e54c544: Clean up \'accessibility shortcut\' screen.
* commit '
7e54c544aa3b16245486cf3787e79cab5bbdb651':
Clean up 'accessibility shortcut' screen.
Svetoslav Ganov [Sun, 7 Oct 2012 18:48:53 +0000 (11:48 -0700)]
Clean up 'accessibility shortcut' screen.
1. Last polishes to the accessibility shortcut screen.
bug:
7298927
Change-Id: I8109f215c63eeaa6ea4bf589aa4af897d09c5e03
Amith Yamasani [Sat, 6 Oct 2012 04:13:53 +0000 (21:13 -0700)]
Fix layout for decryption password entry.
Use the same layout for landscape and portrait, which vertically centers
the password entry field. Works fine for portrait.
Also removed some vestigial keyboard view in the layout.
Bug:
7298970
Change-Id: I499468dda5e6eb46815fd0bed786d14c892cc830
Amith Yamasani [Sat, 6 Oct 2012 03:54:35 +0000 (20:54 -0700)]
am
0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev
* commit '
0b146b238496fdb36ad575f9a0b96dc43f812aa3':
Revert "Show warning dialog in a multiuser system when adding a new account."
Amith Yamasani [Sat, 6 Oct 2012 03:53:02 +0000 (20:53 -0700)]
Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev
Amith Yamasani [Tue, 2 Oct 2012 22:16:21 +0000 (15:16 -0700)]
Revert "Show warning dialog in a multiuser system when adding a new account."
This reverts commit
eb71f2689785bd43560afb04f8b2281c3f67f695
Change-Id: Iad4a6656e922c0d2dbd3dd349d1c24d597eab7f5
Baligh Uddin [Fri, 5 Oct 2012 23:29:40 +0000 (16:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I370e6491b374c4c828b128955eefce762335fa52
Auto-generated-cl: translation import
Baligh Uddin [Fri, 5 Oct 2012 23:27:44 +0000 (16:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6c6a598c03f12d3ac9e9a3cc08d479d7b8f1f274
Auto-generated-cl: translation import
Adam Cohen [Fri, 5 Oct 2012 21:18:24 +0000 (14:18 -0700)]
am
1f9a07b5: Merge "Fixing filter for status widget (issue
7295596)" into jb-mr1-dev
* commit '
1f9a07b5e9b1868fc6741c99e74970aa0e9762fe':
Fixing filter for status widget (issue
7295596)
Svetoslav Ganov [Fri, 5 Oct 2012 21:16:58 +0000 (14:16 -0700)]
am
78995994: Updating the screen magnification strings.
* commit '
78995994b9b0afbc4c4705e41d1c4ac944e557f2':
Updating the screen magnification strings.
Adam Cohen [Fri, 5 Oct 2012 21:16:42 +0000 (14:16 -0700)]
Merge "Fixing filter for status widget (issue
7295596)" into jb-mr1-dev
Svetoslav Ganov [Fri, 5 Oct 2012 21:02:36 +0000 (14:02 -0700)]
Updating the screen magnification strings.
bug:
7295457
Change-Id: Idef3950b975fbb8071067c165fa52358aa6b828d
Jeff Sharkey [Fri, 5 Oct 2012 20:55:36 +0000 (13:55 -0700)]
am
4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
* commit '
4a58b1006cec93565a7106c117b2c87248341404':
Avoid NPE when missing PackageInfo.
Jeff Sharkey [Fri, 5 Oct 2012 20:53:39 +0000 (13:53 -0700)]
Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
Svetoslav Ganov [Fri, 5 Oct 2012 20:48:08 +0000 (13:48 -0700)]
am
69621ece: Locale selection settings do not hide warning dialog.
* commit '
69621ece97d9f82e7408562f28110f40d872cb24':
Locale selection settings do not hide warning dialog.
Adam Cohen [Fri, 5 Oct 2012 20:42:04 +0000 (13:42 -0700)]
Fixing filter for status widget (issue
7295596)
Change-Id: I63515bc68550357b8e2738450eefa01ec3122229
Jeff Sharkey [Fri, 5 Oct 2012 20:34:41 +0000 (13:34 -0700)]
Avoid NPE when missing PackageInfo.
Bug:
7296861
Change-Id: I87b64d5f4b1f34e47d785a18a029130fdca874a1
Svetoslav Ganov [Fri, 5 Oct 2012 19:39:29 +0000 (12:39 -0700)]
Locale selection settings do not hide warning dialog.
1. If there is more than one user on the device and a user tries
to modify the locale which is shared across all users we are
showing a warning dialog. When the user selects OK we are
changing the locale and going to the previous screen. This is
achieved by removing the locale selection fragment from the
backstack. The problem was that the dialog was not dismissed
upon OK in the dialog which resulted in saving the dialog's
state and an attempt to restore it on the wrong fragment which
has no idea about this dialog, this returning a null dialog
resulting in a crash. This change removes the dialog on
OK selection.
bug:
7265186
Change-Id: I336ab54f5281c7a9ae24f1c25769daac46477ebd
Baligh Uddin [Fri, 5 Oct 2012 05:21:01 +0000 (22:21 -0700)]
am
9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
9d90489078b406d3a52e27ef517278e15f603f76':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 05:19:15 +0000 (22:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 5 Oct 2012 05:18:41 +0000 (22:18 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Amith Yamasani [Fri, 5 Oct 2012 04:58:07 +0000 (21:58 -0700)]
am
6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev
* commit '
6fd359d8f66e9a2fea45251e52b7a6b07561705b':
Move the position of widget choosers to below lockscreen settings in Security
Amith Yamasani [Fri, 5 Oct 2012 04:56:04 +0000 (21:56 -0700)]
Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev
Charles Chen [Fri, 5 Oct 2012 01:33:43 +0000 (18:33 -0700)]
am
992e0b85: Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev
* commit '
992e0b8537e4fa2f6f6941f7e21d142c40499e7a':
Announce dynamic content changes in lock confirmation settings.
Charles Chen [Fri, 5 Oct 2012 01:32:29 +0000 (18:32 -0700)]
Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev
Dianne Hackborn [Fri, 5 Oct 2012 00:22:32 +0000 (17:22 -0700)]
am
2c41f7be: Merge "Fix issue #
7226978: Still in app detail screen after uninstall" into jb-mr1-dev
* commit '
2c41f7be44715483de4d3e9c8a91488c4f723e90':
Fix issue #
7226978: Still in app detail screen after uninstall
Dianne Hackborn [Fri, 5 Oct 2012 00:20:44 +0000 (17:20 -0700)]
Merge "Fix issue #
7226978: Still in app detail screen after uninstall" into jb-mr1-dev
Jeff Sharkey [Thu, 4 Oct 2012 23:42:27 +0000 (16:42 -0700)]
am
113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev
* commit '
113e4b6aa1dfbc49abdf6366909ceb4a6923d114':
Refresh authenticator info when accounts change.
Jeff Sharkey [Thu, 4 Oct 2012 23:40:25 +0000 (16:40 -0700)]
Merge "Refresh authenticator info when accounts change." into jb-mr1-dev
Amith Yamasani [Thu, 4 Oct 2012 23:21:36 +0000 (16:21 -0700)]
Move the position of widget choosers to below lockscreen settings in Security
Bug:
7261302
Move the 2 widget options on lockscreen to below the lock related items, just
above the Owner Info item.
Change-Id: I373b915e15bc93ce7e56f5982999afa1e5aed281
Dianne Hackborn [Thu, 4 Oct 2012 22:44:50 +0000 (15:44 -0700)]
Fix issue #
7226978: Still in app detail screen after uninstall
Change-Id: I3b03db0a68bfab5dd010474ee714d5f7a5538af0
Baligh Uddin [Thu, 4 Oct 2012 22:00:03 +0000 (15:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d77c147969acf45abfa5eb4924fb20639d409ee
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Oct 2012 21:58:30 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9d3249b9c3962ef225c8f7566f8aa96805d89355
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Oct 2012 17:40:56 +0000 (10:40 -0700)]
am
27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
27636444a4be011a6a813cba6429e58629316ce4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 17:38:53 +0000 (10:38 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 4 Oct 2012 17:00:57 +0000 (10:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Thu, 4 Oct 2012 04:23:00 +0000 (21:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e5c043d16bb59b50b4341a44827c824c564786c
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Oct 2012 04:21:22 +0000 (21:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I65e354b797114c305fdce72fd57ee8039e16630a
Auto-generated-cl: translation import
Amith Yamasani [Thu, 4 Oct 2012 00:52:59 +0000 (17:52 -0700)]
am
875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev
* commit '
875fa8affb0f3b0ac39120833a7778f92c97b965':
No decoration for WifiSetup activity used by SetupWizard
Amith Yamasani [Thu, 4 Oct 2012 00:50:58 +0000 (17:50 -0700)]
Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev
alanv [Thu, 4 Oct 2012 00:10:50 +0000 (17:10 -0700)]
Announce dynamic content changes in lock confirmation settings.
Also re-orders updateStage() and setText/Selection calls so that text
events don't flush announcements. This does not change functionality.
Bug:
7256500
Change-Id: I8b10d66e9f73c7a630a8c3c5128372e18f26234c
Adam Powell [Wed, 3 Oct 2012 23:59:13 +0000 (16:59 -0700)]
am
c8e609c4: Merge "Navigation fixes for Settings" into jb-mr1-dev
* commit '
c8e609c49d836ec8c87bc52b9f592693fd860f1d':
Navigation fixes for Settings
Adam Powell [Wed, 3 Oct 2012 23:57:43 +0000 (16:57 -0700)]
Merge "Navigation fixes for Settings" into jb-mr1-dev
Jeff Sharkey [Wed, 3 Oct 2012 23:48:17 +0000 (16:48 -0700)]
Refresh authenticator info when accounts change.
There may be newly installed authenticators, so refresh them when
accounts change.
Bug:
7280043
Change-Id: Ic173970c815950526c77a2653e7fae4551948f13
Adam Powell [Wed, 3 Oct 2012 23:29:56 +0000 (16:29 -0700)]
Navigation fixes for Settings
Change quick-entry points to Settings to have taskAffinity="",
excludeFromRecents="true", and no parentActivityName.
This makes the various quick shortcuts more standalone; their task
state does not persist and they have no Up navigation available. As
most shortcuts do not launch these activities with
FLAG_ACTIVITY_TASK_ON_HOME, Back will return the user to the previous
task.
This does not affect the "real" versions of these settings screens as
navigated to through the front door of the Settings app; those screens
are reached through SubSettings instances with specific fragments
added.
Bug
7276291
Change-Id: I7864437277601a3f6b6beded44a5edfd4636010c
Amith Yamasani [Wed, 3 Oct 2012 23:23:35 +0000 (16:23 -0700)]
No decoration for WifiSetup activity used by SetupWizard
Bug:
7274530
Change-Id: I981aa5fb3fca854f0b378b7c219feb92567598ce
Jeff Sharkey [Wed, 3 Oct 2012 23:17:17 +0000 (16:17 -0700)]
am
ffec6eac: Merge "Avoid NPE when installing app update." into jb-mr1-dev
* commit '
ffec6eaca53c521d18e8bd295f4e3b896cefedb5':
Avoid NPE when installing app update.
Jeff Sharkey [Wed, 3 Oct 2012 23:15:31 +0000 (16:15 -0700)]
Merge "Avoid NPE when installing app update." into jb-mr1-dev
Jeff Sharkey [Wed, 3 Oct 2012 23:06:41 +0000 (16:06 -0700)]
Avoid NPE when installing app update.
PMS sends REMOVED followed quickly by ADDED. Ignore when missing
package, since it may be coming back shortly. Eventually we should
change this to watch EXTRA_REPLACING.
Bug:
7269896
Change-Id: I3b518f4faee34019c5c808824d5e46261f6d206a
Svetoslav Ganov [Wed, 3 Oct 2012 20:06:52 +0000 (13:06 -0700)]
am
69643009: Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev
* commit '
69643009a663bdd64b4fbe7a08c4c7a2111d2207':
Add a11y content descriptions and label mapping to Dreams.
Svetoslav Ganov [Wed, 3 Oct 2012 20:05:06 +0000 (13:05 -0700)]
Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev
Amith Yamasani [Wed, 3 Oct 2012 05:23:28 +0000 (22:23 -0700)]
am
2fa8cf73: Merge "Use new color avatar assets" into jb-mr1-dev
* commit '
2fa8cf7360c7c1ad309fe878355426a6e161af5b':
Use new color avatar assets
Amith Yamasani [Wed, 3 Oct 2012 05:21:05 +0000 (22:21 -0700)]
Merge "Use new color avatar assets" into jb-mr1-dev
Amith Yamasani [Wed, 3 Oct 2012 04:10:48 +0000 (21:10 -0700)]
Use new color avatar assets
Bug:
7204409
Bug:
7222997
Change-Id: Iac2c4ab2d7bf0090670573bf4c967f07abdf6f51
Jeff Sharkey [Wed, 3 Oct 2012 02:04:48 +0000 (19:04 -0700)]
am
b0e25f71: Merge "Follow API changes in framework." into jb-mr1-dev
* commit '
b0e25f71a8376c6435212a3ce695f321d0ea828e':
Follow API changes in framework.
Jeff Sharkey [Wed, 3 Oct 2012 02:02:46 +0000 (19:02 -0700)]
Merge "Follow API changes in framework." into jb-mr1-dev
Jeff Sharkey [Wed, 3 Oct 2012 01:57:55 +0000 (18:57 -0700)]
Follow API changes in framework.
Change-Id: I6c1f5c9ec342f69ceae3dddaa0cfab4e0a742372
Amith Yamasani [Wed, 3 Oct 2012 00:30:59 +0000 (17:30 -0700)]
am
a8f3a204: Merge "Improved dialog management in Settings>Users" into jb-mr1-dev
* commit '
a8f3a204d908330e31c29a11d5a83b8ba40a9610':
Improved dialog management in Settings>Users
Amith Yamasani [Wed, 3 Oct 2012 00:29:27 +0000 (17:29 -0700)]
Merge "Improved dialog management in Settings>Users" into jb-mr1-dev
Russell Brenner [Wed, 3 Oct 2012 00:19:30 +0000 (17:19 -0700)]
am
d13e3396: Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev
* commit '
d13e3396852b4a98c46f2fc02d7a81dcdc1ab7f5':
Pass flag to indicate multiple users on device
Russell Brenner [Wed, 3 Oct 2012 00:17:59 +0000 (17:17 -0700)]
Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev
alanv [Wed, 3 Oct 2012 00:16:18 +0000 (17:16 -0700)]
Add a11y content descriptions and label mapping to Dreams.
Also makes the radio button non-focusable and non-clickable, since
focus and click are handled by its list item container. Clicking on
top of the radio button still works as intended.
Bug:
7230372
Change-Id: I0f311160b09402d882c9d35fdb51e8f19c60f522
Amith Yamasani [Tue, 2 Oct 2012 21:51:46 +0000 (14:51 -0700)]
Improved dialog management in Settings>Users
Bug:
7266284 Delete not functional after orientation change
Bug:
7266182 Set up now not functional after orientation change
Also remove "vibrate when ringing" on tablets
Bug:
7253081
Change-Id: Ie616747f2e3292c401613eb2041b5a5a289cde20
Jeff Sharkey [Tue, 2 Oct 2012 21:00:18 +0000 (14:00 -0700)]
am
6258a0e2: Merge "Migrate telephony settings to Global." into jb-mr1-dev
* commit '
6258a0e22ed82f8fcc80e50ffda058ebcaf177e1':
Migrate telephony settings to Global.
Jeff Sharkey [Tue, 2 Oct 2012 20:57:59 +0000 (13:57 -0700)]
Merge "Migrate telephony settings to Global." into jb-mr1-dev
Russell Brenner [Tue, 2 Oct 2012 00:30:59 +0000 (17:30 -0700)]
Pass flag to indicate multiple users on device
When creating a new account, some informational text changes when
more than one user exists on the device. Because GLS is built with
the SDK and because there is no public API to indicate this state,
a flag is added to the bundle passed to the AccountManager, which
then funnels down to GLS.
Bug:
7255673
Change-Id: Ida2aa5f70ab308958de510a95194463c2a089182
Daniel Sandler [Tue, 2 Oct 2012 17:53:02 +0000 (10:53 -0700)]
am
42312b47: Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
* commit '
42312b47926809a7042e2db5aec945417e11f53f':
Support new ACTION_QUICK_CLOCK.
Daniel Sandler [Tue, 2 Oct 2012 17:49:51 +0000 (10:49 -0700)]
Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
Chris Wren [Tue, 2 Oct 2012 15:50:30 +0000 (08:50 -0700)]
am
23a5fbbd: renaming Sleep Mode feature.
* commit '
23a5fbbdf4c0b4bb815fff69a20598dcb3588080':
renaming Sleep Mode feature.
Chris Wren [Tue, 2 Oct 2012 13:42:39 +0000 (09:42 -0400)]
renaming Sleep Mode feature.
Bug:
7212796
Bug:
7267485
Change-Id: I28b94bc53d7bf1bac4d7d1de6e6ed74c850ff8c3
Baligh Uddin [Tue, 2 Oct 2012 06:32:51 +0000 (23:32 -0700)]
am
1e230b40: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
1e230b4087cc923ab756d09a00eb754874f6bf92':
Import translations. DO NOT MERGE
Svetoslav Ganov [Tue, 2 Oct 2012 06:32:49 +0000 (23:32 -0700)]
am
f26263fd: Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
* commit '
f26263fdb7a639fe5de49e8f01576e8d4c6be7f6':
Upading the strings for accessibility multi-user.
Baligh Uddin [Tue, 2 Oct 2012 05:22:38 +0000 (22:22 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Tue, 2 Oct 2012 05:20:28 +0000 (22:20 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Svetoslav Ganov [Tue, 2 Oct 2012 04:17:18 +0000 (21:17 -0700)]
Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
Svetoslav Ganov [Tue, 2 Oct 2012 01:41:25 +0000 (18:41 -0700)]
Upading the strings for accessibility multi-user.
bug:
7255486
Change-Id: I775165896124a6fde3684d0f302a90396ce19d2e
Baligh Uddin [Mon, 1 Oct 2012 22:34:23 +0000 (15:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I117727baf42a812b608c5931ad76cf9f70ff0c9e
Auto-generated-cl: translation import
Baligh Uddin [Mon, 1 Oct 2012 22:32:43 +0000 (15:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I576f2a4c47da5f4796042ffacfaa6cc3835e8075
Auto-generated-cl: translation import
Adam Powell [Mon, 1 Oct 2012 21:55:00 +0000 (14:55 -0700)]
am
7474bc3d: Move the installed app details overflow button to the top.
* commit '
7474bc3dc2461d33dcdcaf5595635ac33e6e3979':
Move the installed app details overflow button to the top.
Adam Powell [Mon, 1 Oct 2012 01:21:14 +0000 (18:21 -0700)]
Move the installed app details overflow button to the top.
It looks ridiculous down by itself on a split action bar.
Bug
7258991
Change-Id: I4c373e1e154a793384a14e9622707ad464c1b1ca
Jeff Sharkey [Mon, 1 Oct 2012 20:39:24 +0000 (13:39 -0700)]
Migrate telephony settings to Global.
Bug:
7231764
Change-Id: Ic28dacda8372b7976b5aa36be82e98e5ad069f9a
Daniel Sandler [Mon, 1 Oct 2012 20:45:10 +0000 (16:45 -0400)]
Support new ACTION_QUICK_CLOCK.
See change Ic561dbeb.
Bug:
7264806
Change-Id: I8439f2c25614ef794e43f85196d3f95c188e8cce
Baligh Uddin [Mon, 1 Oct 2012 17:17:37 +0000 (10:17 -0700)]
am
fd94d51e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
fd94d51e945273a942947433aed828884bbaa17f':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 17:15:55 +0000 (10:15 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 1 Oct 2012 17:15:17 +0000 (10:15 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
rich cannings [Sun, 30 Sep 2012 22:51:24 +0000 (15:51 -0700)]
am
82988b48: Merge "Add Help lin to Settings > Security" into jb-mr1-dev
* commit '
82988b4871bd318d16aeb13947c7388eb1c5f195':
Add Help lin to Settings > Security
rich cannings [Sun, 30 Sep 2012 22:48:54 +0000 (15:48 -0700)]
Merge "Add Help lin to Settings > Security" into jb-mr1-dev
rich cannings [Sun, 30 Sep 2012 20:54:26 +0000 (13:54 -0700)]
Add Help lin to Settings > Security
Bug:
7210077
Change-Id: I1010356e27d85006e7d7dc62d935b67f53ccde12
Amith Yamasani [Sun, 30 Sep 2012 21:42:53 +0000 (14:42 -0700)]
am
2485d9fc: Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
* commit '
2485d9fc5113e7a886ae5b59e535905b0f210fa4':
Make Settings shortcuts launch into the correct activity/fragment.
Amith Yamasani [Sun, 30 Sep 2012 21:41:11 +0000 (14:41 -0700)]
Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
Amith Yamasani [Fri, 28 Sep 2012 23:40:42 +0000 (16:40 -0700)]
Make Settings shortcuts launch into the correct activity/fragment.
Bug:
6959454
Change the task affinities so that the shortcuts are not tied to
Settings main task.
Change-Id: I7729d17d8144a4a57f0d135fe80bdbd7af8dad01
Dianne Hackborn [Sat, 29 Sep 2012 01:22:27 +0000 (18:22 -0700)]
am
1a47ecd9: Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
* commit '
1a47ecd9269ff28bec71592b8c3d9a857ac49967':
Fix issue #
7255954: API Review: rename Dream to DreamService
Dianne Hackborn [Sat, 29 Sep 2012 01:18:21 +0000 (18:18 -0700)]
Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev