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

5339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
d52d02bf5f Import translations. DO NOT MERGE 
Change-Id: I8302ec88e121e98ad9e576fa8b8e86fa769701f7
 2012-04-05 15:22:58 -07:00
Eric Fischer
ca0d6822f1 Import translations. DO NOT MERGE 
Change-Id: I6a07131c3025acbb574d3add8ead6f272fd0d942
 2012-03-30 14:00:32 -07:00
Eric Fischer
841ad7ba7f Import translations. DO NOT MERGE 
Change-Id: I5db9914730e86cd35b9098780e66c472c84aeadb
 2012-03-29 14:13:01 -07:00
Eric Fischer
f4ce8c937e Import translations. DO NOT MERGE 
Change-Id: I554653297cd9a1e29ce0daf1997874f33d1bb7e1
 2012-03-27 13:30:09 -07:00
Eric Fischer
c51c5310dc Import translations. DO NOT MERGE 
Change-Id: I674045ccf2f0aeff64b0b32daa9ac4ecf1454896
 2012-03-26 14:08:37 -07:00
Eric Fischer
f8b9601433 Import translations. DO NOT MERGE 
Change-Id: I1b049b8739f288f0591959dc09dbfd43cc7c14d8
 2012-03-23 13:49:51 -07:00
Eric Fischer
6db7e9e043 Import translations. DO NOT MERGE 
Change-Id: I50955bd54ef21ed5489958e92d33d5ca7efddc4f
 2012-03-21 13:34:02 -07:00
Eric Fischer
5665cda1e1 Import translations. DO NOT MERGE 
Change-Id: I0fdd1f06fb7783649795bac398e84c9be8658845
 2012-03-20 13:01:49 -07:00
Eric Fischer
63cad3dd8b Import translations. DO NOT MERGE 
Change-Id: Ic36ea190bec85b32f7614ca2c329d6ff48f93d8a
 2012-03-19 14:30:38 -07:00
Jason Chen
8f393645e9 am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 16:32:30 -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
0eb3a3fc4e am 23d0b528: Update string in Settings 
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
  Update string in Settings
 2012-03-16 14:16:17 -07:00
Jason Chen
23d0b5287a Update string in Settings 
Bug: 6183254

Change-Id: Ifba3f97fa318babdd1eb4801cd9a0691adbe3128
 2012-03-16 11:31:19 -07:00
The Android Open Source Project
b2a0ea3541 Reconcile with ics-mr1-release 
Change-Id: Ie559363abe963201d622a17caae6827d8a22e44e
 2012-03-01 10:40:59 -08:00
The Android Automerger
815b2f3467 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:15:44 -08:00
Amith Yamasani
9220d367eb 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:00 -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
The Android Open Source Project
cff569f11c Reconcile with ics-mr1-release 
Change-Id: Ie299bdc69639bde826652cf5da7b7826161b787e
 2012-02-16 10:11:02 -08:00
The Android Automerger
7ca9dcbdff merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:17:08 -08:00
Eric Fischer
8b24b37413 am 78ef5443: Import translations. DO NOT MERGE 
* commit '78ef5443a66ee01d75d89227bfd078706184662c':
  Import translations. DO NOT MERGE
 2012-02-10 10:13:38 -08:00
Eric Fischer
78ef5443a6 Import translations. DO NOT MERGE 
Change-Id: I5cc127e96d61d678d51daf4515bbbda0e9068382
 2012-02-08 19:08:43 -08:00
Eric Fischer
4bec429dd5 Import translations. DO NOT MERGE 
Change-Id: I615776e4f0521a14747ecf6f9e7f8a695bc128b9
 2012-02-06 12:43:39 -08:00
Eric Fischer
117bfe86cd Import translations. DO NOT MERGE 
Change-Id: Ic23ab755fb8351dfd34f1da3943b1cd8b475e923
 2012-02-03 12:46:38 -08:00
Eric Fischer
cbbfffca1e resolved conflicts for merge of 67a50f99 to ics-scoop 
Change-Id: I75009fa3089704e2b5045fda6716f733ae2b06fa
 2012-02-02 14:00:17 -08:00
Eric Fischer
cd92dd0754 Import translations. DO NOT MERGE 
Change-Id: I1e698fedf0d3e3f8ef30cca119303dbb4ca3f402
 2012-02-02 12:54:58 -08:00
Eric Fischer
67a50f99d8 Import translations. DO NOT MERGE 
Change-Id: Icbeee105c69fdde9ca3b07350a48318bdc3d9d3a
 2012-02-02 12:54:15 -08:00
The Android Open Source Project
e3e777f7f2 Reconcile with ics-mr1-release 
Change-Id: I298ee044e83510a9caa19f51e94567863861a8a0
 2012-02-01 08:50:41 -08:00
The Android Automerger
73ff4af39d merge in ics-mr1-release history after reset to ics-mr1 2012-01-20 16:13:29 -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
The Android Automerger
76b9d3ef47 merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:29:50 -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
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 Automerger
b8adf8c0dc merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:32:49 -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 Automerger
52303c68fe merge in ics-mr1-release history after reset to ics-mr1 2011-12-20 17:27:42 -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 Automerger
c8c65a3b81 merge in ics-mr1-release history after reset to ics-mr1 2011-12-13 16:04:02 -08:00
Eric Fischer
2bccd7f4a7 Import revised translations. DO NOT MERGE 
Change-Id: I2dddd2b4c95c27f47c2299500fc893dd6475e3fe
 2011-12-13 10:04:17 -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
080691eda9 Import revised translations. DO NOT MERGE 
Change-Id: I451a0d68abfcf34dd3b601fed87111ce9c5f2aa8
 2011-12-12 11:00:08 -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
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
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
a961c06b9c Reconcile with ics-mr0-release 
Change-Id: I0924e5f898c11034b62b991876bac7e53dd0eebc
 2011-12-08 10:26:01 -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