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

5322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
340990a2d2 am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 
* commit 'af48709993faeb0d3665eb6a491aaec701e1ccd5':
  Fix 4560303: Add setting to lock later when power button pressed
 2012-01-10 10:30:39 -08:00
Jim Miller
af48709993 Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 2012-01-10 10:28:31 -08:00
Amith Yamasani
79ffc66917 am aaff44c8: Don\'t allow wifi tethering when running monkeys. 
* commit 'aaff44c84f4e88184276064dff9e36eefde3ffcb':
  Don't allow wifi tethering when running monkeys.
 2012-01-09 16:03:30 -08:00
Amith Yamasani
aaff44c84f Don't allow wifi tethering when running monkeys. 
Bug: 5607825

Remove the wifi access point settings and wifi tethering checkbox when
monkeys are running.

Change-Id: I64b930ddb791013a08c178561fe29130f1f0e4b8
 2012-01-09 14:52:58 -08:00
Jim Miller
071742d838 Fix 4560303: Add setting to lock later when power button pressed 
This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

Change-Id: I711a81c3e79f7accdc1d9cb217b7806a0b8fcf63
 2012-01-09 14:25:04 -08:00
The Android Open Source Project
5be1b1a295 Reconcile with ics-mr1-release 
Change-Id: Ifa3965b3e29cc1a9fe89a24e78e83507a4b2880c
 2012-01-06 18:15:48 -08:00
The Android Automerger
b8adf8c0dc merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:32:49 -08:00
Todd Poynor
dbc6b66307 am da68fd46: Merge "Android OS battery usage overstated by screen on time" into ics-mr1 
* commit 'da68fd4620088c1cb3a51cd2064885cbcd1ac621':
  Android OS battery usage overstated by screen on time
 2012-01-05 11:23:34 -08:00
Todd Poynor
da68fd4620 Merge "Android OS battery usage overstated by screen on time" into ics-mr1 2012-01-05 11:21:08 -08:00
Todd Poynor
e3b4dfae6f Android OS battery usage overstated by screen on time 
Change-Id: Icbc4b3ecf91bdbb90da3ee0cf1c68bec953d0177
Signed-off-by: Todd Poynor <toddpoynor@google.com>
 2012-01-05 10:40:14 -08:00
The Android Open Source Project
2c49911b21 Reconcile with ics-mr1-release 
Change-Id: I35894bf1394fd007afa6cca910b2d9ae18ffdb49
 2011-12-21 07:19:46 -08:00
The Android Automerger
52303c68fe merge in ics-mr1-release history after reset to ics-mr1 2011-12-20 17:27:42 -08:00
Kazuhiro Ondo
9fb7b17c46 am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available 
* commit 'a98c353f8b18607f0c2e9af26b91bf6ffbe8dc78':
  Don't enable SIM PIN Lock menu if SIM is not available
 2011-12-20 16:45:45 -08:00
Kazuhiro Ondo
a98c353f8b Don't enable SIM PIN Lock menu if SIM is not available 
Bug: 5774681
Change-Id: I1edd1447ff83ab8cf9e8a1eb8fbd85ef0becdce7
 2011-12-20 14:30:15 -08:00
The Android Open Source Project
e8b0e7d3f4 Reconcile with ics-mr1-release 
Change-Id: I4d2578e9635a5585c499f7ffcd816c5cf6876b3f
 2011-12-13 19:10:39 -08:00
The Android Automerger
c8c65a3b81 merge in ics-mr1-release history after reset to ics-mr1 2011-12-13 16:04:02 -08:00
Eric Fischer
914200831f am 2bccd7f4: Import revised translations. DO NOT MERGE 
* commit '2bccd7f4a7793fd78dd9c83e9fe613ea9e32513b':
  Import revised translations. DO NOT MERGE
 2011-12-13 10:18:52 -08:00
Eric Fischer
2bccd7f4a7 Import revised translations. DO NOT MERGE 
Change-Id: I2dddd2b4c95c27f47c2299500fc893dd6475e3fe
 2011-12-13 10:04:17 -08:00
The Android Open Source Project
bb712edde5 Reconcile with ics-mr1-release 
Change-Id: I5dadecff177d51ca1193ed0a1c69d2ed09bdba60
 2011-12-13 05:12:02 -08:00
The Android Automerger
5652d2fcbc merge in ics-mr1-release history after reset to ics-mr1 2011-12-12 22:09:28 -08:00
Eric Fischer
efbb9c5d9d am 080691ed: Import revised translations. DO NOT MERGE 
* commit '080691eda9be32e090ed9abba1cc6fa0047b51fd':
  Import revised translations.  DO NOT MERGE
 2011-12-12 11:06:39 -08:00
Eric Fischer
080691eda9 Import revised translations. DO NOT MERGE 
Change-Id: I451a0d68abfcf34dd3b601fed87111ce9c5f2aa8
 2011-12-12 11:00:08 -08:00
The Android Open Source Project
71ca5e4c62 Reconcile with ics-mr1-release 
Change-Id: Iaa494a9536a8a244bcb4050d78e7dc15dc8460f0
 2011-12-09 07:11:40 -08:00
The Android Automerger
732711588d merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 17:36:03 -08:00
Meng Hu
1d015e49fc am 3feacdf3: Add Sprint update menu 
* commit '3feacdf3969800d6c53c6ca6f8ced2f8fc637f7f':
  Add Sprint update menu
 2011-12-08 14:18:03 -08:00
Meng Hu
3feacdf396 Add Sprint update menu 
Adds the conditionally used xml ui definition and removes it at runtime when it's not
wanted.  Ported from GB.

bug:5237167
Change-Id: I89a67e1033ddc7099563732e839c08fbadb4fd75
 2011-12-08 13:00:35 -08:00
Eric Fischer
32c49f1ad7 am d59d7cb0: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'd59d7cb0914ff4fb8e0a6cf6f33c2fd2a27b6559':
  Import revised translations. DO NOT MERGE
 2011-12-08 11:13:18 -08:00
Eric Fischer
d59d7cb091 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-08 11:09:58 -08:00
Eric Fischer
a5f26614c8 Import revised translations. DO NOT MERGE 
Change-Id: If9d9c2cd72682251e2743543c8f6ee36b2c2da2a
 2011-12-08 10:36:13 -08:00
The Android Open Source Project
b7e6280522 am a961c06b: Reconcile with ics-mr0-release 
* commit 'a961c06b9c0718406a72d71125aa0bf45d3c8659':
 2011-12-08 10:29:03 -08:00
The Android Open Source Project
a961c06b9c Reconcile with ics-mr0-release 
Change-Id: I0924e5f898c11034b62b991876bac7e53dd0eebc
 2011-12-08 10:26:01 -08:00
The Android Open Source Project
018e08197e Reconcile with ics-mr0-release ics-mr1-release 
Change-Id: I410c510ccb55648d119fe4638cecbe87f25df94b
 2011-12-08 10:22:18 -08:00
The Android Automerger
96529289db merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 07:01:43 -08:00
Irfan Sheriff
009c1cc19e Fix NPE in advanced settings 
Bug: 5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542
 2011-12-07 16:42:17 -08:00
Chia-chi Yeh
325c912ae6 Merge "VpnSettings: add support for server certificates." into ics-mr1 2011-12-07 12:26:52 -08:00
Irfan Sheriff
9daa7d95ae am fec195d7: Fix NPE in advanced settings 
* commit 'fec195d7564b489fcdd814d066cfbf6af702132b':
  Fix NPE in advanced settings
 2011-12-07 12:20:27 -08:00
Irfan Sheriff
fec195d756 Fix NPE in advanced settings 
Bug: 5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542
 2011-12-07 12:08:57 -08:00
Irfan Sheriff
7d10591a3b Fix NPE in advanced settings 
Bug: 5723974
Change-Id: I9904b6adb2b51f1511f932ef7cba8f6558417061
 2011-12-07 11:40:49 -08:00
The Android Open Source Project
c3933b3458 Reconcile with ics-mr0-release 
Change-Id: I6c179ffa896fe24988d4e43c9bce91d7499d2010
 2011-12-07 07:25:12 -08:00
Chia-chi Yeh
f5317a151b VpnSettings: add support for server certificates. 
Bug: 5714397
Change-Id: I5ce13e244fba554bec31c4935571b09127b9270a
 2011-12-06 17:51:01 -08:00
The Android Automerger
c67a050c9e merge in ics-mr1-release history after reset to ics-mr1 2011-12-06 16:54:59 -08:00
Irfan Sheriff
cf52e07f53 Remove watchdog setting for poor network avoidance 
Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2
 2011-12-06 14:23:43 -08:00
Irfan Sheriff
9ef669a65d am d03c1511: Remove watchdog setting for poor network avoidance 
* commit 'd03c15119d404d282ccc5fba257a6ca76962769c':
  Remove watchdog setting for poor network avoidance
 2011-12-06 11:37:04 -08:00
Irfan Sheriff
d03c15119d Remove watchdog setting for poor network avoidance 
Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2
 2011-12-06 11:21:49 -08:00
Eric Fischer
5166860e0a Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-06 10:37:36 -08:00
Eric Fischer
5cee312024 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-06 10:37:09 -08:00
Eric Fischer
df387fe7f5 Import revised translations. DO NOT MERGE 
Change-Id: I404eb6f56dab47491c3440f412722d29bca3c32e
 2011-12-06 10:29:45 -08:00
Svetoslav Ganov
7e8dcbea65 Adding a system preference whether to speak passwords in accessibility mode (settings). 
By default we do not speak passwords if the user has no headset. However,
many users find this too restrictive and would like a way to enable
password announcement. While we cannot speak the passwords all the time
,to avoid leaking them, we expose a preference so each user can choose
the option that best works for him/her.

bug:5712607

Change-Id: I1a6e95c392c18dc8d7406b1cef49705756b31254
 2011-12-05 13:09:27 -08:00
The Android Automerger
8fade5b963 merge in ics-mr1-release history after reset to ics-mr1 2011-12-02 16:21:56 -08:00
Eric Fischer
7823baac40 Import revised translations. DO NOT MERGE 
Change-Id: I8d5ff4f5f728e3c00b63a81740b707d9ac14fb32
 2011-12-02 14:25:00 -08:00