Commit Graph

7072 Commits (6600b06caa1812507adfa6056ab086ddc0b43724)

Author SHA1 Message Date
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
Jean Chalard 5fe03e939f am 1aab945b: am c3f47836: Add an additional ID to the client info.
* commit '1aab945b2ac1a1232f1cdcb843251f93ad1c3232':
  Add an additional ID to the client info.
2013-05-15 10:58:39 -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 16bacd59d5 am 34b00870: am 1a9bf159: Merge "Don\'t triger onPress and startLongPressTimer when gesture is canceled"
* commit '34b0087038eadf8efe1ce851ad3ba41c354152d1':
  Don't triger onPress and startLongPressTimer when gesture is canceled
2013-05-15 10:53:00 -07:00
Tadashi G. Takaoka 7a58488065 am 80a98ee5: am 508ab248: Merge "Implement IMM.switchToNextInputMethod() for ICS"
* commit '80a98ee5c23024f3da7794f692a0ef69debe99d6':
  Implement IMM.switchToNextInputMethod() for ICS
2013-05-15 10:52:59 -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
Kurt Partridge 6f3b9ddd76 am bd99e8dc: am 41b34cf2: Merge "Allow LogUnits to hold >1 word"
* commit 'bd99e8dc246faeafa5849078dce47fb379d23eb1':
  Allow LogUnits to hold >1 word
2013-05-15 10:52:51 -07:00
Jean Chalard 643bdb0ff4 am 6f6974e6: am 825da76c: Redisplay a hidden button after it entered the screen again.
* commit '6f6974e6e9a2b177cf1355395e52652b49a13c3a':
  Redisplay a hidden button after it entered the screen again.
2013-05-15 10:52:49 -07:00
Jean Chalard 12e180a6c3 am 6dc9933d: am f8014eea: Hide the correct button when pressing a new button.
* commit '6dc9933d83c166b57dcfc42d5738423cde2e5bee':
  Hide the correct button when pressing a new button.
2013-05-15 10:52:48 -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
Kurt Partridge 1efcbd67cd am 8acab80a: am 56f35a10: Merge "Fix bug in counting words between samples"
* commit '8acab80a8680956038b45912d3e00a1d6a5e3cdb':
  Fix bug in counting words between samples
2013-05-15 10:46:51 -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
Kurt Partridge b1767bc433 am 40070707: am 7a172175: Merge "Fix user recording dialog"
* commit '40070707d83fb2a105292a0683fa22a1094e58fe':
  Fix user recording dialog
2013-05-15 10:36:46 -07:00
Kurt Partridge 5abe65f1da am 72ca59bc: am 0833b3cb: Merge "Fix alarm bug"
* commit '72ca59bc2a29eaadf0b557995a137c8f682d82bb':
  Fix alarm bug
2013-05-15 10:36:44 -07:00
Kurt Partridge 453b371d2f am 1019c630: am a1913301: Merge "Avoid duplicate MotionEvents"
* commit '1019c630fafd4bffd3fb51a0b83dfc532dcd5306':
  Avoid duplicate MotionEvents
2013-05-15 10:36:42 -07:00
Kurt Partridge 10270196c8 am a2a29050: am b903f103: Merge "Label logUnits after LatinImeOnEndBatchInput"
* commit 'a2a2905033d37784b84191eec8d1efa3cd5b4819':
  Label logUnits after LatinImeOnEndBatchInput
2013-05-15 10:36:39 -07:00
Kurt Partridge 86b2c57c47 am f5864fbb: am a5bfac5b: Merge "Fix NPE"
* commit 'f5864fbb7a8703cb44a6e7bd77d7031ee271db12':
  Fix NPE
2013-05-15 10:36:37 -07:00
Kurt Partridge 79cd791b72 am f9c137aa: am 7da87f97: Merge "Clean up unnecessary log messages"
* commit 'f9c137aa600aa804110437a9385de8b5338a28b8':
  Clean up unnecessary log messages
2013-05-15 10:36:30 -07:00
Kurt Partridge 22c706aa36 am a9c2ff1b: am e9e4fe52: Merge "Fix logic error"
* commit 'a9c2ff1b236624e7aefeecb2dbd2829e8217130c':
  Fix logic error
2013-05-15 10:36:26 -07:00
Kurt Partridge 4a885f254d am b20c7ee7: am 1f99e04b: Merge "Fix JsonWriter bug"
* commit 'b20c7ee75093ae9c111daf64d9e4f8509d692824':
  Fix JsonWriter bug
2013-05-15 10:36:24 -07:00
Kurt Partridge 80a6848d8a am 6c80e047: am dac3ee49: Merge "Small dot in corner was not visible"
* commit '6c80e0475c8cde60fbadb9bab892a74dfa60132a':
  Small dot in corner was not visible
2013-05-15 10:36:22 -07:00
Kurt Partridge 21a2cfca20 am abc8d564: am dd8c87a3: Merge "Include nanoTime in filename"
* commit 'abc8d564eb0674887b5b1ebae3c1029935f4bb7b':
  Include nanoTime in filename
2013-05-15 10:36:20 -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
Tadashi G. Takaoka 1626830701 am bb84fdd1: am bb5deb82: Fix singleton/utility classes initialization in SettingsFragment
* commit 'bb84fdd134e0a5aff268d5d475091e023778655d':
  Fix singleton/utility classes initialization in SettingsFragment
2013-05-15 10:36:14 -07:00
Tadashi G. Takaoka 6dd2130d84 am 2101ba41: am 888a194c: Fix missing AudioAndHapticFeedbackManager initialization
* commit '2101ba410c4fd12919b3b84e4e6bcc61b1897e70':
  Fix missing AudioAndHapticFeedbackManager initialization
2013-05-15 10:36:12 -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
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
Baligh Uddin 34a0dc5abe Import translations. DO NOT MERGE
Change-Id: I2e89e3da74724731dc26f081c9d468200e90b31e
Auto-generated-cl: translation import
2013-05-06 13:39:54 -07:00
Baligh Uddin a8478986d4 am b55b15c3: Import translations. DO NOT MERGE
* commit 'b55b15c3bd920842720dd97ffa33bb45f5e6e0cd':
  Import translations. DO NOT MERGE
2013-05-06 11:11:37 -07:00
Baligh Uddin b55b15c3bd Import translations. DO NOT MERGE
Change-Id: I5c8c885e2971d73ffa5a8ac45dd39dd836c935c8
Auto-generated-cl: translation import
2013-05-03 16:44:22 -07:00
Baligh Uddin 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
Baligh Uddin f7e4057f22 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-02 03:43:55 +00:00
Satoshi Kataoka e5daf6608a am 6845427e: DO NOT MERGE: Return possible suggestions in Google Spell Checker
* commit '6845427e5d48fe48f837cd96a52c209be5f40357':
  DO NOT MERGE: Return possible suggestions in Google Spell Checker
2013-05-01 18:37:23 -07:00
Baligh Uddin cd6806d2d9 Import translations. DO NOT MERGE
Change-Id: I840f5e7a7f140fbf5ccf27371077b2d8c86506c2
Auto-generated-cl: translation import
2013-05-01 14:28:20 -07:00
Jean Chalard d8e5527701 am 83757d43: Merge "Pass blockOffensiveWords as a parameter"
* commit '83757d439ea15c5304a048868edb16d5ef7fd5cb':
  Pass blockOffensiveWords as a parameter
2013-05-01 04:59:07 -07:00
Jean Chalard 83757d439e Merge "Pass blockOffensiveWords as a parameter" 2013-05-01 11:57:36 +00:00
Jean Chalard 2dbb5957e3 Pass blockOffensiveWords as a parameter
Bug: 8773353
Change-Id: Ic1019742ce7ff6e4f7fff4d2729f8ab52d841488
2013-05-01 20:47:35 +09:00
Ken Wakasa 56550ee5c3 am 1490b534: Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
* commit '1490b534162cc5f99e2a1ed93c63a1fa4045e5ca':
  Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
2013-05-01 04:25:44 -07:00
Ken Wakasa 1490b53416 Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
Change-Id: Icb89c5119a67edaa019d5f7645b734cfcfc29041
2013-05-01 20:19:05 +09:00
Satoshi Kataoka 6845427e5d DO NOT MERGE: Return possible suggestions in Google Spell Checker
Bug: 8772531

By the change in the suggestion algorithm, the pruning of the suggestions is not required anymore. This has been fixed in master branch properly.

Change-Id: I6ab9da953d69ff726d2bc328c09064e6ade0dcea
2013-05-01 20:18:55 +09:00
Jean Chalard 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
Jean Chalard 53b37dc098 Merge "Fix a layout problem for pre-MR2" 2013-05-01 09:56:00 +00:00
Jean Chalard 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
Satoshi Kataoka 3ac40c6ae4 am 1641a4a4: Merge "Fix Google spell checker tests"
* commit '1641a4a4576e73bbf0218178c885f448d669b472':
  Fix Google spell checker tests
2013-05-01 02:33:29 -07:00
Satoshi Kataoka 1641a4a457 Merge "Fix Google spell checker tests" 2013-05-01 09:31:52 +00:00
Satoshi Kataoka d5781eef62 Fix Google spell checker tests
Bug: 8613307

Change-Id: Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
2013-05-01 18:21:56 +09:00
Tadashi G. Takaoka 6191026ce4 am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class"
* commit '0caf3f6a04a706be6f69309b7d0869bf93accd56':
  Introduce MoreSuggestionsListener class
2013-05-01 02:16:51 -07:00
Tadashi G. Takaoka 0caf3f6a04 Merge "Introduce MoreSuggestionsListener class" 2013-05-01 09:15:26 +00:00
Tadashi G. Takaoka 6f7905ae75 Introduce MoreSuggestionsListener class
Bug: 8694255
Change-Id: I9420a7cb1983c6211f58d13b3b11db4347c3f99b
2013-05-01 18:03:37 +09:00
Satoshi Kataoka fcfa2cb24f am 6314b845: Merge "Add permissions for personalization"
* commit '6314b845f4df3ae66caeef16dd1ac399116eac35':
  Add permissions for personalization
2013-05-01 01:15:37 -07:00
Satoshi Kataoka 6314b845f4 Merge "Add permissions for personalization" 2013-05-01 08:13:40 +00:00
Satoshi Kataoka 492557e4f7 Add permissions for personalization
Bug: 8683365

Change-Id: Ia74d730a6b778c0e647794efc8c3a810c715902c
2013-05-01 17:10:20 +09:00
Tadashi G. Takaoka f405dc87a8 am 17a35383: Merge "Override View.drawableStateChanged to detect state_pressed"
* commit '17a353831ae81ba6155a87693289ca9afd7f89cb':
  Override View.drawableStateChanged to detect state_pressed
2013-04-30 22:06:17 -07:00
Tadashi G. Takaoka 47a66b12ec Override View.drawableStateChanged to detect state_pressed
Unlike on JB, View.setPressed(boolean) is never called when the view
is pressed on ICS. To detect a pressed state of the view, we need to
override View.drawableStateChanged() and check the drawable state
contains state_pressed.

Bug: 8159728
Change-Id: I481051364d6f3d1370742723c3ce19d898ea5463
2013-05-01 14:02:18 +09:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Jean Chalard 4aa48aedda am 019c3806: am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
* commit '019c38060d8479e26895f94e00fa53586ce28a70':
  Don't do recorrection when suggestions are off.
2013-04-30 19:23:31 -07:00
Jean Chalard 019c38060d am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
* commit 'ace3f3c5d56f5b4a58e8dc400fec1bb8c7b17a63':
  Don't do recorrection when suggestions are off.
2013-04-30 19:22:13 -07:00
Jean Chalard ace3f3c5d5 am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
* commit '25c90e6d51aeca5dce05b5adb691876b55a142d5':
  Don't do recorrection when suggestions are off.
2013-04-30 19:19:04 -07:00
Jean Chalard 25c90e6d51 Merge "Don't do recorrection when suggestions are off." into jb-mr2-dev 2013-05-01 02:16:20 +00:00
Jean Chalard aa3a96f3a1 Don't do recorrection when suggestions are off.
Bug: 8767981
Change-Id: If5c775e488b91ae03ecce2673c99918ac8134928
2013-05-01 10:17:28 +09:00
Baligh Uddin b4251873b0 am e5ae0bd3: Import translations. DO NOT MERGE
* commit 'e5ae0bd36aaaa3396ed09e23c7a19acab63eed7f':
  Import translations. DO NOT MERGE
2013-04-30 16:42:49 -07:00
Baligh Uddin 8daffca047 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-04-30 16:53:14 +00:00
Ken Wakasa 761b5586a7 am a0b62ece: Merge "Cleanup an unused return value"
* commit 'a0b62ece8383d8fae96287cc333e2165e29d21e0':
  Cleanup an unused return value
2013-04-30 04:25:56 -07:00
Ken Wakasa a0b62ece83 Merge "Cleanup an unused return value" 2013-04-30 11:16:28 +00:00
Baligh Uddin 8805c305c4 Import translations. DO NOT MERGE
Change-Id: Ica24d3aa4d4e8ffbcc17f9b206f2683fcfc4daf5
Auto-generated-cl: translation import
2013-04-30 03:57:08 -07:00
Baligh Uddin e5ae0bd36a Import translations. DO NOT MERGE
Change-Id: I90d5918cc37eaa6d3e19822e149a8a16b9d76744
Auto-generated-cl: translation import
2013-04-30 03:55:36 -07:00
Tadashi G. Takaoka f4a03ddcf8 am 1187ef9a: Merge "Catch error while playing welcome video"
* commit '1187ef9a9747ff2ed71101156f3f560eaa32772c':
  Catch error while playing welcome video
2013-04-30 02:33:52 -07:00
Tadashi G. Takaoka 1187ef9a97 Merge "Catch error while playing welcome video" 2013-04-30 09:31:20 +00:00
Jean Chalard d618419d16 am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar"
* commit '37bbaea8a15038406214fa8c9098cfcf4b2e2d9b':
  [PB14] Cosmetic fixes to the progress bar
2013-04-30 02:22:20 -07:00
Jean Chalard 37bbaea8a1 Merge "[PB14] Cosmetic fixes to the progress bar" 2013-04-30 09:20:41 +00:00
Tadashi G. Takaoka ad46c9e0e0 Catch error while playing welcome video
Bug: 8159728
Change-Id: Ic8eea7993f12395d6eca6db8d5529803251a9fee
2013-04-30 18:18:32 +09:00
Jean Chalard 7eff677c29 [PB14] Cosmetic fixes to the progress bar
Bug: 7600384
Change-Id: I33ea155c0c97c7ead07686c4d2a9e0d98be9929c
2013-04-30 17:54:09 +09:00
Ken Wakasa 0d6c87d113 Cleanup an unused return value
Change-Id: I974964aa3cc24b5480e57bd38c197fe7a49acaa4
2013-04-30 16:53:18 +09:00
Satoshi Kataoka f4d7c99cda am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary"
* commit '71c1e50fdb47c78b3180cc6b04d4cababe3f3fe2':
  Fix the title of the fragment of the personal dictionary
2013-04-30 00:13:02 -07:00
Satoshi Kataoka 71c1e50fdb Merge "Fix the title of the fragment of the personal dictionary" 2013-04-30 07:11:13 +00:00
Jean Chalard 69e1e45c01 am 01170ffe: [PB13] Actually update the progress bar
* commit '01170ffebeb4a604667abb84310ed4e910f97bf7':
  [PB13] Actually update the progress bar
2013-04-30 00:09:52 -07:00
Jean Chalard 01170ffebe [PB13] Actually update the progress bar
Bug: 7600384
Change-Id: Iaa8f3a59243a15d2a01aaf6017ed85c52b6482a6
2013-04-30 15:48:26 +09:00
Tadashi G. Takaoka 3bcc75456f am 965329c1: Fix missing string reference of spellchecker.xml
* commit '965329c192ee385c83ccf9b054063f9a68cca34b':
  Fix missing string reference of spellchecker.xml
2013-04-29 23:35:50 -07:00
Tadashi G. Takaoka 965329c192 Fix missing string reference of spellchecker.xml
This is a followup of I8dea5393ad.

Change-Id: I311c50cf8205298f20694e068bb9a4b661df8a8b
2013-04-30 15:31:58 +09:00
Jean Chalard 27c9166272 am 5f2efe0f: Merge "[PB12] Implement the progress bar update lifecycle"
* commit '5f2efe0f911f4f547765d260f76412717d232599':
  [PB12] Implement the progress bar update lifecycle
2013-04-29 23:03:47 -07:00
Satoshi Kataoka 5aa14c2636 Fix the title of the fragment of the personal dictionary
This change is corresponding to I9b8bab21b144385bc2386e7fcb

Bug: 8600958
Change-Id: I0a0cf37d0a11c14a51dc63b2e4371facb34514d0
2013-04-30 15:01:51 +09:00
Jean Chalard d282ebfb71 [PB12] Implement the progress bar update lifecycle
This ensures the thread does not run uselessly (it is even terminated when
the progress bar exits the screen).

Bug: 7600384
Change-Id: I09117a6f763b574b9b3266f36ba3da4720dc9224
2013-04-30 14:55:10 +09:00
Jeff Sharkey 238748d57c am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."
* commit '7a800e7982ff607aa339f44742de935033f38cfe':
  Avoid leaking AssetFileDescriptor.
2013-04-29 22:33:22 -07:00
Jeff Sharkey 7a800e7982 Merge "Avoid leaking AssetFileDescriptor." 2013-04-30 01:11:02 +00:00
Jeff Sharkey c5ebc792d6 Avoid leaking AssetFileDescriptor.
Change-Id: Iac388c8aefc684980cb4c7131fb47319f6073eb3
2013-04-29 12:26:44 -07:00
Baligh Uddin ed9ef5a778 am af77854a: am 31a70de6: Import translations. DO NOT MERGE
* commit 'af77854afce13fa54826cbe2c55745030621cb5a':
  Import translations. DO NOT MERGE
2013-04-29 11:22:26 -07:00
Baligh Uddin 88a78cd0c6 Revert "Import translations. DO NOT MERGE"
This reverts commit c641478352

Change-Id: Ibfdb00914e74239ed18982f7e264392e27ebccc4
2013-04-27 02:50:44 +00:00