PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,129 Commits 1 Branch 0 Tags
a4d75411c403d993e486a15c110aea2bce379bc6
Commit Graph

5129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
The Android Automerger
150cc1dcdd Revert "Merge "Fix WPS pin input UI" into ics-mr0" 
This reverts commit 19d9a3d284, reversing
changes made to 480b2e4406.
 2011-10-31 16:47:58 -07:00
Nick Pelly
e0eedf7157 Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS. 
ACTION_NFCSHARING_SETTINGS is a new ICS API that doesn't work until now.
It allows application to show UI to turn Android Beam on.

Add ACTION_NFC_SHARING - exposed in MR2.

Remove ANDROID_BEAM_SETTINGS, this was orphanned.

I wish we had renamed ACTION_NFCSHARING_SETTINGS to ACTION_NDEF_PUSH_SETTINGS,
but too late now. It's already released in SDK.

Bug: 5465097
Change-Id: I641b2efa39a3567cbd1c31587f3b67b1b0a0caa0

Signed-off-by: Nick Pelly <npelly@google.com>
 2011-10-31 14:56:18 -07:00
Amith Yamasani
00a3db75f4 am 8fd5e450: am 480b2e44: Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0 
* commit '8fd5e45052567335529c1db887794ac1404d4e23':
  Use vibrate icon in volume settings when appropriate.
 2011-10-31 21:22:01 +00:00
Irfan Sheriff
df8c7aa25f am 19d9a3d2: Merge "Fix WPS pin input UI" into ics-mr0 
* commit '19d9a3d2846c538502003a81522f6d285b9ff24b':
  Fix WPS pin input UI
 2011-10-31 21:03:19 +00:00
Irfan Sheriff
19d9a3d284 Merge "Fix WPS pin input UI" into ics-mr0 2011-10-31 14:01:42 -07:00
Irfan Sheriff
b9dfea636f Fix WPS pin input UI 
Change If60f42f7 introduces a bug for the WPS UI.

The input from access point text box should be shown for KEYPAD input

Bug: 5542833
Change-Id: I27f758b31b69425f51fe7ed17bf9b787a1bf66cc
 2011-10-31 13:39:14 -07:00
Claudia de Veaux
8f4328f4a9 Merge "Strings edits to Security settings summaries. Also changed "must" to "need to" per preferred wording. Bugs: 5533152, 5163232" 2011-10-31 12:17:00 -07:00
Gilles Debunne
1a4301b758 Merge "Unused assets removed from Settings" 2011-10-31 10:59:53 -07:00
Eric Fischer
100ab4953c am fdda65cf: (-s ours) am 6fded4ab: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'fdda65cfc7a2422519842bbe0fb402be46234c25':
  Import revised translations.  DO NOT MERGE
 2011-10-31 12:26:46 +00:00
Amith Yamasani
8fd5e45052 am 480b2e44: Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0 
* commit '480b2e440646e4859ebdd88b82441b4bd9a61651':
  Use vibrate icon in volume settings when appropriate.
 2011-10-30 21:37:12 +00:00
Eric Fischer
fdda65cfc7 am 6fded4ab: (-s ours) Import revised translations. DO NOT MERGE 
* commit '6fded4ab3fca2d79a82c40f90370b12489456dff':
  Import revised translations.  DO NOT MERGE
 2011-10-29 03:15:30 +00:00
Amith Yamasani
480b2e4406 Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0 2011-10-28 19:40:42 -07:00
Amith Yamasani
ca7205842a Use vibrate icon in volume settings when appropriate. 
Clicking on icon will now put it in vibrate mode (instead of silent)
if vibrate is enabled for silent mode.

Bug: 5530217
Change-Id: Icd314981734af2cb37cf47fe27fc697bf447af73
 2011-10-28 19:22:05 -07:00
Gilles Debunne
5f8ebe2ee8 Unused assets removed from Settings 
Change-Id: I32cbeba75d46e536191f55a94185ec0e896fa397
 2011-10-28 17:41:08 -07:00
Claudia de Veaux
66a84073cf Strings edits to Security settings summaries. 
Also changed "must" to "need to" per preferred
wording.
Bugs: 5533152, 5163232

Change-Id: I36154e1d926c23f1061861cff6f988d925de9e5e
 2011-10-28 17:12:27 -07:00
Eric Fischer
6fded4ab3f Import revised translations. DO NOT MERGE 
Change-Id: Ib938444059955eab65a79afef9d9ec3c971dcd8c
 2011-10-28 17:06:49 -07:00
Eric Fischer
c72f73181a am f96a1767: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'f96a17676fccb6e08605b9f43a867db0924bb9e9':
  Import revised translations.  DO NOT MERGE
 2011-10-28 22:27:57 +00:00
Eric Fischer
f96a17676f Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-28 14:01:37 -07:00
Eric Fischer
05b52f122e Import revised translations. DO NOT MERGE 
Change-Id: I8a28a888b322b379800fae19299e91a3b485b2f8
 2011-10-28 13:54:20 -07:00
Svetoslav Ganov
1d437a9a4a Merge "Updated tutorial string to use passive voice" 2011-10-28 12:33:10 -07:00
Eric Fischer
260ec1971d Merge "Import revised translations." 2011-10-28 12:15:42 -07:00
Eric Fischer
fe5c95216c Import revised translations. 
Change-Id: I70742032bee9036bdfd2e6b2ca118bd517c2ad10
 2011-10-28 11:36:43 -07:00
Narayan Kamath
17d15b07f4 am 15dc52f9: (-s ours) Merge "Hide the "install voice data" preference by default. DO NOT MERGE" into ics-mr1 
* commit '15dc52f9e9d5c5c88ab32f688618a4ee4384e874':
  Hide the "install voice data" preference by default. DO NOT MERGE
 2011-10-28 09:19:13 +00:00
Narayan Kamath
15dc52f9e9 Merge "Hide the "install voice data" preference by default. DO NOT MERGE" into ics-mr1 2011-10-28 02:15:38 -07:00
Jaikumar Ganesh
27fb42a472 am c89fa2fb: am d9bf0d1a: Merge "Fix UI issue with Bluetooth Settings." into ics-mr0 
* commit 'c89fa2fbfb90cae676a2a24c970c3d18efd781e4':
  Fix UI issue with Bluetooth Settings.
 2011-10-28 02:18:13 +00:00
Jaikumar Ganesh
c89fa2fbfb am d9bf0d1a: Merge "Fix UI issue with Bluetooth Settings." into ics-mr0 
* commit 'd9bf0d1afa7857ec3f678ac2aa041b42bcf2ef5a':
  Fix UI issue with Bluetooth Settings.
 2011-10-28 02:14:06 +00:00