Commit Graph

2053 Commits

Author SHA1 Message Date
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
Kenny Root
2ee896a519 am 3f1fb4f1: Merge "Make verifier device id information visible"
* commit '3f1fb4f1549c3ff32cd85e85bbe13765a02d6960':
  Make verifier device id information visible
2011-09-26 14:39:26 -07:00
Kenny Root
498fbe470e Make verifier device id information visible
This makes the verifier device identifier information for this
particular device visible in the "Development" screen of
Settings.

Bug: 5205163
Change-Id: I55e0b32fe98f898e6e8d723ce6696529fdccffd0
2011-09-26 09:55:03 -07:00
Jeff Sharkey
461842a8c0 Data usage strings, sweep touches, fixes.
Change strings around limiting background data.  Move limit/warning
sweeps above inspection sweeps, and teach about additional neighbors
on different axis.

Guard against DialogFragment.show(), fix pie chart to draw edges, and
remove data usage from battery UI.

Bug: 5341374, 5337650, 5337385, 5319465, 5236335
Change-Id: Iea8c2a2ab405b645d85abe34a0178d4b8874cdd5
2011-09-25 18:41:13 -07:00
Wink Saville
1ec34bfedd am bde64e3d: am 426fc66a: Add persist.radio.ramdump.
* commit 'bde64e3d93b0144cd8b7c0ff65103ffb63fddba7':
  Add persist.radio.ramdump.
2011-09-25 15:27:11 -07:00
Wink Saville
bde64e3d93 am 426fc66a: Add persist.radio.ramdump.
* commit '426fc66a8a9371e34d936d18d5b254fd002b4c11':
  Add persist.radio.ramdump.
2011-09-25 15:25:39 -07:00
Wink Saville
426fc66a8a Add persist.radio.ramdump.
A little refactoring to keep most everything for these "temporary"
flags in one place.

Bug: 5348373
Change-Id: I257aac616ae635e6f9d9dffd692357b4c08037e2
2011-09-25 14:39:02 -07:00
Eric Fischer
86b49eea5e Import revised translations. DO NOT MERGE
Change-Id: Iebee5d29b6baa4e479a03ae7058e891f852968f6
2011-09-23 15:28:41 -07:00
Wink Saville
310b39fffa am 9fe945b8: am fbea38fd: Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
* commit '9fe945b854f92314ad387705ad20a129e46c317a':
  Add a button to enable/disable Mobile Terminated SMS over IMS
2011-09-22 23:42:46 -07:00
Wink Saville
9fe945b854 am fbea38fd: Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
* commit 'fbea38fd2b458b59b0f2a7affa158b486cdc1df5':
  Add a button to enable/disable Mobile Terminated SMS over IMS
2011-09-22 23:39:35 -07:00
Amith Yamasani
2e56b15ae7 am 16a9b14f: Merge "Don\'t append list of accounts every time we return to this screen."
* commit '16a9b14fa748c742c62f621586244303da4f4d8e':
  Don't append list of accounts every time we return to this screen.
2011-09-22 17:05:41 -07:00
Wink Saville
fbea38fd2b Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom 2011-09-22 15:29:19 -07:00
Wink Saville
382a75b105 Add a button to enable/disable Mobile Terminated SMS over IMS
This toggles persist.radio.imsallowmtsms between 0/1 which can
be used during testing and bring up of SMS over IMS.

Change-Id: I4581bca76899445e825260e8af6a39903d029c44
2011-09-22 15:17:00 -07:00
Amith Yamasani
3f45de559f Don't append list of accounts every time we return to this screen.
Bug: 5355920

Remove the contents of the layout before adding the accounts.

Change-Id: Ic9256140f892968b2388f47d982eaada720df892
2011-09-22 14:34:17 -07:00
Jeff Hamilton
041a34075c am 4cfe1055: am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom
* commit '4cfe105506035f151242080e0ac7bd205542a2d9':
  Bring back the Android Beam settings panel.
2011-09-22 10:49:53 -07:00
Jeff Hamilton
4cfe105506 am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom
* commit '0d299625ebadae3d8b0881979633680e16b07daa':
  Bring back the Android Beam settings panel.
2011-09-22 10:48:20 -07:00
Jeff Hamilton
0d299625eb Merge "Bring back the Android Beam settings panel." into ics-factoryrom 2011-09-22 10:47:03 -07:00
Jeff Hamilton
8ccddfd8d4 am a1b6fdf4: am 4a2aabc4: Merge "Add strings for translation." into ics-factoryrom
* commit 'a1b6fdf4738e0d0aec4eb389316a7c354fe37c00':
  Add strings for translation.
2011-09-22 10:43:03 -07:00
Jeff Hamilton
a1b6fdf473 am 4a2aabc4: Merge "Add strings for translation." into ics-factoryrom
* commit '4a2aabc4d739ded949daa721adfce55fed2be2b6':
  Add strings for translation.
2011-09-22 10:41:34 -07:00
Jeff Hamilton
4a2aabc4d7 Merge "Add strings for translation." into ics-factoryrom 2011-09-22 10:40:23 -07:00
Jeff Hamilton
3d670de5ce Bring back the Android Beam settings panel.
Bug: 5350022
Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
2011-09-22 12:35:55 -05:00