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

6319 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
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
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
94a1389f9c am 17347407: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '17347407edd61fc15a316fa7aa55c17b399433ea':
  Import revised translations.  DO NOT MERGE
 2011-11-01 20:53:30 +00: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
b348236409 am 815b329a: am 7d1737e0: Reconcile with ics-factoryrom-2-release 
* commit '815b329af8704e58008860318429f2c70ec547f0':
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"
 2011-11-01 17:12:05 +00: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
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
1ed27d9420 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-01 00:06:23 +00: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
2f0105109d am df8c7aa2: am 19d9a3d2: Merge "Fix WPS pin input UI" into ics-mr0 
* commit 'df8c7aa25f3efaeaeac180f4d8c1d6b132d14924':
  Fix WPS pin input UI
 2011-10-31 21:05:26 +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
The Android Automerger
5fbb56a4b2 merge in ics-mr1-release history after reset to ics-mr1 2011-10-31 06:46:50 -07:00
Ed Heyl
a762e1d708 Merge remote branch 'goog/ics-mr1' into ics-aah 2011-10-31 05:54:48 -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
The Android Automerger
928153796d merge in ics-mr1-release history after reset to ics-mr1 2011-10-30 06:48:02 -07: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