Commit Graph

5265 Commits

Author SHA1 Message Date
Svetoslav Ganov
b5101d644e am 1ada2330: Remove install accessibility scripts confirmation dialog title.
* commit '1ada233046f012feeee2cebee02ab4c83599a8b2':
  Remove install accessibility scripts confirmation dialog title.
2011-11-08 00:39:44 +00:00
Svetoslav Ganov
1ada233046 Remove install accessibility scripts confirmation dialog title.
bug:5552414

Change-Id: If5042632123da4388007d4ae98bc26e4cc53da81
2011-11-07 15:28:20 -08:00
Eric Fischer
20d23dc907 am 5b3329d1: am ab300c9d: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '5b3329d188b07e674b8c506b6666a4c535e5540e':
  Import revised translations.  DO NOT MERGE
2011-11-07 20:45:47 +00:00
Eric Fischer
5b3329d188 am ab300c9d: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'ab300c9d2397bc8805a9dc4fbbfa07db7417fb09':
  Import revised translations.  DO NOT MERGE
2011-11-07 20:43:30 +00:00
Eric Fischer
ab300c9d23 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-07 12:39:20 -08:00
Eric Fischer
3795e49084 Import revised translations. DO NOT MERGE
Change-Id: I50121e852a98db6c4e0cece356cceba3e3f1ccc1
2011-11-07 12:27:48 -08:00
The Android Open Source Project
a4c91392d1 am 3c77d9dd: Reconcile with ics-mr1-release
* commit '3c77d9dd4c53dd34b54dc90d46ef32a8404a679e':
2011-11-07 16:34:44 +00:00
The Android Open Source Project
3c77d9dd4c Reconcile with ics-mr1-release
Change-Id: Ibd83ca3b9fbad4cb99a91ef3a80c20f1b777d4f6
2011-11-07 08:31:58 -08:00
Narayan Kamath
1fbe9134c4 am 8863e398: am 8214d201: Merge "Fix two bug in the TTS settings." into ics-mr1
* commit '8863e3989c52a0916fda75db8140051afa135f9a':
  Fix two bug in the TTS settings.
2011-11-07 15:53:57 +00:00
Narayan Kamath
8863e3989c am 8214d201: Merge "Fix two bug in the TTS settings." into ics-mr1
* commit '8214d201db04c27ed82265ec46f85a87f1adf179':
  Fix two bug in the TTS settings.
2011-11-07 15:51:43 +00:00
The Android Automerger
fa6d77bf1b merge in ics-mr1-release history after reset to ics-mr1 2011-11-07 06:46:18 -08:00
Narayan Kamath
8214d201db Merge "Fix two bug in the TTS settings." into ics-mr1 2011-11-07 02:26:29 -08:00
The Android Automerger
70c1e0b82e merge in ics-mr1-release history after reset to ics-mr1 2011-11-06 06:46:46 -08:00
Steven Ross
f67137cf88 am 6bf64b81: am 9c4f31c1: Merge "Using same task fixes 5486287" into ics-mr1
* commit '6bf64b81c0d5b6a199251d382a766448394c31b2':
  Using same task fixes 5486287
2011-11-05 19:38:46 +00:00
Irfan Sheriff
50b916bdb4 am 8b14d6b8: am 815c7a04: am 01b32368: Add provisioning checks for BT and USB
* commit '8b14d6b8c508c049dc0e394299087f191249bcb4':
  Add provisioning checks for BT and USB
2011-11-05 19:38:45 +00:00
Steven Ross
6bf64b81c0 am 9c4f31c1: Merge "Using same task fixes 5486287" into ics-mr1
* commit '9c4f31c1190a8b5b2ac9911aa291d57040280a76':
  Using same task fixes 5486287
2011-11-05 19:33:54 +00:00
Irfan Sheriff
8b14d6b8c5 am 815c7a04: am 01b32368: Add provisioning checks for BT and USB
* commit '815c7a042d58a3e21f71603bfb972a31a79addca':
  Add provisioning checks for BT and USB
2011-11-05 19:33:44 +00:00
Steven Ross
9c4f31c119 Merge "Using same task fixes 5486287" into ics-mr1 2011-11-04 17:38:11 -07:00
Irfan Sheriff
815c7a042d am 01b32368: Add provisioning checks for BT and USB
* commit '01b32368fffd944a0265f22db764b689179be94c':
  Add provisioning checks for BT and USB
2011-11-04 22:48:39 +00:00
Irfan Sheriff
01b32368ff Add provisioning checks for BT and USB
Bug: 5568752
Change-Id: Ide4f3c0eb19f8e70e301a13d81b76dd6a0516c3a
2011-11-04 15:12:13 -07:00
Narayan Kamath
fdd94d87de 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
2011-11-04 16:48:20 +00:00
The Android Open Source Project
2380f40e8e am 76a52670: Reconcile with ics-mr1-release
* commit '76a52670b63b4a1752c467d4ea9a4331ff4876eb':
  Updated PowerWidget dimens Bug: 5278970
  Update PowerWidget minWidth/minHeight so it reports as 4x1 We may update this value again
  Call setLanguage( ) on the TTS engine before the sample.
  Turn off hardware acceleration to avoid crashes due to driver.
2011-11-04 15:35:44 +00:00
The Android Open Source Project
76a52670b6 Reconcile with ics-mr1-release
Change-Id: I01aedb09d551e5c84c4038e4a445868d4bc60d2a
2011-11-04 08:31:40 -07:00
The Android Open Source Project
2e6d38fee2 am bd5e37bc: am 0ad13892: Reconcile with ics-factoryrom-2-release
* commit 'bd5e37bc8ca57fd0ef08f8a190c9a97ba69b6f9b':
  Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"
2011-11-04 15:03:08 +00:00
The Android Open Source Project
bd5e37bc8c 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"
2011-11-04 15:01:29 +00:00
The Android Open Source Project
0ad13892c6 Reconcile with ics-factoryrom-2-release
Change-Id: I1b9c07a111d23bd863d4beb0a31a2ab949e9eae7
2011-11-04 07:57:21 -07:00
Steven Ross
1999577979 Using same task fixes 5486287
Change-Id: I8a4cd746bc0a0a8610ef9fe55325049fa3304820
2011-11-04 10:28:32 -04:00
The Android Automerger
c312ec9bda merge in ics-mr1-release history after reset to ics-mr1 2011-11-03 06:44:50 -07:00
Daniel Sandler
27f092147d am 99d0b974: am f53c3602: Bring back Android Dreams.
* commit '99d0b97471b4c34615e211c7a70972f8d7c9cd75':
  Bring back Android Dreams.
2011-11-03 11:04:13 +00:00
Daniel Sandler
99d0b97471 am f53c3602: Bring back Android Dreams.
* commit 'f53c3602f92d623f03e941c1d590a4720578cf5e':
  Bring back Android Dreams.
2011-11-03 11:01:56 +00:00
The Android Automerger
850cb95af3 Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
This reverts commit 1b4f5d7435, reversing
changes made to 19d9a3d284.
2011-11-02 20:58:19 -07:00
The Android Automerger
ae076c958c Revert "Merge "Fix WPS pin input UI" into ics-mr0"
This reverts commit 19d9a3d284, reversing
changes made to 480b2e4406.
2011-11-02 20:58:10 -07:00
The Android Automerger
5b5561197a merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 20:53:25 -07:00
Daniel Sandler
f53c3602f9 Bring back Android Dreams.
Bug: 5121105
Change-Id: I29ddee7e4a83a01844cdb735de14c02dcbf3086c
2011-11-02 23:30:27 -04:00
Eric Fischer
651564cd49 am a9bc320d: am 00f68e0d: (-s ours) am 553a2bda: (-s ours) Import revised translations. DO NOT MERGE
* commit 'a9bc320d4f9c9c7cde3c33d6e20c18f34fc3b94f':
  Import revised translations.  DO NOT MERGE
2011-11-03 00:45:53 +00:00
Eric Fischer
a9bc320d4f am 00f68e0d: (-s ours) am 553a2bda: (-s ours) Import revised translations. DO NOT MERGE
* commit '00f68e0d749649f28607623aa163e9d1cd6fd96e':
  Import revised translations.  DO NOT MERGE
2011-11-03 00:43:18 +00:00
Eric Fischer
00f68e0d74 am 553a2bda: (-s ours) Import revised translations. DO NOT MERGE
* commit '553a2bda178d246e99bce744fefa2a5765c6cb04':
  Import revised translations.  DO NOT MERGE
2011-11-03 00:04:17 +00:00
Eric Fischer
553a2bda17 Import revised translations. DO NOT MERGE
Change-Id: I845d6b903ad4314b9aa61ea9ee03d7248164330a
2011-11-02 15:19:25 -07:00
Chia-chi Yeh
9080e2da0c am ae852672: Merge "VpnSettings: do not copy unsaved fields."
* commit 'ae852672a04d2c501e515177791d7e7a0492d1e0':
  VpnSettings: do not copy unsaved fields.
2011-11-02 22:07:19 +00:00
Chia-chi Yeh
ae852672a0 Merge "VpnSettings: do not copy unsaved fields." 2011-11-02 15:05:08 -07:00
Chia-chi Yeh
94c6cd6c29 VpnSettings: do not copy unsaved fields.
Bug: 5554228
Change-Id: I1f1d6d89f99c728e48e2abe00920a1f36bd53576
2011-11-02 14:59:33 -07:00
Eric Fischer
85a5cb2e4c am a4d75411: Merge "Import revised translations."
* commit 'a4d75411c403d993e486a15c110aea2bce379bc6':
  Import revised translations.
2011-11-02 21:14:30 +00:00
Eric Fischer
a4d75411c4 Merge "Import revised translations." 2011-11-02 14:11:16 -07:00
The Android Open Source Project
9fc14597e9 am 442c45ad: am 2fd22409: Reconcile with ics-factoryrom-2-release
* commit '442c45ad0984f241f852f253b46180aaaef6642b':
  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"
2011-11-02 18:02:28 +00:00
The Android Open Source Project
442c45ad09 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"
2011-11-02 17:59:04 +00:00
Irfan Sheriff
01a5ead14a am dcf47d91: am 1484531a: am 1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0
* commit 'dcf47d911f20e4e8e89c19daec18395dd6495887':
  Use component details to send provisionig intent
2011-11-02 17:58:42 +00:00
The Android Open Source Project
2fd2240956 Reconcile with ics-factoryrom-2-release
Change-Id: Iea3f36179ad20263df6dbf71a5f4fefc7a931704
2011-11-02 10:53:29 -07:00
Irfan Sheriff
dcf47d911f am 1484531a: am 1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0
* commit '1484531ad99d14744fea3de8a239905a404a0c2f':
  Use component details to send provisionig intent
2011-11-02 17:50:26 +00:00
Eric Fischer
ff9f402368 am 8bb182c2: (-s ours) am 17347407: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '8bb182c25c7247d101fb0e1bf5a0ac325eca6acd':
  Import revised translations.  DO NOT MERGE
2011-11-02 17:34:28 +00:00
Eric Fischer
8bb182c25c am 17347407: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '17347407edd61fc15a316fa7aa55c17b399433ea':
  Import revised translations.  DO NOT MERGE
2011-11-02 17:31:26 +00:00