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

5500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
3a68ccc80e am 4fba54a1: am 32c49f1a: (-s ours) am d59d7cb0: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '4fba54a1ff211e7491c1687467d5202bf1872743':
  Import revised translations. DO NOT MERGE
 2011-12-09 15:03:38 -08:00
The Android Open Source Project
2bda89a8d6 am 7641eafb: am b7e62805: am a961c06b: Reconcile with ics-mr0-release 
* commit '7641eafb9c6ce32842f609f9b575c3b2ffcb862b':
 2011-12-09 15:03:38 -08:00
The Android Open Source Project
147b40bb10 am 39cb301d: am 018e0819: Reconcile with ics-mr0-release ics-mr1-release 
* commit '39cb301dd984f96faf6d105026fdbefa64280cb3':
  Fix NPE in advanced settings
 2011-12-09 15:03:37 -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
Jean Chalard
511ca69233 am 91e0f5af: Fix a bug where extract UI would be used 
* commit '91e0f5afce3e16e8e1c520e9765cfb17835bc1e1':
  Fix a bug where extract UI would be used
 2011-12-09 11:00:47 -08:00
Jean Chalard
e8614da2cc am 127bd989: Remove the shortcut textbox for now. 
* commit '127bd9894faa3d1d44e3ac6998b4d23c22589bfd':
  Remove the shortcut textbox for now.
 2011-12-09 11:00:45 -08:00
Claudia de Veaux
de8bf6f674 am da0db7dc: Edits to strings per UI text standards. 
* commit 'da0db7dc691489b65a1379d1c441e5906d7d22fb':
  Edits to strings per UI text standards.
 2011-12-09 11:00:36 -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
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
Gilles Debunne
71db96dd05 am 5aa7a157: Merge "Typos in CheckBoxAndSettingsPreference" 
* commit '5aa7a157067d4ddf5760af875e7372a36b3b841c':
  Typos in CheckBoxAndSettingsPreference
 2011-12-08 11:19:01 -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
125a86af0b am d99ba493: Add an option to show the whole language list 
* commit 'd99ba493ef35ce741bb414315d94c93644d13a14':
  Add an option to show the whole language list
 2011-12-08 03:24:55 -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
cd8d0f25e4 am c6d0e635: Add functionality to the spinner. 
* commit 'c6d0e6353ef1cd89b7604a93685e4a1412a523c4':
  Add functionality to the spinner.
 2011-12-08 02:59:49 -08:00
Jean Chalard
4361251536 am 11e726d2: Small refactoring to make the next diff smaller 
* commit '11e726d23375bf8192bb1e93028f0a1f86ae48d6':
  Small refactoring to make the next diff smaller
 2011-12-08 01:45:03 -08:00
Jean Chalard
3aec7877ba am a947e582: Populate the locale list 
* commit 'a947e582f1b79c2ed30d1609869ddf83832d4bd9':
  Populate the locale list
 2011-12-08 01:43:19 -08: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
e38afb9b70 am 081842e5: Merge "Add the more options interface." 
* commit '081842e5f183919c376be96c758f827bef9cb817':
  Add the more options interface.
 2011-12-08 00:56:37 -08: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
7f1c4d0b43 am 1cd0eba6: am 325c912a: Merge "VpnSettings: add support for server certificates." into ics-mr1 
* commit '1cd0eba621e324585bfeffa7ca061b1f37db4873':
  VpnSettings: add support for server certificates.
 2011-12-07 12:32:08 -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
5c68e08f60 am f15ae066: am 9daa7d95: am fec195d7: Fix NPE in advanced settings 
* commit 'f15ae066c05b2bf2cbe5be0d8b11aa8569114765':
  Fix NPE in advanced settings
 2011-12-07 12:25:26 -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
5779fb75e5 am 83d31ad4: am 7d10591a: Fix NPE in advanced settings 
* commit '83d31ad497877ca604794f4e6895af487015f9b8':
  Fix NPE in advanced settings
 2011-12-07 12:15:16 -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
17045e2f1e am 99cad3ed: Reconcile with ics-mr1-release 
* commit '99cad3edab1563498d354dba532fb91bf6cdd135':
 2011-12-07 07:48:51 -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
22db4f6b78 am 708947f1: am c3933b34: Reconcile with ics-mr0-release 
* commit '708947f194c24d0e5c3ca8270134427e942d1964':
  Remove watchdog setting for poor network avoidance
 2011-12-07 07:32:06 -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
13a3f8a5f0 am 6b8e6585: Move adding word functionality to the new interface 
* commit '6b8e6585c672dfee5b69d3b5b2f1c030acf95a22':
  Move adding word functionality to the new interface
 2011-12-07 04:18:14 -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