Commit Graph

5468 Commits

Author SHA1 Message Date
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
Jean Chalard
1800130ff1 Merge "Add the cancel button handler" 2011-12-06 19:07:42 -08:00
Jean Chalard
7aa017b1d3 Merge "Add the new add_word interface." 2011-12-06 19:07:30 -08:00
Jean Chalard
21d7c261f3 Merge "Add a new activity for adding a user dictionary word" 2011-12-06 19:07:05 -08:00
Jean Chalard
0824d31aea Add the cancel button handler
Step 3

Bug: 5306641
Change-Id: Ida4ccf181942714799576fde0ac55596ce043434
2011-12-07 12:05:58 +09:00
Jean Chalard
e17eefab87 Add the new add_word interface.
This is step 2. The interface is not functional yet.

Bug: 5306641
Change-Id: Idc8d07b883a17067f777c86d83994fb040b37c59
2011-12-07 11:48:19 +09:00
Jean Chalard
bd44e9d399 Add a new activity for adding a user dictionary word
This is step 1.

Bug: 5306641
Change-Id: I69727f05df8f3455e6e734140f712ccf7881e5be
2011-12-07 11:36:01 +09: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
d29a4fd5b7 am 9ef669a6: am d03c1511: Remove watchdog setting for poor network avoidance
* commit '9ef669a65d6ecaabeb5cf1f8d342ae8032f6bfd5':
  Remove watchdog setting for poor network avoidance
2011-12-06 16:04:31 -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
4d48c12fff am 5166860e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '5166860e0af455d3a60498eb9eae25a0aa4b447e':
  Import revised translations.  DO NOT MERGE
2011-12-06 10:42:34 -08:00
Eric Fischer
46ef9a10a3 am 5cee3120: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '5cee3120246b37ffd9ab6756c198d3398b3e6ba7':
  Import revised translations.  DO NOT MERGE
2011-12-06 10:42:33 -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
Svetoslav Ganov
24f81a68bb am 7e8dcbea: Adding a system preference whether to speak passwords in accessibility mode (settings).
* commit '7e8dcbea65356807ca052ee5e98c9b25b7f0b1ca':
  Adding a system preference whether to speak passwords in accessibility mode (settings).
2011-12-06 10:31:05 -08:00
Eric Fischer
df387fe7f5 Import revised translations. DO NOT MERGE
Change-Id: I404eb6f56dab47491c3440f412722d29bca3c32e
2011-12-06 10:29:45 -08:00