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

5187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Eric Fischer
6fded4ab3f Import revised translations. DO NOT MERGE 
Change-Id: Ib938444059955eab65a79afef9d9ec3c971dcd8c
 2011-10-28 17:06:49 -07: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
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
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
Jaikumar Ganesh
d9bf0d1afa Merge "Fix UI issue with Bluetooth Settings." into ics-mr0 2011-10-27 16:49:39 -07:00
Jaikumar Ganesh
f5754a078c Fix UI issue with Bluetooth Settings. 
When a profile fails to connect, the preference was getting unset.

Patch generated in conversation with Jake Hamby.

Bug: 5526404
Change-Id: I27ab8d337b6d121f8d369841d3f9a691293ef922
 2011-10-27 16:39:50 -07:00
Eric Fischer
36fb196ce3 am 65c61ef8: (-s ours) Import revised translations. DO NOT MERGE 
* commit '65c61ef8cd6904c4b378cb04dbe564229ff70cd7':
  Import revised translations.  DO NOT MERGE
 2011-10-27 21:46:47 +00:00
Eric Fischer
65c61ef8cd Import revised translations. DO NOT MERGE 
Change-Id: I2731df18113b720c7b2894c670302330c9c29f9f
 2011-10-27 09:53:19 -07:00
Eric Fischer
bb16d168a1 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-27 09:45:59 -07:00
Narayan Kamath
687e22bcf9 Hide the "install voice data" preference by default. DO NOT MERGE 
Re-added if there are voices to install.
DO NOT MERGE : Was already submitted to master.

bug:5511343
Change-Id: Iac95f37c3dda3b213f6ba34c32b7dc725673d64d
 2011-10-27 17:15:51 +01:00
Eric Fischer
d7cb5c7359 Import revised translations. DO NOT MERGE 
Change-Id: I22ad234b19bb6270f7edd9461590d119d7dc4eff
 2011-10-26 17:40:52 -07:00
Eric Fischer
bfdc4ecb86 am d27fa50a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit 'd27fa50a0a823403fd77929f8b6a40a260a27577':
  Import revised translations.  DO NOT MERGE
 2011-10-26 21:08:59 +00:00
Eric Fischer
d27fa50a0a Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-26 14:06:13 -07:00
Eric Fischer
3e17577e85 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-26 11:27:35 -07:00
Eric Fischer
59ecd1667a Import revised translations. DO NOT MERGE 
Change-Id: I9d5e132b9d4a9e505269ef9998acabfba8ffa975
 2011-10-26 11:09:44 -07:00
Eric Fischer
c57348f035 Import revised translations. DO NOT MERGE 
Change-Id: I7d78b6f42431a906f9a8f624c9f0e573859ea4bc
 2011-10-26 10:24:56 -07:00
Todd Poynor
296f2d270f am a94320e3: Settings use minimum manual brightness from config 
* commit 'a94320e332f3c14b6ebb2359cc3fe363b8dfe688':
  Settings use minimum manual brightness from config
 2011-10-26 12:22:41 +00:00
Todd Poynor
a94320e332 Settings use minimum manual brightness from config 
Remove use of deprecated android.os.Power.BRIGHTNESS_DIM (20) + 10.

Change-Id: I24aff7d7fc93b4b67dedb1047bbbd4dbe3fae382
Signed-off-by: Todd Poynor <toddpoynor@google.com>
 2011-10-25 17:14:33 -07:00
Ed Heyl
5f4cda3888 merge ics-mr0 
Change-Id: I264e87a888059ada62b56a3ff7acf44cb0657cb8
 2011-10-25 20:19:41 +00:00
Eric Fischer
caf76c08b3 Import revised translations. DO NOT MERGE 
Change-Id: I7df445e1dff14ef16380b371d8e14af1b6a98295
 2011-10-24 17:09:58 -07:00
Eric Fischer
5907e06007 am b8568b21: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit 'b8568b21118a423c6e30e736c5702b3f946b6179':
  Import revised translations.  DO NOT MERGE
 2011-10-21 16:02:31 -07:00
Eric Fischer
b8568b2111 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-21 16:00:30 -07:00
Eric Fischer
d27a632d94 Import revised translations. DO NOT MERGE 
Change-Id: I1ccc1ed633e301bb2db039ea8ce1041a00daccc3
 2011-10-21 14:41:59 -07:00
Irfan Sheriff
cd5b0233bb am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0 
* commit 'cb5fa5a44779f790fae87102a573816ecc15dd3d':
  Remove wifidirect UI listing
 2011-10-21 14:38:39 -07:00
Peter Ng
31373a6221 Merge "Settings applications processes viewer color updates" 2011-10-21 14:14:44 -07:00
Eric Fischer
97fb1e8e78 am 388c9e2f: (-s ours) Import revised translations. DO NOT MERGE 
* commit '388c9e2f14c4b533ec9d19c1513e51353de89e75':
  Import revised translations.  DO NOT MERGE
 2011-10-21 13:52:11 -07:00
Irfan Sheriff
cb5fa5a447 Merge "Remove wifidirect UI listing" into ics-mr0 2011-10-21 13:29:53 -07:00
Irfan Sheriff
74fda1065a Remove wifidirect UI listing 
Was used for testing. remove it until proper UI is
added

Bug: 5497909
Change-Id: Ic8bd1afbe348ede9031f2446b30a99d7efc88f7c
 2011-10-21 13:11:37 -07:00
Eric Fischer
388c9e2f14 Import revised translations. DO NOT MERGE 
Change-Id: Ib962f495098fdcffdcf5f75d5813bb5fb1e94d7c
 2011-10-20 18:04:50 -07:00
Peter Ng
8e26e6a216 Settings applications processes viewer color updates 
Change-Id: I233bed85c331aa909aebcd3358f7b985d9eaa473
 2011-10-20 14:04:53 -07:00
Eric Fischer
db4a4fd718 am 49a681c4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '49a681c4928d63b86fca0a546ee60b4f95d16669':
  Import revised translations.  DO NOT MERGE
 2011-10-20 11:32:06 -07:00
Eric Fischer
49a681c492 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-20 11:29:07 -07:00
Eric Fischer
e373aa16f7 Import revised translations. DO NOT MERGE 
Change-Id: Ic01568aa596d6aa3b36ee03d37f5d128e0744886
 2011-10-20 11:16:21 -07:00
Danielle Millett
d4227b0386 am 8123493e: Fix 5428748: Added more options for biometric weak 
* commit '8123493ef905a210bd00b0c623459f4c86505298':
  Fix 5428748: Added more options for biometric weak
 2011-10-19 15:14:41 -07:00
Danielle Millett
8123493ef9 Fix 5428748: Added more options for biometric weak 
Adding make pattern visible (for pattern backup only) and vibrate
on touch as options for when biometric weak is enabled.

Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88
 2011-10-19 13:58:30 -04:00