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

5436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
f16669a601 Merge "Fix button visibility on connect" 2011-12-13 13:17:45 -08:00
Irfan Sheriff
0c0bd827a1 Fix button visibility on connect 
Bug: 5750846
Change-Id: I1f31308a21f7f6876f12eb4f1ab45ecd1bc74092
 2011-12-13 11:55:15 -08:00
Eric Fischer
f5bf1e7b68 am 91420083: (-s ours) am 2bccd7f4: Import revised translations. DO NOT MERGE 
* commit '914200831f977e69e9eb98459403c19119ff3539':
  Import revised translations. DO NOT MERGE
 2011-12-13 10:21:09 -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
c46de71ff4 am bb712edd: Reconcile with ics-mr1-release 
* commit 'bb712edde58d3b4069bb7f1f63895522ce651579':
 2011-12-13 05:40:55 -08:00
The Android Open Source Project
bb712edde5 Reconcile with ics-mr1-release 
Change-Id: I5dadecff177d51ca1193ed0a1c69d2ed09bdba60
 2011-12-13 05:12:02 -08:00
Jean Chalard
ee4c1be260 Wording fix 
Bug: 5306641
Change-Id: I11c404bd5d093149f044546363245ebb50e1b195
 2011-12-13 20:45:57 +09: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
71af03eb0b am efbb9c5d: (-s ours) am 080691ed: Import revised translations. DO NOT MERGE 
* commit 'efbb9c5d9d56e7f9d62b32014d0361ed8a87990b':
  Import revised translations.  DO NOT MERGE
 2011-12-12 15:39:21 -08:00
The Android Open Source Project
4bf888436d am 71ca5e4c: Reconcile with ics-mr1-release 
* commit '71ca5e4c62283a4adc10a77356ed98c7fb7b8647':
 2011-12-12 15:30:00 -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
Meng Hu
11140b7d63 am 1d015e49: am 3feacdf3: Add Sprint update menu 
* commit '1d015e49fcb3e15c8a64d1911c80b66e544fa25f':
  Add Sprint update menu
 2011-12-09 18:09:22 -08:00
Eric Fischer
4fba54a1ff am 32c49f1a: (-s ours) am d59d7cb0: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '32c49f1ad7897fdf9dfc161b60f723355a93e6bb':
  Import revised translations. DO NOT MERGE
 2011-12-09 14:58:13 -08:00
The Android Open Source Project
7641eafb9c am b7e62805: am a961c06b: Reconcile with ics-mr0-release 
* commit 'b7e6280522341c57de9a81de6c541f114fab3e47':
 2011-12-09 14:58:04 -08:00
The Android Open Source Project
39cb301dd9 am 018e0819: Reconcile with ics-mr0-release ics-mr1-release 
* commit '018e08197e1891d6985bf1261826de4cf60b18b1':
  Fix NPE in advanced settings
 2011-12-09 14:57:47 -08:00
The Android Open Source Project
71ca5e4c62 Reconcile with ics-mr1-release 
Change-Id: Iaa494a9536a8a244bcb4050d78e7dc15dc8460f0
 2011-12-09 07:11:40 -08:00
Jean Chalard
91e0f5afce Fix a bug where extract UI would be used 
Step 10

Bug: 5306641
Change-Id: Ic91f25cd4304b513d9d0ad931f7a9cc53e08f975
 2011-12-09 17:01:02 +09:00
Jean Chalard
127bd9894f Remove the shortcut textbox for now. 
We'll reactivate it when it's supported by the system.

Step 11

Bug: 5306641
Change-Id: Ib6a673cec3c59d7396d67539940d566c122562ac
 2011-12-09 15:18:35 +09:00
The Android Automerger
732711588d merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 17:36:03 -08:00
Claudia de Veaux
da0db7dc69 Edits to strings per UI text standards. 
We've been finessing some of these standards.
* Use ending punctuation for notification messages, and other messages, if a complete sentence.
* For confirmation messages needing a title, ask the question in the title and put the additional information in the message body.
* Use "choose" instead of "select" when asking the user to pick from options.
* Use "syncing" instead of "synchronizing".
* Don't use ending punctuation for setting summary text.
* Use contractions whenever possible.
* Try not to use the bang!
* Don't use "fail" in user-facing messages.

Bug: 5165745
Bug: 5163232
Bug: 5162667
Change-Id: Iafb9f8d7e93d11f2a0b04e9886bedb8981f62ce9
 2011-12-08 17:19:56 -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
Gilles Debunne
5aa7a15706 Merge "Typos in CheckBoxAndSettingsPreference" 2011-12-08 11:17:05 -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
Jean Chalard
d99ba493ef Add an option to show the whole language list 
The option is not functional yet.
Also, this change simplifies a little the inner workings by
preventing mLocale from being null.
Step 9

Bug: 5306641
Change-Id: Id2284976d34d9d8ac61cbdb2348893989c47da84
 2011-12-08 20:11:51 +09:00
Jean Chalard
c6d0e6353e Add functionality to the spinner. 
With this, the word is actually inserted with the right locale
inside the user dictionary.
Step 8.

Bug: 5306641
Change-Id: Idf6cf3dd807e86c29faf8a701c03c1e6ea39ec68
 2011-12-08 18:43:01 +09:00
Jean Chalard
11e726d233 Small refactoring to make the next diff smaller 
Step 7

Bug: 5306641
Change-Id: If5454679252a54670c501d3a63e9e4bd45028c44
 2011-12-08 18:30:28 +09:00
Jean Chalard
a947e582f1 Populate the locale list 
This populates the language list. The option looks like it works,
but is not implemented yet.

Step 6.

Bug: 5306641
Change-Id: I6ef84dea9a26e450add1d91b44238d86fe49200a
 2011-12-08 18:28:37 +09:00
Jean Chalard
081842e5f1 Merge "Add the more options interface." 2011-12-08 00:53:57 -08:00
Jean Chalard
60bca710ee Add the more options interface. 
The interface is not functional yet, aside from the "Manage"
button. This will come in a later change.
Step 5

Bug: 5306641
Change-Id: I4bdea099eece7ba8a50bbfb47e173036334064ea
 2011-12-08 12:33:15 +09: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
1cd0eba621 am 325c912a: Merge "VpnSettings: add support for server certificates." into ics-mr1 
* commit '325c912ae64e9559cf2e84d5c94d81a0e8a15c48':
  VpnSettings: add support for server certificates.
 2011-12-07 12:30:22 -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
f15ae066c0 am 9daa7d95: am fec195d7: Fix NPE in advanced settings 
* commit '9daa7d95ae49627c02d4aeb6da4e964b83eaf8dd':
  Fix NPE in advanced settings
 2011-12-07 12:23:38 -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
83d31ad497 am 7d10591a: Fix NPE in advanced settings 
* commit '7d10591a3b3c05019260d11f196a5ad742d3685d':
  Fix NPE in advanced settings
 2011-12-07 12:12:59 -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
99cad3edab Reconcile with ics-mr1-release 
Change-Id: I05d0cefddf9ae17eb9e752486aa19e42744af34c
 2011-12-07 07:44:55 -08:00
The Android Open Source Project
708947f194 am c3933b34: Reconcile with ics-mr0-release 
* commit 'c3933b34587e3c10269c05c2554e5a90ab4ce802':
  Remove watchdog setting for poor network avoidance
 2011-12-07 07:29:36 -08:00
The Android Open Source Project
c3933b3458 Reconcile with ics-mr0-release 
Change-Id: I6c179ffa896fe24988d4e43c9bce91d7499d2010
 2011-12-07 07:25:12 -08:00
Jean Chalard
6b8e6585c6 Move adding word functionality to the new interface 
Step 4

Bug: 5306641
Change-Id: I150fd93e9802e92b4cf084867f0a9d1bc382cdae
 2011-12-07 16:41:58 +09:00