Commit graph

2265 commits

Author SHA1 Message Date
Tadashi G. Takaoka
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
Baligh Uddin
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
Jean Chalard
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
Baligh Uddin
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Jean Chalard
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
Satoshi Kataoka
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
Tadashi G. Takaoka
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
Jean Chalard
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
Jean Chalard
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
Jean Chalard
33ccdd1cda am b312f4a8: am ae577ac1: Merge "Update dictionaries"
* commit 'b312f4a8f78f423c5507785f5fbf79d6c786e5bc':
  Update dictionaries
2013-05-15 11:05:20 -07:00
Tadashi G. Takaoka
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
Jean Chalard
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
Jean Chalard
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
Jean Chalard
4746093c3c am a9b0c4fb: am 1ff8b1ce: Merge "Update dictionaries"
* commit 'a9b0c4fb9d0247ccdc92984de2d972136a8d34bb':
  Update dictionaries
2013-05-15 11:05:01 -07:00
Satoshi Kataoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Jean Chalard
511432b23c am ba4677fe: am df3ca042: Fix deleting a dictionary
* commit 'ba4677fe0b47aa17ac2a5856d9e71c83eaa71c40':
  Fix deleting a dictionary
2013-05-15 11:04:52 -07:00
Jean Chalard
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
Satoshi Kataoka
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
Jean Chalard
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Satoshi Kataoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Satoshi Kataoka
874c4fda36 am 434abe45: am 9b4e3db1: Legal notice
* commit '434abe450c8fd65789b6f8b04d62ad98287115dd':
  Legal notice
2013-05-15 10:53:02 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Jean Chalard
52e0b3d1b8 am 0e64fbbc: am 9cf46864: Update dictionaries
* commit '0e64fbbcac7116c410143796937e4e5ef1238c83':
  Update dictionaries
2013-05-15 10:46:54 -07:00
Tadashi G. Takaoka
a06fdaadae am 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons"
* commit '64e87b3e660199b5dd7539fe413146e4dfbf977f':
  Update setup wizard icons
2013-05-15 10:46:52 -07:00
Baligh Uddin
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Baligh Uddin
8dafc8e834 am 22e6a5c5: Import translations. DO NOT MERGE
* commit '22e6a5c5b4c3fb486fd2605255081fc4b849f415':
  Import translations. DO NOT MERGE
2013-05-09 08:52:51 -07:00
Baligh Uddin
22e6a5c5b4 Import translations. DO NOT MERGE
Change-Id: I189a4ad23e69f0abe515dad7e3c909a28fcfbf0b
Auto-generated-cl: translation import
2013-05-08 13:09:53 -07:00
Tadashi G. Takaoka
9d71a6c968 Remove unused device form factor values
Change-Id: I1ed88b842a3d45e5460dd387bfad4276c844096a
2013-05-07 18:52:22 +09:00
Baligh Uddin
71778d2551 am 34a0dc5a: Import translations. DO NOT MERGE
* commit '34a0dc5abe47b28b7ef681b30aa5c94349b57e0d':
  Import translations. DO NOT MERGE
2013-05-06 14:03:12 -07:00