Commit Graph

410 Commits (e00b7c5f7bb4058a67487b6bec664d319cf25f08)

Author SHA1 Message Date
Eric Fischer 0dec431f18 Import initial translations for 20 new locales.
Change-Id: I7bd8f9596ebc2922c63717a63cef7cfdf68c919e
2010-11-17 16:43:50 -08:00
Eric Fischer 3a4d9b420f Import revised translations.
Change-Id: If29e9f29b1500c92989c1d224ebd4eaa69e3737a
2010-11-17 11:41:41 -08:00
Tadashi G. Takaoka 10227a71a0 Implement temporary upper case hint icon
This change partially implements the requested feature. The following
are not supported yet.
- Non-letter key handling on automatic temporary upper case layout.
- Non-letter key handling on shift chording in caps lock layout.
- Hint icons for manual temporary upper case layout are not final ones.

Bug: 3193390

Change-Id: I636da99d1be05b1337935d87c6f4d140661e1cc8
2010-11-16 13:45:49 -08:00
Tadashi G. Takaoka e3f0ca3848 Merge "Fix tablet url mode keyboard layout" 2010-11-15 23:45:48 -08:00
Tadashi G. Takaoka cf5e68b862 Fix tablet url mode keyboard layout
This is follow up change of I0d92e513757e765d9de98561205754af5a143650

Change-Id: Ibfe8835bb184636e5fb06473cc864852b573fbd4
2010-11-15 23:19:57 -08:00
satok 95175d488b Add an option for the userbility study mode
Change-Id: If41ddfa933f8ade58afa03acbd9536e0477baae8
2010-11-16 07:55:50 +09:00
satok 7599cfea4a Add showing suggestion only on portrait mode and fixing the state of suggestion strip
Change-Id: I7babd1400a3516c87506a3ea4bd46ddaf89e19b4
2010-11-16 07:30:08 +09:00
Tadashi G. Takaoka 6a567370ce Merge "Add more symbol characters to popup mini-keyboard" 2010-11-12 14:41:43 -08:00
Tadashi G. Takaoka b0465116bd Keyboard XML supports switch-case-default tags to select rows and keys
Change-Id: I0d92e513757e765d9de98561205754af5a143650
2010-11-12 14:30:25 -08:00
Tadashi G. Takaoka f12023c7fb Add more symbol characters to popup mini-keyboard
Bug: 3124752
Change-Id: I6b6f5bfd57a58db7273c4db461095413892552ae
2010-11-12 14:26:38 -08:00
Tadashi G. Takaoka 3e99aa0f71 Slightly shorten tablet keyboard height
Now key top height is slightly shorter 13.0mm compared to previous 14.0mm.

Bug: 3181068
Change-Id: Ib6f9cfb9269020166e5037467d18133d342d47ec
2010-11-10 15:03:46 -08:00
Tadashi G. Takaoka e302b19ddd New xlarge keyboard layout (v2)
Bug: 3109804
Change-Id: I1afd022d553785acd50b3104374bbec291206c1e
2010-11-09 11:07:48 +09:00
Tadashi G. Takaoka 59b7bd0730 Using distance to the edge of key as proximity detection
Because there may be very long key, such as space bar on tablet, we
should not use the distance between the touch point and the center of
key as proximity detection.  Instead of that, this change uses the
distance between the point and the nearest edge of key as proximity
detection.

Also this change fixes the bug that space key (code 32) was not
counted in proximity detection.

Bug: 3164020
Bug: 3168138
Change-Id: I687f1ce94a8e944c3f6eea0fe00e18ed6e68e278
2010-11-06 01:10:55 +09:00
Tadashi Takaoka 68864723cf Rename LatinKeyboardBaseView class to KeyboardBaseView
Change-Id: I496ecbfa7d398583d01f821398f49f75d17311d8
2010-11-05 18:36:19 +09:00
satok 38976d5b96 Add labels for subtypes
- Also changed mode name
- Move the position of a subtype for "US Keyboard" to the top

Change-Id: I4dd7f869801d5efa775fe8a89dde233215f508d9
2010-11-05 11:44:31 +09:00
Tadashi G. Takaoka 9d34f2c72e Merge "Add [CHAR LIMIT] to some strings for key top" 2010-11-04 03:09:09 -07:00
Tadashi G. Takaoka 03728d6d0f Add [CHAR LIMIT] to some strings for key top
Bug: 3147476
Change-Id: Ic3d898761b6953560dfec34813e96eddab351675
2010-11-04 17:22:30 +09:00
satok 5890ae11f1 Merge "Updated icons for the input method subtype" 2010-11-03 23:09:40 -07:00
satok 3b075346b1 Updated icons for the input method subtype
Change-Id: Ib92666357a6921cb7e068c63353b8b3d997c80b2
2010-11-02 23:11:42 +09:00
satok fe05848e50 Change the size of preview for priventing preview from being clipped
Change-Id: I6f9fb2c8c0e98ede14729e7cb602bfb4b2672159
2010-11-02 19:29:41 +09:00
satok 6936edbfcd Adjust the gap of keys on a tablet layout
Bug: 3155782

Change-Id: Icefe654874e58ee2fcbeab353690bfe15f54ab61
2010-11-02 15:06:37 +09:00
Ken Wakasa c1fe5bf19d Merge "Get rid of number hints on Stingray" 2010-10-29 04:17:24 -07:00
Ken Wakasa 89e841c85b Get rid of number hints on Stingray
bug: 3145786
Change-Id: Ifc2dcdb06d7a056b38ad574c65ef7fcbddcbb6aa
2010-10-29 20:14:10 +09:00
Ken Wakasa e6d171ab0b Add vertical correction for Stingray
bug: 3145773
Change-Id: I3ac1953b00367d3bf487a4186afe4150b039b05b
2010-10-29 20:01:26 +09:00
satok 74103ee1b9 Increased the size of GRID in Keyboard
Bug: 3122894

- Changed width 10 -> 32
- Changed height 5 -> 16

Change-Id: I07354cf5c942974cc25a5e043f41e0f13a09351b
2010-10-29 18:50:18 +09:00
Eric Fischer 566c45eddf Import revised translations.
Change-Id: If1dd926a84f861cdf8bbd24bad264a8a6facbde3
2010-10-27 14:37:12 -07:00
satok 832ebbec14 Merge "Update assets for LatinIME" 2010-10-26 20:31:45 -07:00
satok 3739770095 Update assets for LatinIME
Bug: 3109804

Change-Id: I07b5b0ff32228a6d10b92575f916b058e4ac26b7
2010-10-27 12:03:07 +09:00
Ken Wakasa 276845c7a9 Follow-up change to revise Caps Lock sequence.
bug: 3122877
Change-Id: I44c539d7c041443f3ad027de4b75a67adf6b2c87
2010-10-26 20:00:21 +09:00
satok e767595da5 Add an icon for US keyboard subtype
- TODO: add other icons

Change-Id: Ie958b9d59bb33bd6dbfc78a403bfda022bfaf790
2010-10-25 16:58:30 +09:00
Tadashi G. Takaoka 4189eb2308 Revise caps lock sequences
This change also fixes that the popup preview of ALT on symbol
keyboard is not showing.

Bug: 3122877
Bug: 3127255
Change-Id: I978cb30a0d05298274d8ab6541b91323a0fef211
2010-10-25 00:03:46 +09:00
Tadashi G. Takaoka 36af0880c3 Tablet keyboard should always show "?123" as symbol key
Bug: 3118554
Change-Id: Ib609799f28dee56a4ded2e8144ac4a0c0d113ad6
2010-10-22 23:59:21 +09:00
Tadashi G. Takaoka d0ed8ec933 Merge "Make mini-keyboard narrower on tablet landscape mode" 2010-10-22 03:34:59 -07:00
Tadashi G. Takaoka 1397cbab76 Make mini-keyboard narrower on tablet landscape mode
This change narrows mini-keyboard key width from 7.5% to 5.0%
of the screen width.

Bug: 3122769
Change-Id: I4ae0e79262ec3fadab8f86aa57a8a6cec5cb4670
2010-10-22 18:42:26 +09:00
Tadashi G. Takaoka 4f6060b8b7 Table keyboard should always show return icon on enter key
Bug: 3122750
Change-Id: I75d2b5adff3a349d29d8a56e7b761c26b04683c0
2010-10-22 18:27:59 +09:00
Tadashi G. Takaoka 503797ae0e Make "show settings key option" dependent to device configuration
Bug: 3095814
Change-Id: I73b8a5023b398621a910c953eade252dc6412923
2010-10-22 17:04:14 +09:00
Tadashi G. Takaoka d329795d91 Merge "Make common qwerty keyboard layout files and include these" 2010-10-20 22:43:45 -07:00
Ken Wakasa f5df46f0e0 Add ; to list of punctuation
bug: 3034792
Change-Id: I8e5f3907840fa2ddc2b5ac99328525313465ea35
2010-10-21 01:56:18 +09:00
Tadashi G. Takaoka c9bf5c005e Make common qwerty keyboard layout files and include these
Change-Id: I0cb8de748c4365e42d015078daf686ed76ca105b
2010-10-21 00:00:43 +09:00
Ken Wakasa e354a85ef4 Manual merge of the following Gingerbread changes logically
I8b38e280
Ia3929bb0
If925b546
I1062763d
I901e36aa

bug: 3100311
Change-Id: Ic7e01277ec816e77d34732599b2b9552668b81c2
2010-10-20 22:51:33 +09:00
Tadashi G. Takaoka 58bfa35072 Update xlarge drawable of Keyboard
Bug: 3109804
Change-Id: I316f9cfcec377a7d0ea1417e1e3cea55cbdb9e2b
2010-10-19 21:59:17 +09:00
Tadashi G. Takaoka cd7b7d3e8f Specify keyboard metrics with physical unit "inch"
Cherrypick I44f3b2eef8086d6e0b0db53d38f08487549060c6 from Gingerbread

This change also introduces the key background drawables which has no
fixed bottom padding.  Instead of relying on bottom padding in
drawable, this change also specifies Keyboard.verticalGap with
physical unit.  Other keyboard related length, distance and size are
also specified by physical unit.

Bug: 3066107
Change-Id: Ib38355ebfc2f8d5b1d26c4e90eba87196fbeddfa
2010-10-17 18:19:42 +09:00
Tadashi G. Takaoka 65100ff39c am c247df2d: am 0ccc4bfe: Merge "Reduce popup preview fading out animation duration to 70ms" into gingerbread
Merge commit 'c247df2d05932f36ca1ebbba34b57a92254f433e'

* commit 'c247df2d05932f36ca1ebbba34b57a92254f433e':
  Reduce popup preview fading out animation duration to 70ms
2010-10-16 09:13:20 -07:00
Tadashi G. Takaoka 1dac5d491f resolved conflicts for merge of ac777128 to master
Change-Id: Id01a741ca18ac64e31d2abfed5251a1e99d48391
2010-10-16 04:57:53 +09:00
Tadashi G. Takaoka 0ccc4bfe38 Merge "Reduce popup preview fading out animation duration to 70ms" into gingerbread 2010-10-15 02:27:02 -07:00
Tadashi G. Takaoka 62e3fafac6 Reduce popup preview fading out animation duration to 70ms
Bug: 3099331
Change-Id: I32c11bb25ebdb97af0c883c475d96fc8e2749101
2010-10-15 10:22:43 +09:00
Kenny Root 913730d6e7 Import revised translations
Change-Id: Iaf51da312caf84a58796714424fc8dd22df1f6d3
2010-10-14 09:46:48 -07:00
Ken Wakasa 179fa2c03e DO NOT MERGE. Add visual indicator that long press , or mic key will bring up Settings
bug:3084022
Change-Id: I8b38e2803eb32469653484701882af35108eb69a
2010-10-14 19:52:46 +09:00
Tadashi G. Takaoka 3d20d99902 Specify keyboard metrics with physical unit "inch" (DO NOT MERGE)
This change also introduces the key background drawables which has no
fixed bottom padding.  Instead of relying on bottom padding in
drawable, this change also specifies Keyboard.verticalGap with
physical unit.  Other keyboard related length, distance and size are
also specified by physical unit.

Bug: 3066107

Change-Id: I44f3b2eef8086d6e0b0db53d38f08487549060c6
2010-10-14 13:40:31 +09:00
Tadashi G. Takaoka 0963c781f2 Make some keys in phone keyboard to darker color
Bug: 3088257
Change-Id: I36b1a0f147c1087a98b91f00d60bf15922861f9c
2010-10-13 14:06:21 +09:00
Tadashi G. Takaoka 50a61083d3 Add text variation keyboard layout
Change-Id: I4c6df8197b734feb998da78478a4d9a41f6d92b2
2010-10-12 14:01:28 +09:00
Ken Wakasa 39004972b1 resolved conflicts for merge of fd64e47c to master
Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085
2010-10-12 03:15:36 +09:00
Kenny Root 6f6dd71862 resolved conflicts for merge of 23d50bfb to master
Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6
2010-10-10 15:19:53 -07:00
Ken Wakasa c2d7ac79bd Tweak key width for 'o'-popup chars.
We'll merge this to master for now, but we should have new attr (such as popupCharWidth) to handle this reasonably in the newly created BaseKeyboard class.

bug: 3082178
Change-Id: I024b946aafbbeb07b865a09f489dacb56f0478d0
2010-10-11 04:32:54 +09:00
Tadashi G. Takaoka 4ee2a56f07 Make keyboard vertical correction configurable
cherry-pick: I72c2448894a1084c582c2f1fb942b5fa8353f028

Before this change, the verticalCorrection value was defined by "dpi"
that is relative to device screen.  This change defines the
verticalCorrection by absolute unit "in".

Bug: 3066107
Change-Id: If71419dcfc18be3e5e87afea078fa15d3c31d908
2010-10-09 13:03:00 +09:00
Tadashi G. Takaoka 4d3a4dc211 Add phone keyboard layout
Change-Id: I97d146ef2756ffe5adb17fcbf04f5e91a0587aa5
2010-10-09 12:35:37 +09:00
Ken Wakasa ad289ae49b am 2fd1de46: am 47a9c3f3: Additional string update for LatinIME\'s re-correction preference item.
Merge commit '2fd1de46010c9c7836fcae94180d067c50677bab'

* commit '2fd1de46010c9c7836fcae94180d067c50677bab':
  Additional string update for LatinIME's re-correction preference item.
2010-10-08 14:36:47 -07:00
Ken Wakasa a7fda868d9 am 57108c2f: am 3425026d: Follow-up to Ia135eb92 . Shorten overflowed string.
Merge commit '57108c2f1c5b811a8b207ac53f4e3b4ef7ddcba4'

* commit '57108c2f1c5b811a8b207ac53f4e3b4ef7ddcba4':
  Follow-up to Ia135eb92 .  Shorten overflowed string.
2010-10-08 14:36:25 -07:00
Tadashi G. Takaoka cb0046288d Merge "Make keyboard vertical correction configurable (DO NOT MERGE)" into gingerbread 2010-10-08 03:23:53 -07:00
Tadashi G. Takaoka ff49b79dfb Make keyboard vertical correction configurable (DO NOT MERGE)
Before this change, the verticalCorrection value was defined by "dpi"
that is relative to device screen.  This change defines the
verticalCorrection by absolute unit "in".

Bug: 3066107
Change-Id: I72c2448894a1084c582c2f1fb942b5fa8353f028
2010-10-08 19:15:54 +09:00
Tadashi G. Takaoka 5e02930a7f Reduce delay before mini popup keyboard is shown
Before this change, the delay was 500 ms that came from
ViewConfiguration.getLongPressTimeout().  This change reduces the
delay to 400 ms.

Bug: 3074984
Change-Id: Ia5af5e877a3c4bb29211ef4040c728ac09a9fe85
2010-10-08 19:05:16 +09:00
Tadashi G. Takaoka ff4d21bd29 Share 4th row of non-xlarge qwerty keyboard using <include>
Change-Id: Iff337e1c6ef3a17fd96a5e5f1c3c4a21190aac1c
2010-10-08 01:24:28 +09:00
Tadashi G. Takaoka d663555c9f Keyboard XML file supports include and merge tag
Keyboard XML file can include other keyboard XML file using directive
<include keyboardLayout="@xml/...">.  The keyboard XML file which is
included must have <merge> tag as root element.

Change-Id: I06c35fe7b3db5232acdb33f73a79f38d31261b32
2010-10-07 23:51:38 +09:00
Eric Fischer e13a301328 Import revised translations. DO NOT MERGE
Change-Id: Icf8fa9146cc4cbfb70d5069be5359d04c5ec2432
2010-10-06 17:15:27 -07:00
Roy West 4d9add5482 am 2501d736: am 47383758: Fix bug 3063598, change "tap" to "touch" thrice.
Merge commit '2501d7363c3fec777956dd57a558c8bfe75e002c'

* commit '2501d7363c3fec777956dd57a558c8bfe75e002c':
  Fix bug 3063598, change "tap" to "touch" thrice.
2010-10-06 17:09:06 -07:00
Ken Wakasa 47a9c3f3d9 Additional string update for LatinIME's re-correction preference item.
Follow-up to I703054c9

bug: 3063598

Change-Id: Ic9d752b8588a620b3e256fe38f3a6a0c9c093053
2010-10-07 01:02:06 +09:00
Ken Wakasa 3425026d51 Follow-up to Ia135eb92 . Shorten overflowed string.
bug: 3063598
Change-Id: I703054c930590ef62579183731935ec3362406cd
2010-10-06 17:40:40 +09:00
Roy West 47383758fc Fix bug 3063598, change "tap" to "touch" thrice.
Change-Id: Ia135eb926a5f2896a480cd478d40925d46041d42
2010-10-05 06:39:15 -07:00
Tadashi G. Takaoka 66e306d01c Add keyHintIcon attribute to BaseKeyboard.Key class
This keyHintIcon attribute is used to specify hint icon drawable at
top right corner of Key.

Change-Id: Icaa91e63c4473b2513396bd3fbeb8ed6fd73586c
2010-10-05 20:28:04 +09:00
Mitsuhiro Shimoda b1abda8d62 Add an auto complete's threshold option.
Change-Id: I3a6821ced8642ab8f954e79a25e31766e4a18eb8
2010-10-05 14:44:00 +09:00
satok 4fc510a789 Unbundle Keyboard.java to BaseKeyboard.java
Change-Id: I8b310c2c0cae1a151e53c22001c586697346982c
2010-10-02 00:02:00 +09:00
Tadashi G. Takaoka 932a1b756d am c0fc4bf9: am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings
Merge commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99'

* commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99':
  Long press mic/comma key bring mini keyboard with settings
2010-10-01 04:04:38 -07:00
Tadashi G. Takaoka 8e1f1be0f3 Long press mic/comma key bring mini keyboard with settings
Bug: 3050703

Change-Id: I090b2bfebfb48e5ec461615d4c911024ea6d130a
2010-10-01 19:27:37 +09:00
satok d778ff20e7 am bd677880: am 88a04563: Make the background of keypopup transparent
Merge commit 'bd677880494f30d58913f1bac612a32410e6465b'

* commit 'bd677880494f30d58913f1bac612a32410e6465b':
  Make the background of keypopup transparent
2010-10-01 02:29:58 -07:00
satok 88a045637a Make the background of keypopup transparent
Change-Id: I5240ffdd8e48bcb99c2edf878d8efaba2cafeb07
2010-10-01 18:08:38 +09:00
Ken Wakasa 3d9d2b1b3c am 7ed6b88c: am a0a60b37: Revert changes to keyboard_popup.xml for now.
Merge commit '7ed6b88cf6f090512953e3665e4ff5072c98560b'

* commit '7ed6b88cf6f090512953e3665e4ff5072c98560b':
  Revert changes to keyboard_popup.xml for now.
2010-09-30 19:48:16 -07:00
Ken Wakasa a0a60b37b2 Revert changes to keyboard_popup.xml for now.
This unexpectedly bloated keys in mini popup keyboard.

bug: 3048638
Change-Id: I2b717c9007ce7717bac514f1d8bcae1280130cf4
2010-10-01 09:46:04 +09:00
Tadashi G. Takaoka c29d565428 am 105f7c36: am 3297ee80: Merge "Long pressing mic/comma key will show settings menue" into gingerbread
Merge commit '105f7c36b7fa1845b9edbf47ca55b4a6660303b6'

* commit '105f7c36b7fa1845b9edbf47ca55b4a6660303b6':
  Long pressing mic/comma key will show settings menue
2010-09-30 13:37:40 -07:00
satok 41ffeb88ca am b97d1777: am 36f97dd6: Fixed assets - Make the background of popup key a full transparent color - Updated the background mdpi asset of keyboard
Merge commit 'b97d17777ef2d8550770a48c84e51e4548820812'

* commit 'b97d17777ef2d8550770a48c84e51e4548820812':
  Fixed assets
2010-09-30 13:37:35 -07:00
Tadashi G. Takaoka 3297ee80f0 Merge "Long pressing mic/comma key will show settings menue" into gingerbread 2010-09-30 04:57:40 -07:00
Tadashi G. Takaoka a1cc4f0a8d Long pressing mic/comma key will show settings menue
Bug: 3050703
Change-Id: I62773c10f435d13174f6ff6574912cb99303e83c
2010-09-30 20:18:10 +09:00
satok 36f97dd689 Fixed assets
- Make the background of popup key a full transparent color
- Updated the background mdpi asset of keyboard

Bug: 2975027
Bug: 3048638

Change-Id: I8709a1ca403e5c3f862a8be9be1668d30c7687f8
2010-09-30 17:54:21 +09:00
Tadashi G. Takaoka 8bae0829d2 resolved conflicts for merge of ab1348e8 to master
Change-Id: Ica94a5f9ac4feae477297f14fc1bc21d02efb6a4
2010-09-30 09:01:04 +09:00
Tadashi G. Takaoka 179ada958b Refactor CandidateView touch event handling
This change also fixes tha the touch slop value is applyed only for
initial movement of scrolling suggestion bar.

Bug: 3004920
Change-Id: I62afdedc210156e41e8c84c48cade442f9d5a1aa
2010-09-29 19:45:03 +09:00
Tadashi G. Takaoka f48637a5b2 resolved conflicts for merge of 0325360d to master
Change-Id: I5926c8d75dbffda20001fa9487fae2e5f723c755
2010-09-29 13:51:06 +09:00
Tadashi G. Takaoka 46941882b2 Tune mini keyboard vertical correction to match with key height
Bug: 3040529
Change-Id: I8e3cc635737224537a019e66c38e1e2ea7a8bb8b
2010-09-29 12:23:57 +09:00
satok ed85235bee am ad090ac3: am 008e9b3e: Fix Null pointer exception on closing and update assets
Merge commit 'ad090ac3f4cee327adf74e8b35bbc446a8d64070'

* commit 'ad090ac3f4cee327adf74e8b35bbc446a8d64070':
  Fix Null pointer exception on closing and update assets
2010-09-28 12:48:46 -07:00
satok 008e9b3e1a Fix Null pointer exception on closing and update assets
Change-Id: I30fdac74685beae06b5c61140452b26b29ae4c39
2010-09-28 16:52:54 +09:00
Tadashi G. Takaoka 2b4cc0db61 Fix xlarge min-keyboard layout
Change-Id: Ia4d6cffa0c6cf710da577b75f6337836352959a0
2010-09-28 16:12:51 +09:00
Tadashi G. Takaoka b514d3f1f8 Fix wrong keyEdgeFlags in xlarge keyboard layouts
Bug: 3040988
Change-Id: Ibcac874a96ed0bf35350b50a5dd862a8d03c8354
2010-09-28 15:14:47 +09:00
Amith Yamasani 71ed85bce8 Fix the non-working period key in the tablet layout.
One of the edge flags was wrong.
2010-09-27 15:12:01 -07:00
Eric Fischer e07bc39a3b Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 12:27:43 -07:00
Eric Fischer 2245c3a5a9 Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: Ie380334bc725aa55beb8ec084d1ade881a50812c
2010-09-27 12:22:28 -07:00
Tadashi G. Takaoka dc7097b4e7 Merge "Add xlarge keyboard layouts (tentative)" 2010-09-27 08:39:12 -07:00
Tadashi G. Takaoka b1fcbec730 Add xlarge keyboard layouts (tentative)
This keyboard layout is tentative for UX study.

This change added xlarge keyboard layouts only for "regular text",
"symbol/number mode" and "symbol/number mode shifted".

TODO other text mode variants should have dedicated layout.

Change-Id: I36077efcec4b57c3b5cada0a851e1409a289eeb9
2010-09-28 00:17:53 +09:00
satok a48d298d10 resolved conflicts for merge of b9c0ed59 to master
Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d
2010-09-27 15:33:24 +09:00
satok 3a2b90357c Merge "Add Debug Settings Activity" into gingerbread 2010-09-26 22:15:57 -07:00
satok bf96661d33 Add Debug Settings Activity
Bug:3033472

Change-Id: I311c66ac3c612a30d7da3be8ee35a352f49016ac
2010-09-27 14:07:10 +09:00
Eric Fischer 30dd9b5d48 Import revised translations.
Change-Id: I38532015c089c0a5c6c1b98fe44f282918aebe5e
2010-09-24 12:28:30 -07:00
Eric Fischer 89711080dc Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-24 10:39:07 -07:00