e8f68d2295
am 14c0e4e7: am 499cea94: Use revised Google Keyboard icon
...
* commit '14c0e4e782f45d51082e8822b4520f7805a5ec80':
Use revised Google Keyboard icon
2013-05-15 12:47:03 -07:00
bd2aca0b77
am c6143574: am 5b8b76ba: Merge "Move gesture preview trail parameters to resource"
...
* commit 'c614357468c496db420c7b1d0a8a119f86620f8a':
Move gesture preview trail parameters to resource
2013-05-15 12:46:56 -07:00
55b98d2549
am 7b6b30df: am 9d71a6c9: Remove unused device form factor values
...
* commit '7b6b30dffcf027f50198f9588eaa4918b4e1cda2':
Remove unused device form factor values
2013-05-15 12:46:39 -07:00
a8fb8b4bb4
am e351e10a: Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit 'e351e10a68ad6e934ee3cfdd6456f9474d76facb':
Import translations. DO NOT MERGE
2013-05-15 12:29:35 -07:00
6b93b185ef
am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"
...
* commit '3eee5cd24b259109b9b2122026a494a050a540e9':
Fix a layout problem for pre-MR2
2013-05-15 12:23:55 -07:00
c363302eb7
Merge commit '3ac40c6a' into jb-mr2-dev-plus-aosp
...
Conflicts:
java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
Conflict resolved by matching code with jb-mr2-dev.
2013-05-15 11:40:41 -07:00
03fe0cf4dd
am 3b892164: am 7b2114a4: Display still image when device can\'t play welcome video
...
* commit '3b8921646fb51b9bb91108cfc103a5feccbbbbe9':
Display still image when device can't play welcome video
2013-05-15 11:25:56 -07:00
24fc5ab65f
am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video"
...
* commit 'f4a03ddcf85a546a7ed9eb59840fd81e4c014de9':
Catch error while playing welcome video
2013-05-15 11:19:36 -07:00
9db1f6d9c6
am d618419d: am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar"
...
* commit 'd618419d16865f9cc54ec893873bab514b321815':
[PB14] Cosmetic fixes to the progress bar
2013-05-15 11:19:35 -07:00
fa47814ca3
am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary"
...
* commit 'f4d7c99cda24fb5747843a47cd8a4423c315f685':
Fix the title of the fragment of the personal dictionary
2013-05-15 11:19:28 -07:00
58434ae636
am 3bcc7545: am 965329c1: Fix missing string reference of spellchecker.xml
...
* commit '3bcc75456fc01327e8358468131e8daf6095da98':
Fix missing string reference of spellchecker.xml
2013-05-15 11:19:00 -07:00
4779ea605a
am 88f3e4ef: am fc26033c: [PB11] Add a skeleton class for a self-updating progress bar
...
* commit '88f3e4efd49a0d39b01e37310ebaba2c4b40a040':
[PB11] Add a skeleton class for a self-updating progress bar
2013-05-15 11:05:23 -07:00
e486427650
am eb34f710: am ab0c66b9: [PB10] Add a progress bar to display file download progress
...
* commit 'eb34f71088215b7c6514b5f4150057c33f2069d3':
[PB10] Add a progress bar to display file download progress
2013-05-15 11:05:22 -07:00
33ccdd1cda
am b312f4a8: am ae577ac1: Merge "Update dictionaries"
...
* commit 'b312f4a8f78f423c5507785f5fbf79d6c786e5bc':
Update dictionaries
2013-05-15 11:05:20 -07:00
95abe990e3
am faa0c350: am be06bce1: Merge "Get rid of janky black box before the movie starts"
...
* commit 'faa0c3506f012f3a73893f7f0c337bbef9ee4c42':
Get rid of janky black box before the movie starts
2013-05-15 11:05:15 -07:00
926abffaaa
am 42abed7f: am 9a98ef69: Merge "[ZF3] Add the option to block potentially offensive words"
...
* commit '42abed7ff30b4ad4c04407a81db8de86244b1d80':
[ZF3] Add the option to block potentially offensive words
2013-05-15 11:05:06 -07:00
3160671bc1
am 330072b0: am c03aaa1b: Merge "[ZF2] Read settings for profanity filtering."
...
* commit '330072b0146ffe148417d43ee0842c1238b6923d':
[ZF2] Read settings for profanity filtering.
2013-05-15 11:05:03 -07:00
4746093c3c
am a9b0c4fb: am 1ff8b1ce: Merge "Update dictionaries"
...
* commit 'a9b0c4fb9d0247ccdc92984de2d972136a8d34bb':
Update dictionaries
2013-05-15 11:05:01 -07:00
685b65580b
am 75a6a525: am adbafa1a: Merge "Support ICS on the user dictionary settings"
...
* commit '75a6a525e9a34befd931fe666ee761625e6ead99':
Support ICS on the user dictionary settings
2013-05-15 11:04:59 -07:00
e681b52822
am 7a2fbbb3: am 4bb312c7: Merge "Add strings-appname.xml to AOSP Android Keyboard project"
...
* commit '7a2fbbb3e6c807340be95807fbd70042466a5426':
Add strings-appname.xml to AOSP Android Keyboard project
2013-05-15 11:04:58 -07:00
037be7fa0a
am 3385fe8f: am 9fc82bdb: Merge "Remove graying animation of alt-code keys while typing"
...
* commit '3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32':
Remove graying animation of alt-code keys while typing
2013-05-15 11:04:55 -07:00
511432b23c
am ba4677fe: am df3ca042: Fix deleting a dictionary
...
* commit 'ba4677fe0b47aa17ac2a5856d9e71c83eaa71c40':
Fix deleting a dictionary
2013-05-15 11:04:52 -07:00
b7853edee0
am 13a2e1b2: am 4dc77dcf: Merge "[PB7] Export animation code out of the preference"
...
* commit '13a2e1b245c56812fd91099b4fe91a6111a14c0f':
[PB7] Export animation code out of the preference
2013-05-15 11:04:44 -07:00
56ec8d6a02
am 36de7a5e: am 30f0f3a9: Merge "Implement a functionality to add an entry to the user dictionary"
...
* commit '36de7a5ea32ef6738a2923581e0b14a00b8a6808':
Implement a functionality to add an entry to the user dictionary
2013-05-15 11:04:41 -07:00
2037d6e41d
am 7e22f2e3: am 2cf450f4: [PB6] Encapsulate the buttons into a view
...
* commit '7e22f2e374425f5676fb9eac4bfb97e211d0d487':
[PB6] Encapsulate the buttons into a view
2013-05-15 11:04:40 -07:00
b713600a52
am fd4baafe: am 46913aed: Merge "Add next axction to setup wizard"
...
* commit 'fd4baafe710dc0fe843c7672a6bd8bee4244fd73':
Add next axction to setup wizard
2013-05-15 10:58:58 -07:00
dfa5d2d799
am 38df0ed2: am b40a8c06: Merge "Tune setup wizard layout for landscape and tablet"
...
* commit '38df0ed22b232d77119c709ee0e7a863c7f756b6':
Tune setup wizard layout for landscape and tablet
2013-05-15 10:58:57 -07:00
96d5e29166
am 6448f749: am b35aa487: Merge "Make aggressive threshold really aggressive"
...
* commit '6448f749154a723b85d4309a37ad8fda2e1434e3':
Make aggressive threshold really aggressive
2013-05-15 10:58:55 -07:00
b689e6615b
am 9ff6a6bf: am 3ee39be1: Merge "Add setup wizard indicator size resource"
...
* commit '9ff6a6bf739e250f2ad7e868c2be55567c23fb7b':
Add setup wizard indicator size resource
2013-05-15 10:58:50 -07:00
230068e2cd
am 5cd83c93: am 9a289c08: Merge "Use resources for dimensions of setup wizard"
...
* commit '5cd83c9341c04c63de136b0e1e8b581e88704075':
Use resources for dimensions of setup wizard
2013-05-15 10:58:45 -07:00
d66e4c4515
am 0bc46dca: am 4b7e0c5a: Merge "Remove wording "wizard" from setup application"
...
* commit '0bc46dca2cea2b15e1647533f81ea0ea992a41b4':
Remove wording "wizard" from setup application
2013-05-15 10:58:41 -07:00
85e8dca43e
am dc079451: am 480284e2: Merge "Add edit personal dictionary settings menu"
...
* commit 'dc079451fc5bb10548d0d78c8db5e060e9a2f000':
Add edit personal dictionary settings menu
2013-05-15 10:58:40 -07:00
874c4fda36
am 434abe45: am 9b4e3db1: Legal notice
...
* commit '434abe450c8fd65789b6f8b04d62ad98287115dd':
Legal notice
2013-05-15 10:53:02 -07:00
962c245c00
am 6bbe6858: am 0f07935e: Centering setup wizard welcome video
...
* commit '6bbe68589318a808c0eade6a62ffb0986a894ae0':
Centering setup wizard welcome video
2013-05-15 10:52:54 -07:00
56c6c336b2
am ab11dbe8: am b8ff89c8: Remove translatable="false" from setup wizard strings
...
* commit 'ab11dbe8f3fbc7b55b251d69e3846cab24811903':
Remove translatable="false" from setup wizard strings
2013-05-15 10:52:46 -07:00
67f3a10225
am c35e0e6a: am 42afa82d: Support landscape orientation for setup wizard
...
* commit 'c35e0e6a4b73f854fef07165c4f0bdd448f5bed5':
Support landscape orientation for setup wizard
2013-05-15 10:52:44 -07:00
e84697326f
am b3663df5: am 68e4de1e: Add welcome screen to setup wizard
...
* commit 'b3663df58238cc8e95e9b412964f6e8f43465d70':
Add welcome screen to setup wizard
2013-05-15 10:52:43 -07:00
b2f8f66f28
am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screen
...
* commit 'baa1e14da10fd1ab31780f08ffeb4f186124fc41':
Groundwork to implement landscape and welcome screen
2013-05-15 10:52:41 -07:00
680fa7ba77
am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard"
...
* commit '82a7b185bb8a14e610950548d36fae7a06030236':
Add finish action to setup wizard
2013-05-15 10:52:40 -07:00
8f9a8734d5
am fc2ca29d: am f10046bd: Remove ScrollView from setup wizard
...
* commit 'fc2ca29d71ef85a93170a7c5f2d61c084a694bb2':
Remove ScrollView from setup wizard
2013-05-15 10:52:35 -07:00
448b28beff
am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files
...
* commit 'ed0d1156f7c95666b22e10284d8f985a5e83f283':
Move some attributes of setup wizard layouts to style files
2013-05-15 10:52:33 -07:00
64510ad979
am ae19f170: am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated"
...
* commit 'ae19f170ba511d0bcb7632682b8f9ac45a91ece7':
Make setup wizard step number highlighted when activated
2013-05-15 10:52:32 -07:00
8b085e7f87
am 7158438a: am 88ee052c: Merge "Update strings of setup wizard"
...
* commit '7158438a64d3f224590c484c989251d82b7fb5fa':
Update strings of setup wizard
2013-05-15 10:52:30 -07:00
52e0b3d1b8
am 0e64fbbc: am 9cf46864: Update dictionaries
...
* commit '0e64fbbcac7116c410143796937e4e5ef1238c83':
Update dictionaries
2013-05-15 10:46:54 -07:00
a06fdaadae
am 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons"
...
* commit '64e87b3e660199b5dd7539fe413146e4dfbf977f':
Update setup wizard icons
2013-05-15 10:46:52 -07:00
af0d283bc4
am 4e12347e: am 931e2530: (-s ours) am 37ac3b3a: am a559e767: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '4e12347e0313279d13a267bd827c025949447743':
2013-05-15 10:42:18 -07:00
0474d725b4
am e85e3c64: am 46420204: Add user feedback to setup action labels and icons
...
* commit 'e85e3c64767552461debc0b1989f09033f7e3054':
Add user feedback to setup action labels and icons
2013-05-15 10:36:18 -07:00
76cc6abc3a
am 0206339a: am 47a78aeb: Merge "Finalize setup wizard strings and mark as translatable"
...
* commit '0206339a2664d1cb05fff3ff20352cf04871bef1':
Finalize setup wizard strings and mark as translatable
2013-05-15 10:36:16 -07:00
d59c1f8324
am 50259c70: Merge "Tune layout parameters of setup wizard"
...
* commit '50259c70d7754569a7b552cfc6ef8a034b5b0d40':
Tune layout parameters of setup wizard
2013-05-15 07:58:05 -07:00
7d9bd6f54e
am 66b87269: Update welcome fallback image (using xhdpi asset)
...
* commit '66b87269e16a0ed4b13a58bca5dd3a41318ad241':
Update welcome fallback image (using xhdpi asset)
2013-05-15 07:57:51 -07:00
7fe675440e
am 769427cf: Adjust aspect ratio of setup image
...
* commit '769427cff24944958f5f1f6179090a86444f3eab':
Adjust aspect ratio of setup image
2013-05-15 07:57:38 -07:00
50259c70d7
Merge "Tune layout parameters of setup wizard"
2013-05-15 10:13:24 +00:00
66b87269e1
Update welcome fallback image (using xhdpi asset)
...
Bug: 8159728
Change-Id: Ifd7339c7db305de424109b6adb126b354028b3aa
2013-05-15 18:36:13 +09:00
86ee98dd55
Revert "Update welcome fallback image"
...
This reverts commit c1ff8d7d3f
2013-05-15 18:32:03 +09:00
786bc9d46f
Tune layout parameters of setup wizard
...
Bug: 8159728
Change-Id: Ifb08b62e11008ad56715a07825c0fbc719130ebd
2013-05-15 17:49:56 +09:00
769427cff2
Adjust aspect ratio of setup image
...
Bug: 8159728
Change-Id: I578014912fa63c4c9b4c2c89aeae7ffec836b06c
2013-05-15 14:48:27 +09:00
c1ff8d7d3f
Update welcome fallback image
...
Bug: 8159728
Change-Id: I0306efe99aa8db97ec6a1888240f0538480ebea5
2013-05-15 10:41:08 +09:00
8b56ad7814
Merge "Revise welcome screen video and still image"
2013-05-14 12:01:47 +00:00
7348d9fb72
Revise welcome screen video and still image
...
Bug: 8159728
Change-Id: Ief8d7197879d24ccef529e975c23d6f11c7aa458
2013-05-14 20:56:09 +09:00
5a6827dbff
Adjust sampling interval for gesture stroke drawing a bit.
...
bug: 7167303
Change-Id: I45ca9d31cf4f8492dde367f997d8e36f4a07cffe
2013-05-14 20:53:12 +09:00
e69066d11b
Import translations. DO NOT MERGE
...
Change-Id: I9b70a81c1f507e5e9a2bfdcb179dea1cc03e0517
Auto-generated-cl: translation import
2013-05-13 11:35:25 -07:00
b121538e0c
Tune maximum keypress duration to 100 milliseconds
...
Bug: 8556975
Change-Id: If7839c5764f7a269243a9570c0b7782b6f7ee73b
2013-05-13 20:04:59 +09:00
567a759b7b
Fix keypress vibration duration of HTC One X
...
Bug: 8556975
Change-Id: I793dd90223f4da091a212ff54a02d19f03e49d6c
2013-05-13 19:49:47 +09:00
b5f67e7faf
Add device specific keypress vibration duration database
...
Bug: 8556975
Change-Id: I11260a64dc13c102bac7a9742dc66f2b05fd32de
2013-05-13 18:34:48 +09:00
0efd8d1b69
Fix landscape override value expression
...
This is a follow up of I275c99db8a.
Bug: 8556975
Change-Id: Ia6c2ab878760523da767036ce0bfc6c8350e1a92
2013-05-13 18:19:20 +09:00
ec83457d72
Merge "Support multiple condition for getDeviceOverrideValue"
2013-05-13 06:13:20 +00:00
d69fa0a09a
Support multiple condition for getDeviceOverrideValue
...
Bug: 8556975
Change-Id: I29d3a305b6ac3d8e3620c6d8592d85047d62bf48
2013-05-13 14:38:21 +09:00
cb3bba3c4e
Rename GesturePreviewTrail.java -> GestureTrail.java
...
Try reducing some confusions between GesturePreviewTrail.java and GestureTrailsPreview.java
Change-Id: I5fe2ee740cf1b32210530188153f6f6937e34b68
2013-05-13 13:42:22 +09:00
565ced4546
Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
2013-05-10 09:49:07 +00:00
6d3d2ae064
Refactor StringUtils.findPrefixedString to findValueOfKey
...
Bug: 8556975
Change-Id: I275c99db8a0d10594a5a8c0c27ebc1a87495c307
2013-05-10 18:44:04 +09:00
4705c0fa7c
Fix screen flash when launching settings activity
...
Bug: 8336068
Change-Id: I90a0f259129a3f3319b158b060154cc43960c234
2013-05-10 15:36:24 +09:00
ba35426f01
Merge "Tweak a label in the personal dictionary settings"
2013-05-10 03:27:51 +00:00
4c6a5c0428
Tweak a label in the personal dictionary settings
...
Bug: 8897600
Change-Id: Ibf245e32468e5740ad9d65b8ff1f1e87b430d287
2013-05-10 12:14:22 +09:00
8dafc8e834
am 22e6a5c5: Import translations. DO NOT MERGE
...
* commit '22e6a5c5b4c3fb486fd2605255081fc4b849f415':
Import translations. DO NOT MERGE
2013-05-09 08:52:51 -07:00
42dc0c2562
Merge "Import translations. DO NOT MERGE"
2013-05-09 15:52:00 +00:00
499cea949d
Use revised Google Keyboard icon
...
Bug: 8159728
Change-Id: I458df60cb39f81cde3c08190af0ab08d304f9d98
2013-05-09 11:50:39 +09:00
2e4bde7398
Import translations. DO NOT MERGE
...
Change-Id: I77a0aed9771ecc28a56226bb5f9776c1e1cf8b4d
Auto-generated-cl: translation import
2013-05-08 13:18:34 -07:00
22e6a5c5b4
Import translations. DO NOT MERGE
...
Change-Id: I189a4ad23e69f0abe515dad7e3c909a28fcfbf0b
Auto-generated-cl: translation import
2013-05-08 13:09:53 -07:00
05124d0193
Move gesture preview trail parameters to resource
...
Bug: 7167303
Change-Id: I22b56588dc5a1c9d5eaec3a39b5f32c9e5a8a5b4
2013-05-08 17:51:45 +09:00
9d71a6c968
Remove unused device form factor values
...
Change-Id: I1ed88b842a3d45e5460dd387bfad4276c844096a
2013-05-07 18:52:22 +09:00
71778d2551
am 34a0dc5a: Import translations. DO NOT MERGE
...
* commit '34a0dc5abe47b28b7ef681b30aa5c94349b57e0d':
Import translations. DO NOT MERGE
2013-05-06 14:03:12 -07:00
580d4e9950
Import translations. DO NOT MERGE
...
Change-Id: I066a2af59e34e18a530af0f3977c4aecab350ef8
Auto-generated-cl: translation import
2013-05-06 13:47:37 -07:00
34a0dc5abe
Import translations. DO NOT MERGE
...
Change-Id: I2e89e3da74724731dc26f081c9d468200e90b31e
Auto-generated-cl: translation import
2013-05-06 13:39:54 -07:00
a8478986d4
am b55b15c3: Import translations. DO NOT MERGE
...
* commit 'b55b15c3bd920842720dd97ffa33bb45f5e6e0cd':
Import translations. DO NOT MERGE
2013-05-06 11:11:37 -07:00
dd8197bcb2
Import translations. DO NOT MERGE
...
Change-Id: I838674303010d6bff9e3a6f747fd265d1c82baac
Auto-generated-cl: translation import
2013-05-03 16:52:20 -07:00
b55b15c3bd
Import translations. DO NOT MERGE
...
Change-Id: I5c8c885e2971d73ffa5a8ac45dd39dd836c935c8
Auto-generated-cl: translation import
2013-05-03 16:44:22 -07:00
f9a4732e3b
am f7e4057f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'f7e4057f22c5226c0a11b0aec2e30c387ab9f285':
Import translations. DO NOT MERGE
2013-05-01 20:45:38 -07:00
5c3c9ca6e6
Import translations. DO NOT MERGE
...
Change-Id: Ie0357e3c5e84878d7ae8f57fcf02220fb22badda
Auto-generated-cl: translation import
2013-05-01 20:43:38 -07:00
3985e632ad
Import translations. DO NOT MERGE
...
Change-Id: I3f66d23846516560e3a1e316cf56dc7a17dfe9e2
Auto-generated-cl: translation import
2013-05-01 14:35:47 -07:00
cd6806d2d9
Import translations. DO NOT MERGE
...
Change-Id: I840f5e7a7f140fbf5ccf27371077b2d8c86506c2
Auto-generated-cl: translation import
2013-05-01 14:28:20 -07:00
3eee5cd24b
am 53b37dc0: Merge "Fix a layout problem for pre-MR2"
...
* commit '53b37dc098daf99151bf1b38d04bd202f8a3ba03':
Fix a layout problem for pre-MR2
2013-05-01 02:57:26 -07:00
53b37dc098
Merge "Fix a layout problem for pre-MR2"
2013-05-01 09:56:00 +00:00
b15e822234
Fix a layout problem for pre-MR2
...
...where marginStart is not supported yet.
Change-Id: Id4f642333c17d091b1ab36549ca580f4572d3bf4
2013-05-01 18:45:24 +09:00
3ac40c6ae4
am 1641a4a4: Merge "Fix Google spell checker tests"
...
* commit '1641a4a4576e73bbf0218178c885f448d669b472':
Fix Google spell checker tests
2013-05-01 02:33:29 -07:00
d5781eef62
Fix Google spell checker tests
...
Bug: 8613307
Change-Id: Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
2013-05-01 18:21:56 +09:00
3b8921646f
am 7b2114a4: Display still image when device can\'t play welcome video
...
* commit '7b2114a4283ccd90a937b14145c11125824cd1bd':
Display still image when device can't play welcome video
2013-04-30 20:38:07 -07:00
7b2114a428
Display still image when device can't play welcome video
...
Note that the still image in this change is a placeholder and must be
replaced by final asset.
Bug: 8159728
Change-Id: I4f5a28e0af711edacbc87c2ee64508f34f67f0da
2013-05-01 12:24:36 +09:00
b4251873b0
am e5ae0bd3: Import translations. DO NOT MERGE
...
* commit 'e5ae0bd36aaaa3396ed09e23c7a19acab63eed7f':
Import translations. DO NOT MERGE
2013-04-30 16:42:49 -07:00
8daffca047
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-04-30 16:53:14 +00:00
8805c305c4
Import translations. DO NOT MERGE
...
Change-Id: Ica24d3aa4d4e8ffbcc17f9b206f2683fcfc4daf5
Auto-generated-cl: translation import
2013-04-30 03:57:08 -07:00
Tadashi G. Takaoka
Baligh Uddin
Jean Chalard
Satoshi Kataoka
Ken Wakasa