Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,246 Commits 1 Branch 0 Tags
3f3c2e4615c17318b0655c4e5284eb46b632c8a3
Commit Graph

5246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
3f3c2e4615 merge in ics-release history after reset to master 2011-11-06 07:01:06 -08: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
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
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
a9904443a9 merge in ics-release history after reset to master 2011-11-03 06:59:57 -07: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
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
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
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
a4d75411c4 Merge "Import revised translations." 2011-11-02 14:11:16 -07: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
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
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
ce4b57670d merge in ics-release history after reset to master 2011-11-02 07:00:49 -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
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
Irfan Sheriff
1103c3beb8 Merge "Use component details to send provisionig intent" into ics-mr0 2011-11-01 21:15:30 -07:00
Irfan Sheriff
536cc293ee am df8c7aa2: am 19d9a3d2: Merge "Fix WPS pin input UI" into ics-mr0 
* commit 'df8c7aa25f3efaeaeac180f4d8c1d6b132d14924':
  Fix WPS pin input UI
 2011-11-01 21:58:56 +00:00
Irfan Sheriff
642a3c78f8 Use component details to send provisionig intent 
Bug: 5544654
Change-Id: I0bd33c2a0d4c657bd10ba966d67ff54c27e42ea1
 2011-11-01 14:58:31 -07:00
Eric Fischer
17347407ed Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-01 13:51:13 -07:00
Eric Fischer
78730481fe Import revised translations. DO NOT MERGE 
Change-Id: I65499d2eade80a1bb57f7f6fe27018c106554300
 2011-11-01 13:37:58 -07:00
The Android Open Source Project
815b329af8 am 7d1737e0: Reconcile with ics-factoryrom-2-release 
* commit '7d1737e045ae970049e723c5b3c681860d552ad6':
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"
 2011-11-01 17:10:37 +00:00
The Android Open Source Project
7d1737e045 Reconcile with ics-factoryrom-2-release 
Change-Id: I744c148cd22781c33cd51cd734a055952f39d648
 2011-11-01 10:08:55 -07:00
The Android Automerger
6ba444ee1a merge in ics-release history after reset to master 2011-11-01 07:00:56 -07:00
The Android Automerger
abf59e28f9 merge in ics-mr1-release history after reset to ics-mr1 2011-11-01 06:46:29 -07:00
Steven Ross
67fba25ad0 Using same task fixes 5486287 
Change-Id: I60ec36156ea973a677852fab2d121d8303409478
 2011-11-01 08:31:59 -04:00
Nick Pelly
299078e160 am 1b4f5d74: Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0 
* commit '1b4f5d743594971eab9747a84ee21420a8602bbe':
  Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.
 2011-11-01 00:04:08 +00:00
Nick Pelly
1b4f5d7435 Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0 2011-10-31 17:02:15 -07:00