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

5328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ed Heyl
a762e1d708 Merge remote branch 'goog/ics-mr1' into ics-aah 2011-10-31 05:54:48 -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
Ed Heyl
991e445900 keep previous history after reset to mr1 plus aah changes (ics-aah-wip) 2011-10-28 19:05:57 +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
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
Mike J. Chen
ef4eb89d71 Allows auto dismissing of bluetooth activation dialogs 
Create a new overlay boolean that allows products (like Android@Home
ones that have no or minimal display) to not bring up the bluetooth
activation confirmation dialog.

Change-Id: I23c2d1483a4d71b0025624c2e4aaacc688de3260
Signed-off-by: Mike J. Chen <mjchen@google.com>
 2011-10-27 17:39:54 -04: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
Ed Heyl
f0fc3d21f9 undo reset to ics-mr1 until we have a better method 2011-10-26 21:53:26 +00: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
Ed Heyl
b9cd9bd532 reset to ics-mr1, but keep history 2011-10-26 18:50:24 +00: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
12028a78b8 am f97709ca: am 296f2d27: am a94320e3: Settings use minimum manual brightness from config 
* commit 'f97709ca956c16690a9dea8bd041962c2a351f5c':
  Settings use minimum manual brightness from config
 2011-10-26 07:56:02 -07:00
Ed Heyl
249c10685d am 24491bbc: am 5f4cda38: (-s ours) merge ics-mr0 
* commit '24491bbc7ca2b43ce7f9e957d3e7fbefd8e9986b':
 2011-10-26 07:56:01 -07:00
Todd Poynor
f97709ca95 am 296f2d27: am a94320e3: Settings use minimum manual brightness from config 
* commit '296f2d270f23b27446d1d85450ac0310eb9fd3ea':
  Settings use minimum manual brightness from config
 2011-10-26 14:54:14 +00:00
Ed Heyl
24491bbc7c am 5f4cda38: (-s ours) merge ics-mr0 
* commit '5f4cda3888934cf9bfa01695c098beedcc45247f':
 2011-10-26 14:54:14 +00: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
23a93001db am 6bf9bfac: Merge "Import revised translations." 
* commit '6bf9bfac0726f5283821a53348765e46db258c3d':
  Import revised translations.
 2011-10-25 11:47:45 -07:00
Eric Fischer
6bf9bfac07 Merge "Import revised translations." 2011-10-25 11:46:00 -07:00
Eric Fischer
6492021d3d Import revised translations. 
Change-Id: I85d5a78e41a780050884cec4669b45525bbeac0f
 2011-10-25 11:00:07 -07:00
Eric Fischer
906902376f am 66e034cb: (-s ours) am caf76c08: (-s ours) Import revised translations. DO NOT MERGE 
* commit '66e034cb7bb07d419dd5229630cd729ea81a7aa7':
  Import revised translations.  DO NOT MERGE
 2011-10-24 17:16:01 -07:00
Eric Fischer
66e034cb7b am caf76c08: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'caf76c08b3d7044ef5cb55b1df4fd245e68889f7':
  Import revised translations.  DO NOT MERGE
 2011-10-24 17:14:12 -07:00
Eric Fischer
caf76c08b3 Import revised translations. DO NOT MERGE 
Change-Id: I7df445e1dff14ef16380b371d8e14af1b6a98295
 2011-10-24 17:09:58 -07:00
Eric Fischer
5eca8c5c29 am 5907e060: (-s ours) am b8568b21: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '5907e06007fa7a15975294e4db28c5807e3ece25':
  Import revised translations.  DO NOT MERGE
 2011-10-21 16:05: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
28e8abc95b am cd5b0233: am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0 
* commit 'cd5b0233bb73880e4d2f40633d33f1a6eb63e4b9':
  Remove wifidirect UI listing
 2011-10-21 14:40:48 -07:00