OSDN Git Service
Amith Yamasani [Tue, 15 Nov 2011 21:29:01 +0000 (13:29 -0800)]
am
b08c1102: Merge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1
* commit '
b08c11028776bab44e2b919edc3a7bbc8f9308e6':
Kill the Switch on top-right after exiting Accounts & sync.
Amith Yamasani [Tue, 15 Nov 2011 21:25:25 +0000 (13:25 -0800)]
Merge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1
Danielle Millett [Tue, 15 Nov 2011 21:11:07 +0000 (13:11 -0800)]
am
11c2641c: (-s ours) am
6f3b1bb1: DO NOT MERGE Cherry picking from MR0 cl 147215
* commit '
11c2641cebe18a9baf1c084bfdd778e51db3ae93':
DO NOT MERGE Cherry picking from MR0 cl 147215
Amith Yamasani [Tue, 15 Nov 2011 21:07:16 +0000 (13:07 -0800)]
am
cd76b687: Merge "Dismiss dialogs properly on closing." into ics-mr1
* commit '
cd76b687ad4945c9e3bec5231144354a15d498f7':
Dismiss dialogs properly on closing.
Amith Yamasani [Mon, 14 Nov 2011 23:15:38 +0000 (15:15 -0800)]
Kill the Switch on top-right after exiting Accounts & sync.
Bug:
5564377 - Bluetooth screen showing a Switch that doesn't follow
the bluetooth setting.
This seems to have been the Switch in Accounts & sync being set as a
custom view for the Settings activity and not removed on changing
fragments.
Change-Id: I4575a769fbf5482048dbc4e912c6b6f782f505a0
Danielle Millett [Tue, 15 Nov 2011 20:16:57 +0000 (12:16 -0800)]
am
6f3b1bb1: DO NOT MERGE Cherry picking from MR0 cl 147215
* commit '
6f3b1bb1d73e9b321144bec7faeaceb9d7c5caf8':
DO NOT MERGE Cherry picking from MR0 cl 147215
Amith Yamasani [Tue, 15 Nov 2011 18:12:32 +0000 (10:12 -0800)]
Merge "Dismiss dialogs properly on closing." into ics-mr1
Jim Miller [Tue, 15 Nov 2011 00:18:42 +0000 (16:18 -0800)]
am
9e2e2420: Fix
5579440: Add transport control view to tablet unlock screens
* commit '
9e2e24202d3405175f086419477d208264dfd580':
Fix
5579440: Add transport control view to tablet unlock screens
Amith Yamasani [Tue, 15 Nov 2011 00:18:40 +0000 (16:18 -0800)]
am
af925284: Add compatibility aliases for shortcuts added to home screen in gingerbread.
* commit '
af9252849fd94c1f2859c56a4010900ea38a607e':
Add compatibility aliases for shortcuts added to home screen in gingerbread.
Amith Yamasani [Fri, 11 Nov 2011 21:25:07 +0000 (13:25 -0800)]
Dismiss dialogs properly on closing.
Also make the invisible activity truly invisible (was
showing a blue line behind the dialog).
Bug:
5572140
Change-Id: I67b31f0682f189c7075011e0dd0660b0fbc543d9
Jim Miller [Sat, 12 Nov 2011 03:25:50 +0000 (19:25 -0800)]
Fix
5579440: Add transport control view to tablet unlock screens
The AM/PM indicator is no longer used in lockscreen. This propagates
the change to the cryptkeeper.
Change-Id: Iecd99f6439b5f898443e7d5c37984f7cd7607ce5
Danielle Millett [Wed, 2 Nov 2011 15:12:21 +0000 (11:12 -0400)]
DO NOT MERGE Cherry picking from MR0 cl 147215
Adding an improve face matching settings option for Face Unlock
Adding an option which will launch a version of setup where faces
can be added to the current gallery. It requires the user to first
confirm their password before launching addToSetup.
Patch 3 - Updated for renaming of FackLockTutorial to SetupIntro.
Now it is called every time regardless of it it's showing the tutorial
and a flag is passed in to determine whether or not SetupIntro shows
the tutorial.
Patch 4 - Removed 'Setup Complete' toast at the end of screen lock
setups since it was primarily for Face Unlock and the congratulations
screen removes the need for it.
Change-Id: Idc5f960809d992ec7bbce59ef1e13b95ef7cce45
Amith Yamasani [Thu, 10 Nov 2011 23:28:59 +0000 (15:28 -0800)]
Add compatibility aliases for shortcuts added to home screen in gingerbread.
Bug:
5016573
Change-Id: I1898b2f51216354829acca11e73186465f25ec32
Jeff Sharkey [Fri, 11 Nov 2011 15:31:17 +0000 (15:31 +0000)]
am
4b94e073: Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1
* commit '
4b94e073854b72205f12ff268211a51d634fbc8f':
Data usage label width, locking, Wi-Fi fixes.
Jeff Sharkey [Fri, 11 Nov 2011 02:10:34 +0000 (18:10 -0800)]
Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1
Jeff Sharkey [Fri, 11 Nov 2011 01:17:24 +0000 (17:17 -0800)]
Data usage label width, locking, Wi-Fi fixes.
Avoid wrapping sweep labels when underlying string is long, and avoid
showing blank "^1" sweep labels. Only offer "restrict data" when
mobile networks are present. Add locking around UidDetailProvider.
Move to isNetworkSupported() for consistency.
Bug:
5492495,
5471602,
5439402,
5373465
Change-Id: I79f5938d45ffbb4c2c242106424a466042a26c1c
Eric Fischer [Thu, 10 Nov 2011 23:03:08 +0000 (15:03 -0800)]
Merge "Import revised translations."
The Android Open Source Project [Thu, 10 Nov 2011 22:36:34 +0000 (14:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id4cfdbf63e6f69740330f68028c82c03d4167aca
Eric Fischer [Thu, 10 Nov 2011 22:22:55 +0000 (14:22 -0800)]
Import revised translations.
Change-Id: I21ac7772ba81ac0fb36cf2b82af5eb0bc43292a5
Amith Yamasani [Thu, 10 Nov 2011 21:13:08 +0000 (21:13 +0000)]
am
6519c610: Merge "Potential fix for monkey crash." into ics-mr1
* commit '
6519c610353cdb9ed670913058a1732cf79d6186':
Potential fix for monkey crash.
Amith Yamasani [Thu, 10 Nov 2011 21:09:54 +0000 (13:09 -0800)]
Merge "Potential fix for monkey crash." into ics-mr1
Robert Greenwalt [Thu, 10 Nov 2011 18:02:40 +0000 (10:02 -0800)]
Merge "Add system prop to work around tether provisioning"
Eric Fischer [Thu, 10 Nov 2011 16:15:03 +0000 (16:15 +0000)]
am
ffc1214c: (-s ours) am
de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE
* commit '
ffc1214ccbd04655a435573f36d550c5c66d78de':
Import revised translations. DO NOT MERGE
Robert Greenwalt [Wed, 9 Nov 2011 23:03:14 +0000 (15:03 -0800)]
Add system prop to work around tether provisioning
Set net.tethering.noprovisioning to something non-empty to avoid the provisioning check.
bug:
5445277
Change-Id: I048bffe2c11d80d79e8065f7fbe6cfb6db87da85
Eric Fischer [Wed, 9 Nov 2011 23:18:05 +0000 (23:18 +0000)]
am
de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE
* commit '
de8cd9e6f01af9255c1426c009a620bbb9efbd63':
Import revised translations. DO NOT MERGE
Amith Yamasani [Wed, 9 Nov 2011 21:19:23 +0000 (21:19 +0000)]
am
2ad06bbd: Merge "Remove system tutorial option in Settings->About." into ics-mr1
* commit '
2ad06bbd5f7a1b836ad3536e96817d7ec29a2e70':
Remove system tutorial option in Settings->About.
Jeff Brown [Wed, 9 Nov 2011 21:19:23 +0000 (21:19 +0000)]
am
81dfecf8: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug:
5569662" into ics-mr1
* commit '
81dfecf8ba6a603fd8974640517966c3a8930be3':
Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug:
5569662
Peter Ng [Wed, 9 Nov 2011 21:19:22 +0000 (21:19 +0000)]
am
2215abe9: Decreased padding on switches in settings to fix bluetoot
* commit '
2215abe996690ce619170240e0a617ed5a34b2ed':
Decreased padding on switches in settings to fix bluetoot
Amith Yamasani [Wed, 9 Nov 2011 21:19:22 +0000 (21:19 +0000)]
am
2eb32b00: Merge "Prevent orphaned fragment on the settings stack." into ics-mr1
* commit '
2eb32b00775b6e308e1c422856c1046c6c33b54a':
Prevent orphaned fragment on the settings stack.
Danielle Millett [Wed, 9 Nov 2011 17:52:31 +0000 (17:52 +0000)]
am
179b3286: Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1
* commit '
179b32869c4476a30b0c933fb73a1a8e258ce11c':
Adding an improve face matching settings option for Face Unlock
The Android Automerger [Wed, 9 Nov 2011 14:47:54 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Greenwalt [Wed, 9 Nov 2011 14:34:21 +0000 (14:34 +0000)]
am
322da591: Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1
* commit '
322da5917467f9b7b100c35f7c24bee5c9bc3909':
Wimax : 4G settings menu and 4G MAC address.
Eric Fischer [Wed, 9 Nov 2011 01:42:11 +0000 (17:42 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I57c6d5fdf39f880dab16d5db78bc6673d74090a9
Amith Yamasani [Wed, 9 Nov 2011 01:30:23 +0000 (17:30 -0800)]
Merge "Remove system tutorial option in Settings->About." into ics-mr1
Jeff Brown [Wed, 9 Nov 2011 01:22:02 +0000 (17:22 -0800)]
Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug:
5569662" into ics-mr1
Peter Ng [Wed, 9 Nov 2011 00:14:20 +0000 (16:14 -0800)]
Decreased padding on switches in settings to fix bluetoot
Bug:
5525612
Change-Id: Id93e4aae8b1e36614383a09266ce6c3f715404ab
Amith Yamasani [Tue, 8 Nov 2011 21:56:08 +0000 (13:56 -0800)]
Potential fix for monkey crash.
The tab was being changed by a "keypress" after the fragment was
destroyed. Disable the widget until a resume.
Bug:
5157399
Change-Id: Ic1515255052eaea01f71c133d8570f25d65351b2
Jeff Brown [Tue, 8 Nov 2011 22:21:53 +0000 (14:21 -0800)]
Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK.
Bug:
5569662
Change-Id: Ib2a96a27239228123ed53bd0c03ca412bb4357ba
Amith Yamasani [Tue, 8 Nov 2011 19:08:28 +0000 (11:08 -0800)]
Remove system tutorial option in Settings->About.
It was being activated by third party IMEs that have tutorials. Remove
the code permanently, since we don't support the system tutorial flow
anymore.
Bug:
5425836
Change-Id: I691b8d48309b3dd3a25c9994334dc4692a70e482
Amith Yamasani [Tue, 8 Nov 2011 18:46:46 +0000 (10:46 -0800)]
Merge "Prevent orphaned fragment on the settings stack." into ics-mr1
Danielle Millett [Tue, 8 Nov 2011 18:03:17 +0000 (10:03 -0800)]
Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1
Robert Greenwalt [Tue, 8 Nov 2011 18:01:30 +0000 (10:01 -0800)]
Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1
The Android Automerger [Tue, 8 Nov 2011 14:46:34 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
tk.mun [Thu, 13 Oct 2011 13:56:18 +0000 (22:56 +0900)]
Wimax : 4G settings menu and 4G MAC address.
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.
Change-Id: I14adc4775d35afe3398ddba4fd91c739011a06fa
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:
5486930
Svetoslav Ganov [Tue, 8 Nov 2011 00:00:02 +0000 (16:00 -0800)]
Merge "Accessibility - text formatting for service screen should use medium text."
Svetoslav Ganov [Mon, 7 Nov 2011 23:59:05 +0000 (15:59 -0800)]
Accessibility - text formatting for service screen should use medium text.
bug:
5382357
Change-Id: I5168f64f51870b130b1ddcdd3bfedd4db91b9fbd
Svetoslav Ganov [Mon, 7 Nov 2011 23:28:12 +0000 (15:28 -0800)]
Remove install accessibility scripts confirmation dialog title.
bug:
5552414
Change-Id: If5042632123da4388007d4ae98bc26e4cc53da81
Amith Yamasani [Mon, 7 Nov 2011 20:29:00 +0000 (12:29 -0800)]
Prevent orphaned fragment on the settings stack.
Remove the AppDetailsFragment from the stack if DataUsage is being destroyed.
Bug:
5572241
Change-Id: Ifb2c9233bf75c8cc7b43eec5ea3f0c0b0ba65ffe
Danielle Millett [Wed, 2 Nov 2011 15:12:21 +0000 (11:12 -0400)]
Adding an improve face matching settings option for Face Unlock
Adding an option which will launch a version of setup where faces
can be added to the current gallery. It requires the user to first
confirm their password before launching addToSetup.
Patch 3 - Updated for renaming of FackLockTutorial to SetupIntro.
Now it is called every time regardless of it it's showing the tutorial
and a flag is passed in to determine whether or not SetupIntro shows
the tutorial.
Patch 4 - Removed 'Setup Complete' toast at the end of screen lock
setups since it was primarily for Face Unlock and the congratulations
screen removes the need for it.
Change-Id: Idc5f960809d992ec7bbce59ef1e13b95ef7cce45
Eric Fischer [Mon, 7 Nov 2011 20:43:30 +0000 (20:43 +0000)]
am
ab300c9d: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
ab300c9d2397bc8805a9dc4fbbfa07db7417fb09':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Nov 2011 20:39:20 +0000 (12:39 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:27:48 +0000 (12:27 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I50121e852a98db6c4e0cece356cceba3e3f1ccc1
The Android Open Source Project [Mon, 7 Nov 2011 16:31:58 +0000 (08:31 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ibd83ca3b9fbad4cb99a91ef3a80c20f1b777d4f6
Narayan Kamath [Mon, 7 Nov 2011 15:51:43 +0000 (15:51 +0000)]
am
8214d201: Merge "Fix two bug in the TTS settings." into ics-mr1
* commit '
8214d201db04c27ed82265ec46f85a87f1adf179':
Fix two bug in the TTS settings.
The Android Automerger [Mon, 7 Nov 2011 14:46:18 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Narayan Kamath [Mon, 7 Nov 2011 10:26:29 +0000 (02:26 -0800)]
Merge "Fix two bug in the TTS settings." into ics-mr1
The Android Automerger [Sun, 6 Nov 2011 14:46:46 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Steven Ross [Sat, 5 Nov 2011 19:33:54 +0000 (19:33 +0000)]
am
9c4f31c1: Merge "Using same task fixes
5486287" into ics-mr1
* commit '
9c4f31c1190a8b5b2ac9911aa291d57040280a76':
Using same task fixes
5486287
Irfan Sheriff [Sat, 5 Nov 2011 19:33:44 +0000 (19:33 +0000)]
am
815c7a04: am
01b32368: Add provisioning checks for BT and USB
* commit '
815c7a042d58a3e21f71603bfb972a31a79addca':
Add provisioning checks for BT and USB
Steven Ross [Sat, 5 Nov 2011 00:38:11 +0000 (17:38 -0700)]
Merge "Using same task fixes
5486287" into ics-mr1
Irfan Sheriff [Fri, 4 Nov 2011 22:48:39 +0000 (22:48 +0000)]
am
01b32368: Add provisioning checks for BT and USB
* commit '
01b32368fffd944a0265f22db764b689179be94c':
Add provisioning checks for BT and USB
Irfan Sheriff [Fri, 4 Nov 2011 19:08:56 +0000 (12:08 -0700)]
Add provisioning checks for BT and USB
Bug:
5568752
Change-Id: Ide4f3c0eb19f8e70e301a13d81b76dd6a0516c3a
Narayan Kamath [Fri, 4 Nov 2011 16:12:27 +0000 (16:12 +0000)]
Fix two bug in the TTS settings.
(a) The TTS API doesn't mandate that unavailable voices should
be set and null, so deal with it correctly.
(b) The android manifest contained a reference to the old
TTS class.
bug:
5525023
Change-Id: I1c16dbc75893288e5fa221c73a7284fca7ab25c5
The Android Open Source Project [Fri, 4 Nov 2011 15:31:40 +0000 (08:31 -0700)]
Reconcile with ics-mr1-release
Change-Id: I01aedb09d551e5c84c4038e4a445868d4bc60d2a
The Android Open Source Project [Fri, 4 Nov 2011 15:01:29 +0000 (15:01 +0000)]
am
0ad13892: Reconcile with ics-factoryrom-2-release
* commit '
0ad13892c6a0a1d86e0b7dbafd3d4a2c7c82c8d2':
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
The Android Open Source Project [Fri, 4 Nov 2011 14:57:21 +0000 (07:57 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: I1b9c07a111d23bd863d4beb0a31a2ab949e9eae7
Steven Ross [Fri, 4 Nov 2011 14:28:32 +0000 (10:28 -0400)]
Using same task fixes
5486287
Change-Id: I8a4cd746bc0a0a8610ef9fe55325049fa3304820
The Android Automerger [Thu, 3 Nov 2011 13:44:50 +0000 (06:44 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Daniel Sandler [Thu, 3 Nov 2011 11:01:56 +0000 (11:01 +0000)]
am
f53c3602: Bring back Android Dreams.
* commit '
f53c3602f92d623f03e941c1d590a4720578cf5e':
Bring back Android Dreams.
The Android Automerger [Thu, 3 Nov 2011 03:58:19 +0000 (20:58 -0700)]
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
This reverts commit
1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to
19d9a3d2846c538502003a81522f6d285b9ff24b.
The Android Automerger [Thu, 3 Nov 2011 03:58:10 +0000 (20:58 -0700)]
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
This reverts commit
19d9a3d2846c538502003a81522f6d285b9ff24b, reversing
changes made to
480b2e440646e4859ebdd88b82441b4bd9a61651.
The Android Automerger [Thu, 3 Nov 2011 03:53:25 +0000 (20:53 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
Daniel Sandler [Thu, 3 Nov 2011 03:30:27 +0000 (23:30 -0400)]
Bring back Android Dreams.
Bug:
5121105
Change-Id: I29ddee7e4a83a01844cdb735de14c02dcbf3086c
Eric Fischer [Thu, 3 Nov 2011 00:43:18 +0000 (00:43 +0000)]
am
00f68e0d: (-s ours) am
553a2bda: (-s ours) Import revised translations. DO NOT MERGE
* commit '
00f68e0d749649f28607623aa163e9d1cd6fd96e':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 3 Nov 2011 00:04:17 +0000 (00:04 +0000)]
am
553a2bda: (-s ours) Import revised translations. DO NOT MERGE
* commit '
553a2bda178d246e99bce744fefa2a5765c6cb04':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Nov 2011 22:19:25 +0000 (15:19 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I845d6b903ad4314b9aa61ea9ee03d7248164330a
Chia-chi Yeh [Wed, 2 Nov 2011 22:05:08 +0000 (15:05 -0700)]
Merge "VpnSettings: do not copy unsaved fields."
Chia-chi Yeh [Wed, 2 Nov 2011 21:57:54 +0000 (14:57 -0700)]
VpnSettings: do not copy unsaved fields.
Bug:
5554228
Change-Id: I1f1d6d89f99c728e48e2abe00920a1f36bd53576
Eric Fischer [Wed, 2 Nov 2011 21:11:16 +0000 (14:11 -0700)]
Merge "Import revised translations."
The Android Open Source Project [Wed, 2 Nov 2011 17:59:04 +0000 (17:59 +0000)]
am
2fd22409: Reconcile with ics-factoryrom-2-release
* commit '
2fd224095660d28dca0291a118db08f8cf29fd0d':
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
The Android Open Source Project [Wed, 2 Nov 2011 17:53:29 +0000 (10:53 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: Iea3f36179ad20263df6dbf71a5f4fefc7a931704
Irfan Sheriff [Wed, 2 Nov 2011 17:50:26 +0000 (17:50 +0000)]
am
1484531a: am
1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0
* commit '
1484531ad99d14744fea3de8a239905a404a0c2f':
Use component details to send provisionig intent
Eric Fischer [Wed, 2 Nov 2011 17:31:26 +0000 (17:31 +0000)]
am
17347407: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
17347407edd61fc15a316fa7aa55c17b399433ea':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Nov 2011 17:30:43 +0000 (10:30 -0700)]
Import revised translations.
Change-Id: If0d8a3d2b1ede8cc56519ddecac97c12f7042fe7
The Android Open Source Project [Wed, 2 Nov 2011 17:30:18 +0000 (17:30 +0000)]
am
815b329a: am
7d1737e0: Reconcile with ics-factoryrom-2-release
* commit '
815b329af8704e58008860318429f2c70ec547f0':
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
Nick Pelly [Wed, 2 Nov 2011 17:29:28 +0000 (17:29 +0000)]
am
299078e1: am
1b4f5d74: Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0
* commit '
299078e1600325653b579c7dd8bb4dbc2666c49e':
Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.
The Android Automerger [Wed, 2 Nov 2011 17:07:45 +0000 (10:07 -0700)]
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
This reverts commit
1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to
19d9a3d2846c538502003a81522f6d285b9ff24b.
The Android Automerger [Wed, 2 Nov 2011 17:07:38 +0000 (10:07 -0700)]
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
This reverts commit
19d9a3d2846c538502003a81522f6d285b9ff24b, reversing
changes made to
480b2e440646e4859ebdd88b82441b4bd9a61651.
The Android Automerger [Wed, 2 Nov 2011 16:48:56 +0000 (09:48 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Wed, 2 Nov 2011 13:46:51 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Steven Ross [Wed, 2 Nov 2011 13:45:34 +0000 (06:45 -0700)]
Merge "Using same task fixes
5486287"
The Android Automerger [Wed, 2 Nov 2011 11:41:12 +0000 (04:41 -0700)]
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
This reverts commit
1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to
19d9a3d2846c538502003a81522f6d285b9ff24b.
Irfan Sheriff [Wed, 2 Nov 2011 04:18:13 +0000 (04:18 +0000)]
am
1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0
* commit '
1103c3beb80c522778ae7b925d703e2ac3afd5e3':
Use component details to send provisionig intent
Irfan Sheriff [Wed, 2 Nov 2011 04:15:30 +0000 (21:15 -0700)]
Merge "Use component details to send provisionig intent" into ics-mr0
Irfan Sheriff [Tue, 1 Nov 2011 21:58:56 +0000 (21:58 +0000)]
am
df8c7aa2: am
19d9a3d2: Merge "Fix WPS pin input UI" into ics-mr0
* commit '
df8c7aa25f3efaeaeac180f4d8c1d6b132d14924':
Fix WPS pin input UI
Irfan Sheriff [Tue, 1 Nov 2011 21:58:31 +0000 (14:58 -0700)]
Use component details to send provisionig intent
Bug:
5544654
Change-Id: I0bd33c2a0d4c657bd10ba966d67ff54c27e42ea1
Eric Fischer [Tue, 1 Nov 2011 20:51:13 +0000 (13:51 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:37:58 +0000 (13:37 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I65499d2eade80a1bb57f7f6fe27018c106554300
The Android Open Source Project [Tue, 1 Nov 2011 17:10:37 +0000 (17:10 +0000)]
am
7d1737e0: Reconcile with ics-factoryrom-2-release
* commit '
7d1737e045ae970049e723c5b3c681860d552ad6':
Revert "Merge "Fix WPS pin input UI" into ics-mr0"
The Android Open Source Project [Tue, 1 Nov 2011 17:08:55 +0000 (10:08 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: I744c148cd22781c33cd51cd734a055952f39d648
OSDN Git Service
