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

5470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chen
d6c1c58af2 am 80f2b063: (-s ours) am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit '80f2b06330accf1e4f51bc4846edf1e1409899f1':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 16:35:56 -07:00
Jason Chen
80f2b06330 am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 16:33:10 -07:00
Jason Chen
d5f7e6cd6b [DO NOT MERGE] Revert "Update string in Settings" 
This reverts commit 23d0b5287a.
 2012-03-16 16:18:51 -07:00
Jason Chen
800d263c2d am 23d0b528: Update string in Settings 
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
  Update string in Settings
 2012-03-16 14:16:49 -07:00
Jason Chen
23d0b5287a Update string in Settings 
Bug: 6183254

Change-Id: Ifba3f97fa318babdd1eb4801cd9a0691adbe3128
 2012-03-16 11:31:19 -07:00
Amith Yamasani
6130420fa9 am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge. 
* commit '9372484065993cfdb9a48ddecc52d2ed911e8ce1':
  Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
 2012-02-28 10:14:08 -08:00
Amith Yamasani
9372484065 Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge. 
Bug: 6079494

(cherry picked from commit 5fb53f36cb)

Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9
 2012-02-28 09:58:45 -08:00
Joe Onorato
50339f3da1 turn off log spew 
Change-Id: I10f70d5f173cb04e9f58434d9daf0bb01498b813
 2012-02-27 22:32:43 -08:00
Eric Fischer
3c7aec3d0b am 78ef5443: Import translations. DO NOT MERGE 
* commit '78ef5443a66ee01d75d89227bfd078706184662c':
  Import translations. DO NOT MERGE
 2012-02-10 10:30:30 -08:00
Eric Fischer
78ef5443a6 Import translations. DO NOT MERGE 
Change-Id: I5cc127e96d61d678d51daf4515bbbda0e9068382
 2012-02-08 19:08:43 -08:00
Eric Fischer
02a9c083d0 Import translations. DO NOT MERGE 
Change-Id: I1191d74a9998461cd673918e425c25fc8753f0f5
 2012-02-06 12:42:15 -08:00
Eric Fischer
6e7eac8e81 Import translations. DO NOT MERGE 
Change-Id: I3b212608cb7a1ac013eb37ff57092adf8680a439
 2012-02-03 12:45:11 -08:00
Eric Fischer
297231ca4f resolved conflicts for merge of 67a50f99 to ics-aah 
Change-Id: I14ffa78c503c91b615e353941a79ea0f8a85bb5a
 2012-02-02 14:02:44 -08:00
Eric Fischer
67a50f99d8 Import translations. DO NOT MERGE 
Change-Id: Icbeee105c69fdde9ca3b07350a48318bdc3d9d3a
 2012-02-02 12:54:15 -08:00
Eric Fischer
3fe72b1bf1 Import translations. DO NOT MERGE 
Change-Id: I0440527327af6700c034209be183979e9d682fd2
 2012-02-02 12:53:33 -08:00
Eric Fischer
1ab0cb8749 Import translations. DO NOT MERGE 
Change-Id: Ib5f8ddec20efbe7719bbb5e53d4cee47a31cb2e8
 2012-01-31 16:18:05 -08:00
Justin Ho
e898d23cd9 am 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1 
* commit '43c9dcc18e4e1137c59b847eadde7ae27302b08f':
  Fix a pseudo race condition in TtsEngineSettingsFragment.
 2012-01-20 14:42:34 -08:00
Narayan Kamath
08883b572b am 999f23e2: Locale string comparisons must ignore case. 
* commit '999f23e2c304bde3a5c27f7f882d4616f5abdf9e':
  Locale string comparisons must ignore case.
 2012-01-20 14:42:34 -08:00
Justin Ho
43c9dcc18e Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1 2012-01-20 14:40:04 -08:00
Narayan Kamath
2d8101bc8b Fix a pseudo race condition in TtsEngineSettingsFragment. 
The issue is that Fragment.setVoiceDataDetails can
be called before Fragment.getView. We guard against this
issue. No thread visibility issues here because both functions
are called on the UI thread.

bug:5884355
Change-Id: Iad91b91c58b04dcb9f34f6b5ff8752f2e8295423
 2012-01-20 17:52:02 +00:00
Narayan Kamath
999f23e2c3 Locale string comparisons must ignore case. 
The spec does not specify case sensitivity and support
for 3 letter locales is currently poor.

bug:5885830
Change-Id: I1b8f582bd19b1b0aed220036c5f17904478dba46
 2012-01-20 17:42:59 +00:00
Jim Miller
659fffcda2 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:29:59 -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
82df66c3eb 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:59 -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
Todd Poynor
533786a373 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:24:06 -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
Kazuhiro Ondo
e75ce965e3 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:41 -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
Eric Fischer
cd6fc886ff am 2bccd7f4: Import revised translations. DO NOT MERGE 
* commit '2bccd7f4a7793fd78dd9c83e9fe613ea9e32513b':
  Import revised translations. DO NOT MERGE
 2011-12-13 10:52:31 -08:00
Eric Fischer
2bccd7f4a7 Import revised translations. DO NOT MERGE 
Change-Id: I2dddd2b4c95c27f47c2299500fc893dd6475e3fe
 2011-12-13 10:04:17 -08:00
Eric Fischer
74ddfbd658 am 080691ed: Import revised translations. DO NOT MERGE 
* commit '080691eda9be32e090ed9abba1cc6fa0047b51fd':
  Import revised translations.  DO NOT MERGE
 2011-12-12 11:08:36 -08:00
Eric Fischer
080691eda9 Import revised translations. DO NOT MERGE 
Change-Id: I451a0d68abfcf34dd3b601fed87111ce9c5f2aa8
 2011-12-12 11:00:08 -08:00
Meng Hu
1f2890f8f3 am 3feacdf3: Add Sprint update menu 
* commit '3feacdf3969800d6c53c6ca6f8ced2f8fc637f7f':
  Add Sprint update menu
 2011-12-08 14:17:27 -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
4305c887ea 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:14 -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
f2a6adee46 am a961c06b: Reconcile with ics-mr0-release 
* commit 'a961c06b9c0718406a72d71125aa0bf45d3c8659':
  Fix NPE in advanced settings
 2011-12-08 10:28:58 -08:00
The Android Open Source Project
a961c06b9c Reconcile with ics-mr0-release 
Change-Id: I0924e5f898c11034b62b991876bac7e53dd0eebc
 2011-12-08 10:26:01 -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
d16197b87c am 325c912a: Merge "VpnSettings: add support for server certificates." into ics-mr1 
* commit '325c912ae64e9559cf2e84d5c94d81a0e8a15c48':
  VpnSettings: add support for server certificates.
 2011-12-07 12:28:40 -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
93de1e29eb am 9daa7d95: am fec195d7: Fix NPE in advanced settings 
* commit '9daa7d95ae49627c02d4aeb6da4e964b83eaf8dd':
  Fix NPE in advanced settings
 2011-12-07 12:22:10 -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
2898c54013 am 7d10591a: Fix NPE in advanced settings 
* commit '7d10591a3b3c05019260d11f196a5ad742d3685d':
  Fix NPE in advanced settings
 2011-12-07 12:10:15 -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