Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,106 Commits 1 Branch 0 Tags
887cda2f4b99b90e9a3e17ecb7fe687a15b7d4fa
Commit Graph

2073 Commits

Author SHA1 Message Date
Adam Powell
887cda2f4b am 155c427e: Merge "Bug 5126088 - update layout for activate device policy activity" 
* commit '155c427e0bec0ded9b273db1022d16c0437059d8':
  Bug 5126088 - update layout for activate device policy activity
 2011-10-04 13:55:49 -07:00
Adam Powell
a70e1468cf Bug 5126088 - update layout for activate device policy activity 
Change-Id: Ifd5963adc0dc30c0a650bac822dbbd7cb938c144
 2011-10-04 13:48:50 -07:00
Claudia de Veaux
649b34b0cf am bbb7097a: Merge "Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug t 
* commit 'bbb7097a6871ae463fb865c7fe47c5500f5a6c6a':
  Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"
 2011-10-04 12:54:01 -07:00
Claudia de Veaux
bbb7097a68 Merge "Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"" 2011-10-04 12:52:16 -07:00
Claudia de Veaux
e2db5875f6 Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl" 
This reverts commit c9c29d90f7
 2011-10-04 12:51:23 -07:00
Claudia de Veaux
496be57ef6 am 2e0143b4: Merge "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have t 
* commit '2e0143b415b07f126100c6ceb89698e1e7e5e06d':
  Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titles removed properly; for now I just made the string empty.
 2011-10-04 11:31:56 -07:00
Claudia de Veaux
2e0143b415 Merge "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titles removed properly; for now I just made the string empty." 2011-10-04 11:30:03 -07:00
Claudia de Veaux
c9c29d90f7 Settings strings cleanup per standards. 
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328
Implementation of language and spelling changes requested by Design
such as WiFi. Also removed some dialog titles per Design. Will
file separate bug to have the titles removed properly; for now I
just made the string empty.

Change-Id: I56b251a0d639f8d25f0908c636226e0d6e7da6a5

More changes to add <xliff:g/> around raw HTML per Eric Fischer.

Fixed redundant <string> tag caught in review.
 2011-10-03 18:07:06 -07:00
Jeff Hamilton
887d9d64f8 am 326f96c5: Update settings strings. 
* commit '326f96c5dca3ad59f9a96326e882eaa55cc7d560':
  Update settings strings.
 2011-10-03 08:40:34 -07:00
Jeff Hamilton
326f96c5dc Update settings strings. 
Bug: 5350022
Change-Id: Ia507b886faa17283bb62fe5bd63afb04b490d015
 2011-10-03 10:38:14 -05:00
Bjorn Bringert
3e66bcfc4d am 4da63255: Merge "Fix ISO3 code for spanish in demo strings array." 
* commit '4da63255ed394b8cd2eb88c02a6c0b9235797866':
  Fix ISO3 code for spanish in demo strings array.
 2011-10-03 08:29:27 -07:00
Bjorn Bringert
4da63255ed Merge "Fix ISO3 code for spanish in demo strings array." 2011-10-03 08:22:21 -07:00
Narayan Kamath
59ab1ec3e7 Fix ISO3 code for spanish in demo strings array. 
bug:5399728
Change-Id: Ib001425c0ea0298720d9c65f5ece22ecd70ce471
 2011-10-03 14:46:44 +01:00
Eric Fischer
a009c2a11a am c4fea5f9: Merge "Import revised translations." 
* commit 'c4fea5f9d2211ed8c48e7f901364df0e7dbbee26':
  Import revised translations.
 2011-09-30 16:59:15 -07:00
Eric Fischer
9f12b39cf5 Import revised translations. 
Change-Id: I8b8b4ce15c2a6a55c89fe3ca987db8e34526782b
 2011-09-30 16:46:13 -07:00
Amith Yamasani
109c2ace97 am b40e4491: Merge "Remove "Screen lock" category header as the title is sufficient." 
* commit 'b40e4491efe99c1499d6af3a31a140ed99cf3560':
  Remove "Screen lock" category header as the title is sufficient.
 2011-09-29 16:44:39 -07:00
Amith Yamasani
b40e4491ef Merge "Remove "Screen lock" category header as the title is sufficient." 2011-09-29 16:43:34 -07:00
Romain Guy
2623d685f3 am c00a9d9f: Merge "Add developer setting to force hardware acceleration" 
* commit 'c00a9d9f5e0719601f670207f57d50225365f2cb':
  Add developer setting to force hardware acceleration
 2011-09-29 16:43:01 -07:00
Romain Guy
0c9c14b786 Add developer setting to force hardware acceleration 
Change-Id: I1bb3da7db4602ce7cbdfb46799c5114ce63ffed2
 2011-09-29 16:39:31 -07:00
Amith Yamasani
cf26bb2dcc Remove "Screen lock" category header as the title is sufficient. 
Bug: 5203189

Insert a descriptive text as a header view when in weak biometric
fallback case.

Change-Id: Ic10cc7d276975b13c188bd15016fea2200ec0e5b
 2011-09-29 15:19:07 -07:00
Daisuke Miyakawa
4528867997 am 8fc853b1: Merge "Set longer char limit for sync setting strings" 
* commit '8fc853b19a369f56f20c4dfa109e618af7796eff':
  Set longer char limit for sync setting strings
 2011-09-29 12:23:13 -07:00
Daisuke Miyakawa
558b23a2d3 Set longer char limit for sync setting strings 
Translated strings cannot be accomodated while we can have
longer ones there.

Bug: 5376058
Change-Id: I83ec28964c3aa19cb16fa8fc648ef392e67d4f49
 2011-09-28 18:52:19 -07:00
Jeff Hamilton
92e2a9a296 am 0b174b38: Fix the text color. 
* commit '0b174b388306038efe4e95906084c15e9c8e8f29':
  Fix the text color.
 2011-09-28 12:57:33 -07:00
Jeff Hamilton
0b174b3883 Fix the text color. 
Bug: 5375784
Change-Id: I5307636b607f3e3a5e4afb34ece6f84320dc9cca
 2011-09-28 14:54:57 -05:00
Jeff Hamilton
1acdc17067 am 852f3cb7: Merge "Fix the text size." 
* commit '852f3cb7601de604ee9ce57d1ecede1bec36e74a':
  Fix the text size.
 2011-09-28 12:45:44 -07:00
Jeff Hamilton
852f3cb760 Merge "Fix the text size." 2011-09-28 12:43:18 -07:00
Jeff Hamilton
9b0631ca5b Fix the text size. 
Bug: 5375784
Change-Id: I458be9e4a025c439088df22195301d48e94e1b90
 2011-09-28 14:21:07 -05:00
Mike Sipe
8dc669d037 am ce73fc83: Merge "Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings" 
* commit 'ce73fc83e7a208a1149aec3085b6e9b55efc8e52':
  Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings
 2011-09-27 19:32:33 -07:00
Jeff Sharkey
1094795864 am 1ef9c541: am 76ac6a9b: Merge "About." into ics-factoryrom 
* commit '1ef9c5416df9c72a543dbed454b4c282ec6f1fed':
  About.
 2011-09-27 19:32:17 -07:00
Mike Sipe
ce73fc83e7 Merge "Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings" 2011-09-27 17:01:12 -07:00
Jim Miller
a277b56425 Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings 
Change-Id: If42c7c12e5084f5c18d0959a1c1a0c538aed8ac0
 2011-09-27 16:39:20 -07:00
Jeff Sharkey
1ef9c5416d am 76ac6a9b: Merge "About." into ics-factoryrom 
* commit '76ac6a9bcb7cfc3be79e956a6207599e6910de8a':
  About.
 2011-09-27 16:27:56 -07:00
Jeff Sharkey
76ac6a9bcb Merge "About." into ics-factoryrom 2011-09-27 16:26:08 -07:00
Jeff Sharkey
246120e5ff About. 
Bug: 5337015
Change-Id: I41f302a6f329c54c9d6abb8925c228fee5cc716f
 2011-09-27 15:13:10 -07:00
Eric Fischer
145abb6e22 Import revised translations. DO NOT MERGE 
Change-Id: Ib4fe1d2dd91618933614f68f6224c8ac48d31bc8
 2011-09-27 14:33:22 -07:00
Svetoslav Ganov
834a90f47a am 522b074b: Merge "Clarify install accessibility scripts wording." 
* commit '522b074bdae89737ee4ac8580a8c939f257f3f3a':
  Clarify install accessibility scripts wording.
 2011-09-27 11:23:36 -07:00
Svetoslav Ganov
522b074bda Merge "Clarify install accessibility scripts wording." 2011-09-27 11:22:06 -07:00
Svetoslav Ganov
af2a4547b9 Clarify install accessibility scripts wording. 
1. Updated the wording according to tech writer feedback to be
   more precise and avoid user confusion.

bug:5374051

Change-Id: Ica54b91f475be1d271f1588f044a5a2b72a44e51
 2011-09-27 11:13:02 -07:00
Danielle Millett
5e83b2faeb am cc571cc4: Merge "Changed header to specify backup lock" 
* commit 'cc571cc4fe626517482435a8ffd3bd461bf4bbbd':
  Changed header to specify backup lock
 2011-09-27 07:27:24 -07:00
Danielle Millett
cc571cc4fe Merge "Changed header to specify backup lock" 2011-09-27 06:14:01 -07:00
satok
377706654b am e12b4cd5: Merge "Fix the alignment of the preference in IME settings on Tablet" 
* commit 'e12b4cd54da737f29f50a033bdf655a214722144':
  Fix the alignment of the preference in IME settings on Tablet
 2011-09-27 01:55:41 -07:00
satok
e12b4cd54d Merge "Fix the alignment of the preference in IME settings on Tablet" 2011-09-27 01:52:00 -07:00
satok
f5acea67b4 Fix the alignment of the preference in IME settings on Tablet 
Bug: 5366586

Change-Id: I2659415fb74cca2c65bdd3171217e786d4f41aac
 2011-09-27 17:47:51 +09:00
satok
01c2387bae am 44e32ab4: Merge "Tweak IME settings" 
* commit '44e32ab40fa1421a564801d2bfba0407575d7e37':
  Tweak IME settings
 2011-09-27 00:12:16 -07:00
satok
44e32ab40f Merge "Tweak IME settings" 2011-09-27 00:10:57 -07:00
satok
054fc44cae Tweak IME settings 
Change-Id: I13b044abdcb1215306ecfd5070d6e1a16e2d92d7
 2011-09-27 16:08:46 +09:00
Jeff Sharkey
28a345ac84 am dc2c5ae2: Merge "Data usage strings, sweep touches, fixes." 
* commit 'dc2c5ae2b0b123df1c2256672be9e2ec8bde248b':
  Data usage strings, sweep touches, fixes.
 2011-09-26 19:16:57 -07:00
Jeff Sharkey
dc2c5ae2b0 Merge "Data usage strings, sweep touches, fixes." 2011-09-26 15:31:57 -07:00
Danielle Millett
940407eb6a Changed header to specify backup lock 
-Changed main header to show backup lock text
-Reworded normal header
-Changed instances of FacePass to FaceLock

Change-Id: I66cbd3ada87df30b6b7ceb1a784d365ba60a8f41
 2011-09-26 18:06:37 -04:00
Eric Fischer
0e5fd21beb Import revised translations. DO NOT MERGE 
Change-Id: I287527c2b071e0babd191b47fc1b80c160232d74
 2011-09-26 14:51:07 -07:00