OSDN Git Service
Svetoslav Ganov [Wed, 3 Oct 2012 21:04:42 +0000 (14:04 -0700)]
am
89a2d54a: am
9b6af82c: am
69643009: Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev
* commit '
89a2d54aefb7b1fd0e41a283162a57005f75ebcf':
Add a11y content descriptions and label mapping to Dreams.
Svetoslav Ganov [Wed, 3 Oct 2012 20:54:08 +0000 (13:54 -0700)]
am
9b6af82c: am
69643009: Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev
* commit '
9b6af82c298dddaf8b870ac6e59ce3e7c267fc36':
Add a11y content descriptions and label mapping to Dreams.
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
The Android Open Source Project [Wed, 3 Oct 2012 14:40:19 +0000 (07:40 -0700)]
am
852ebb61: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
852ebb61f4d30f7c4eb15705fecb6361dd2681b0':
The Android Open Source Project [Wed, 3 Oct 2012 14:35:14 +0000 (07:35 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I28f81c04fd28b62d82de00f525ccd76911114bd3
The Android Automerger [Wed, 3 Oct 2012 14:00:16 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Amith Yamasani [Wed, 3 Oct 2012 05:27:03 +0000 (22:27 -0700)]
am
d187eae5: am
42abadb0: am
2fa8cf73: Merge "Use new color avatar assets" into jb-mr1-dev
* commit '
d187eae558bda7eb485fe859f34ae06f54cba5f3':
Use new color avatar assets
Amith Yamasani [Wed, 3 Oct 2012 05:25:22 +0000 (22:25 -0700)]
am
42abadb0: am
2fa8cf73: Merge "Use new color avatar assets" into jb-mr1-dev
* commit '
42abadb04ad2821e120575a4bedc8ea800da879e':
Use new color avatar assets
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:08:50 +0000 (19:08 -0700)]
am
9f396f52: am
ccb277ef: am
b0e25f71: Merge "Follow API changes in framework." into jb-mr1-dev
* commit '
9f396f52ee73e983fbe876c99f7ccc7d0ff7d43b':
Follow API changes in framework.
Jeff Sharkey [Wed, 3 Oct 2012 02:07:30 +0000 (19:07 -0700)]
am
ccb277ef: am
b0e25f71: Merge "Follow API changes in framework." into jb-mr1-dev
* commit '
ccb277ef37f79d48c120e5860d831cc468ae1b9a':
Follow API changes in framework.
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:33:46 +0000 (17:33 -0700)]
am
ef1048d5: am
d8c2511c: am
a8f3a204: Merge "Improved dialog management in Settings>Users" into jb-mr1-dev
* commit '
ef1048d588d4c05420063b6b01b8f2fd20a6a5c9':
Improved dialog management in Settings>Users
Amith Yamasani [Wed, 3 Oct 2012 00:32:32 +0000 (17:32 -0700)]
am
d8c2511c: am
a8f3a204: Merge "Improved dialog management in Settings>Users" into jb-mr1-dev
* commit '
d8c2511c4d7f6ddcdb14a0fe433fce8f8c8ae2a1':
Improved dialog management in Settings>Users
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:24:13 +0000 (17:24 -0700)]
am
5a0d9e26: am
8828a1b0: am
d13e3396: Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev
* commit '
5a0d9e265cf8410a5a8bcceeaab56dbaac76a6fb':
Pass flag to indicate multiple users on device
Russell Brenner [Wed, 3 Oct 2012 00:21:51 +0000 (17:21 -0700)]
am
8828a1b0: am
d13e3396: Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev
* commit '
8828a1b0eb169117686303a598fdb8fd19a46db1':
Pass flag to indicate multiple users on device
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:05:36 +0000 (14:05 -0700)]
am
3b8ca450: am
d8d8a200: am
6258a0e2: Merge "Migrate telephony settings to Global." into jb-mr1-dev
* commit '
3b8ca4505cdaffb7168032766027e7b907b2a4b0':
Migrate telephony settings to Global.
Jeff Sharkey [Tue, 2 Oct 2012 21:02:21 +0000 (14:02 -0700)]
am
d8d8a200: am
6258a0e2: Merge "Migrate telephony settings to Global." into jb-mr1-dev
* commit '
d8d8a2002aaf791285cd68368dba010c65a6743b':
Migrate telephony settings to Global.
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
Daniel Sandler [Tue, 2 Oct 2012 17:59:11 +0000 (10:59 -0700)]
am
0d166c3f: am
f94b8de1: am
42312b47: Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
* commit '
0d166c3fc96f3c2e837d6d0b1b5a0f2948e0b901':
Support new ACTION_QUICK_CLOCK.
Daniel Sandler [Tue, 2 Oct 2012 17:56:25 +0000 (10:56 -0700)]
am
f94b8de1: am
42312b47: Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
* commit '
f94b8de1cdd0f149f5abd11177ce4a59ff7db0c1':
Support new ACTION_QUICK_CLOCK.
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
The Android Open Source Project [Tue, 2 Oct 2012 16:24:46 +0000 (09:24 -0700)]
am
81a3dfd4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
81a3dfd4e33c318769f29cf3eb7e00a42c2d1ecc':
Show warnings when skipping Wi-Fi connection
The Android Open Source Project [Tue, 2 Oct 2012 16:20:26 +0000 (09:20 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I31f2c7e4ec4673e7b360ba4abc94b4138cb135d8
Chris Wren [Tue, 2 Oct 2012 15:53:10 +0000 (08:53 -0700)]
am
e4fd2b45: am
5ed6f3ce: am
23a5fbbd: renaming Sleep Mode feature.
* commit '
e4fd2b453384a9dd61cf18ef730c0bde01e4bcf0':
renaming Sleep Mode feature.
Chris Wren [Tue, 2 Oct 2012 15:51:54 +0000 (08:51 -0700)]
am
5ed6f3ce: am
23a5fbbd: renaming Sleep Mode feature.
* commit '
5ed6f3ce4ad26577135c42e28177df32eaaf33a3':
renaming Sleep Mode feature.
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
The Android Automerger [Tue, 2 Oct 2012 14:00:11 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Tue, 2 Oct 2012 06:39:29 +0000 (23:39 -0700)]
am
1de80610: (-s ours) am
2765d3b7: am
1e230b40: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
1de806100dff16e51beac5228530055e5292c1b6':
Import translations. DO NOT MERGE
Svetoslav Ganov [Tue, 2 Oct 2012 06:39:28 +0000 (23:39 -0700)]
am
0956ea79: am
b5d735f1: am
f26263fd: Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
* commit '
0956ea79a2a74213bdf09a3a03daad3ad879fe6f':
Upading the strings for accessibility multi-user.
Baligh Uddin [Tue, 2 Oct 2012 06:35:57 +0000 (23:35 -0700)]
am
2765d3b7: am
1e230b40: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2765d3b7658ac3dcb455628fab41479fe4fb24cb':
Import translations. DO NOT MERGE
Svetoslav Ganov [Tue, 2 Oct 2012 06:35:55 +0000 (23:35 -0700)]
am
b5d735f1: am
f26263fd: Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
* commit '
b5d735f11085ae85ad768af03972809f444e1b0b':
Upading the strings for accessibility multi-user.
Baligh Uddin [Tue, 2 Oct 2012 06:33:45 +0000 (23:33 -0700)]
am
4c9ff65e: (-s ours) am
90fd08b8: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
4c9ff65e963cca3078edec623a05968e222c5dc3':
Import translations. DO NOT MERGE
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 06:31:24 +0000 (23:31 -0700)]
am
90fd08b8: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
90fd08b8ec5570017fdae958b97d42675a75c2ee':
Import translations. DO NOT MERGE
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:21:49 +0000 (22:21 -0700)]
Merge "Import translations. DO NOT MERGE"
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:36:50 +0000 (15:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I829878e37bf9e8bc5ad842e03e22f5e548d33df9
Auto-generated-cl: translation import
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:59:38 +0000 (14:59 -0700)]
am
39dfa34e: am
d7be24f6: am
7474bc3d: Move the installed app details overflow button to the top.
* commit '
39dfa34e5da9f8d6bfb83e05c4a4bc68e990027b':
Move the installed app details overflow button to the top.
Adam Powell [Mon, 1 Oct 2012 21:57:23 +0000 (14:57 -0700)]
am
d7be24f6: am
7474bc3d: Move the installed app details overflow button to the top.
* commit '
d7be24f68a8104703775a196f0f2dd7fec5ba405':
Move the installed app details overflow button to the top.
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
Baligh Uddin [Mon, 1 Oct 2012 20:46:42 +0000 (13:46 -0700)]
am
26576339: (-s ours) am
5dde6f06: am
fd94d51e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
26576339aa6db460d8421ef2e2e750b2e6dc571b':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 20:46:41 +0000 (13:46 -0700)]
am
dc58137b: (-s ours) am
070760b0: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
dc58137b3713ac70886a2cac63856e4a94476788':
Import translations. DO NOT MERGE
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
rich cannings [Mon, 1 Oct 2012 18:18:31 +0000 (11:18 -0700)]
am
60109bfd: am
e88c4bab: am
82988b48: Merge "Add Help lin to Settings > Security" into jb-mr1-dev
* commit '
60109bfd0d986b76d3eb01306e2d422ce44d1545':
Add Help lin to Settings > Security
Amith Yamasani [Mon, 1 Oct 2012 18:18:30 +0000 (11:18 -0700)]
am
8858d0f9: am
1035e199: am
2485d9fc: Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
* commit '
8858d0f9d45d129c53ad18a2d8a2097c6215d25a':
Make Settings shortcuts launch into the correct activity/fragment.
Dianne Hackborn [Mon, 1 Oct 2012 18:18:29 +0000 (11:18 -0700)]
am
967efc4a: am
d26005ea: am
1a47ecd9: Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
* commit '
967efc4a958b8e9de07c7d9f960b8f6273803f5e':
Fix issue #
7255954: API Review: rename Dream to DreamService
rich cannings [Mon, 1 Oct 2012 17:16:18 +0000 (10:16 -0700)]
am
e88c4bab: am
82988b48: Merge "Add Help lin to Settings > Security" into jb-mr1-dev
* commit '
e88c4bab2ee4fcefe431414f7eb64ae2c56ef022':
Add Help lin to Settings > Security
Baligh Uddin [Mon, 1 Oct 2012 17:24:24 +0000 (10:24 -0700)]
am
5dde6f06: am
fd94d51e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
5dde6f06b8297e98eaed55e523dfeca4f4d7e558':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 17:24:21 +0000 (10:24 -0700)]
am
070760b0: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
070760b06592de6e5b39cce9e1bfb34ee20c4d23':
Import translations. DO NOT MERGE
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:16:56 +0000 (10:16 -0700)]
Merge "Import translations. DO NOT MERGE"
rich cannings [Mon, 1 Oct 2012 17:16:18 +0000 (10:16 -0700)]
am
e88c4bab: am
82988b48: Merge "Add Help lin to Settings > Security" into jb-mr1-dev
* commit '
e88c4bab2ee4fcefe431414f7eb64ae2c56ef022':
Add Help lin to Settings > Security
Amith Yamasani [Mon, 1 Oct 2012 17:16:07 +0000 (10:16 -0700)]
am
1035e199: am
2485d9fc: Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
* commit '
1035e19941e7b51ea5044e34b4b03abd1017f50e':
Make Settings shortcuts launch into the correct activity/fragment.
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
Dianne Hackborn [Mon, 1 Oct 2012 17:13:29 +0000 (10:13 -0700)]
am
d26005ea: am
1a47ecd9: Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
* commit '
d26005ea8569da03bbb30601e28ba3c139ae6b06':
Fix issue #
7255954: API Review: rename Dream to DreamService
The Android Automerger [Mon, 1 Oct 2012 01:17:55 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-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
The Android Automerger [Sun, 30 Sep 2012 14:00:11 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
Dianne Hackborn [Sat, 29 Sep 2012 01:02:15 +0000 (18:02 -0700)]
Fix issue #
7255954: API Review: rename Dream to DreamService
Change-Id: Ic374130cb37cbbfad0421089aecf30de87c4d369
Jean-Baptiste Queru [Sat, 29 Sep 2012 00:17:43 +0000 (17:17 -0700)]
Jean-Baptiste Queru [Sat, 29 Sep 2012 00:15:36 +0000 (17:15 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: I32058e2adca0ba7caf9a6f562c690ca5b68ddeb1
Robert Greenwalt [Sat, 29 Sep 2012 00:09:56 +0000 (17:09 -0700)]
am
a59cc272: Merge "Colorize premium sms ui." into jb-mr1-dev
* commit '
a59cc2722e6dd3cdc50e27c9564d4da37c952cf6':
Colorize premium sms ui.
Svetoslav Ganov [Sat, 29 Sep 2012 00:06:43 +0000 (17:06 -0700)]
am
a59f1aac: Setting to enable the global gesture for turning on accessibility.
* commit '
a59f1aacc0b55a301ce8b36498f79c9f589c5f20':
Setting to enable the global gesture for turning on accessibility.
Robert Greenwalt [Sat, 29 Sep 2012 00:06:34 +0000 (17:06 -0700)]
am
d28ed8d6: am
a59cc272: Merge "Colorize premium sms ui." into jb-mr1-dev
* commit '
d28ed8d66af6b03628c7dd1904778a5160b8d619':
Colorize premium sms ui.
Robert Greenwalt [Fri, 28 Sep 2012 23:55:32 +0000 (16:55 -0700)]
am
a59cc272: Merge "Colorize premium sms ui." into jb-mr1-dev
* commit '
a59cc2722e6dd3cdc50e27c9564d4da37c952cf6':
Colorize premium sms ui.
Robert Greenwalt [Fri, 28 Sep 2012 23:54:03 +0000 (16:54 -0700)]
Merge "Colorize premium sms ui." into jb-mr1-dev
Svetoslav Ganov [Fri, 28 Sep 2012 23:19:25 +0000 (16:19 -0700)]
am
894680f6: am
a59f1aac: Setting to enable the global gesture for turning on accessibility.
* commit '
894680f67c6b6112ccb71e565fd068492369580d':
Setting to enable the global gesture for turning on accessibility.
Svetoslav Ganov [Fri, 28 Sep 2012 22:51:50 +0000 (15:51 -0700)]
am
a59f1aac: Setting to enable the global gesture for turning on accessibility.
* commit '
a59f1aacc0b55a301ce8b36498f79c9f589c5f20':
Setting to enable the global gesture for turning on accessibility.
OSDN Git Service
