PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,199 Commits 1 Branch 0 Tags
dbc7d9c7e5824f995cd410b3c102aed226650ea0
Commit Graph

6199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Ross
68953fba71 am 9c4f31c1: Merge "Using same task fixes 5486287" into ics-mr1 
* commit '9c4f31c1190a8b5b2ac9911aa291d57040280a76':
  Using same task fixes 5486287
 2011-11-05 00:39:35 +00:00
Steven Ross
9c4f31c119 Merge "Using same task fixes 5486287" into ics-mr1 2011-11-04 17:38:11 -07:00
Irfan Sheriff
27dda6637c am 815c7a04: am 01b32368: Add provisioning checks for BT and USB 
* commit '815c7a042d58a3e21f71603bfb972a31a79addca':
  Add provisioning checks for BT and USB
 2011-11-04 22:49:53 +00: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
930b650f0e 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 14:59:39 +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
Daniel Sandler
f11106e1a9 am f53c3602: Bring back Android Dreams. 
* commit 'f53c3602f92d623f03e941c1d590a4720578cf5e':
  Bring back Android Dreams.
 2011-11-03 10:58:31 +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
0c160ecda8 am 00f68e0d: am 553a2bda: (-s ours) Import revised translations. DO NOT MERGE 
* commit '00f68e0d749649f28607623aa163e9d1cd6fd96e':
  Import revised translations.  DO NOT MERGE
 2011-11-03 00:07:29 +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
a01be79927 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:56:47 +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
Eric Fischer
69f6eb2643 Import revised translations. 
Change-Id: If0d8a3d2b1ede8cc56519ddecac97c12f7042fe7
 2011-11-02 10:30:43 -07:00
The Android Open Source Project
a3bf712e77 am 815b329a: am 7d1737e0: Reconcile with ics-factoryrom-2-release 
* commit '815b329af8704e58008860318429f2c70ec547f0':
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"
 2011-11-02 17:30:18 +00:00
Nick Pelly
37b1741993 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.
 2011-11-02 17:29:28 +00:00
The Android Automerger
12790a38a6 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 10:07:45 -07:00
The Android Automerger
90e6d79333 Revert "Merge "Fix WPS pin input UI" into ics-mr0" 
This reverts commit 19d9a3d284, reversing
changes made to 480b2e4406.
 2011-11-02 10:07:38 -07:00
The Android Automerger
849b109b27 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 09:48:56 -07:00
The Android Automerger
4aa6076b23 merge in ics-mr1-release history after reset to ics-mr1 2011-11-02 06:46:51 -07:00
Steven Ross
c4368f70ef Merge "Using same task fixes 5486287" 2011-11-02 06:45:34 -07:00
The Android Automerger
9e29ad6cb2 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 04:41:12 -07:00
Irfan Sheriff
8f246e1803 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 04:20:48 +00:00
Irfan Sheriff
1484531ad9 am 1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0 
* commit '1103c3beb80c522778ae7b925d703e2ac3afd5e3':
  Use component details to send provisionig intent
 2011-11-02 04:18:13 +00:00