Commit graph

7950 commits

Author SHA1 Message Date
Jean Chalard
e91f32d8c1 Merge "Remove a slew of Eclipse warnings." 2012-06-08 00:35:05 -07:00
Jean Chalard
7214617622 Remove a slew of Eclipse warnings.
Change-Id: I03236386aea13fbd4fb8eaeee18e0008aa136502
2012-06-08 16:23:18 +09:00
Satoshi Kataoka
eed2cf287d Merge "Separate state from proximity_info step1" 2012-06-07 22:18:11 -07:00
Eric Fischer
ab96376c9e am b86be339: (-s ours) am 5921ebe3: Import translations. DO NOT MERGE
* commit 'b86be339d5a718721a57563082c11b8a1e2ac8a2':
  Import translations. DO NOT MERGE
2012-06-07 17:21:24 -07:00
Eric Fischer
b86be339d5 am 5921ebe3: Import translations. DO NOT MERGE
* commit '5921ebe34ea82076d5a0619d096f354d23590221':
  Import translations. DO NOT MERGE
2012-06-07 16:34:38 -07:00
Eric Fischer
43a7a82728 Import translations. DO NOT MERGE
Change-Id: I6cad8f4ae58eeb08d8a29137987cb3da60019844
2012-06-07 15:52:50 -07:00
Eric Fischer
5921ebe34e Import translations. DO NOT MERGE
Change-Id: I7f676d036d2773bd3caa5087626b72fc599b1f08
2012-06-07 15:50:15 -07:00
Ken Wakasa
d418580a71 Fix typo
Change-Id: I264f829c1584a37995dbc5ee4ba6b6783d5d4834
2012-06-08 03:42:02 +09:00
Tadashi G. Takaoka
6b8a70105f am e4da18e2: am 6348c54f: Merge "Initializing member variable before it is referenced" into jb-dev
* commit 'e4da18e27916f770fcd704032d30534d287d67c6':
  Initializing member variable before it is referenced
2012-06-07 11:32:50 -07:00
Tadashi G. Takaoka
e4da18e279 am 6348c54f: Merge "Initializing member variable before it is referenced" into jb-dev
* commit '6348c54ffd1d39be44ce42d7d2eb068cba508dbc':
  Initializing member variable before it is referenced
2012-06-07 11:29:58 -07:00
satok
1e96cc1f51 am 674c51a0: am ec2981a4: Fix a bug on upgrading user history scheme
* commit '674c51a01117b73dd25473195f92fb0c0158da26':
  Fix a bug on upgrading user history scheme
2012-06-07 11:28:41 -07:00
Tadashi G. Takaoka
6348c54ffd Merge "Initializing member variable before it is referenced" into jb-dev 2012-06-07 11:27:32 -07:00
satok
674c51a011 am ec2981a4: Fix a bug on upgrading user history scheme
* commit 'ec2981a487b91a682caade486700d8b2377a5c52':
  Fix a bug on upgrading user history scheme
2012-06-07 11:25:52 -07:00
Tadashi G. Takaoka
40582ab438 Initializing member variable before it is referenced
Bug: 6584882
Change-Id: I1f76388fa8cc16171bc3fc60c935ddcf0a7c4e92
2012-06-07 11:17:59 -07:00
satok
ec2981a487 Fix a bug on upgrading user history scheme
Bug: 6626700
Change-Id: I3190d7404e45e704be79ee2031e79b18475feb8c
2012-06-08 02:55:23 +09:00
Tadashi G. Takaoka
b57d053d81 am 733b3c5f: am 65b72435: Fix Dvorak 4th-row color scheme of 7-inch tablet
* commit '733b3c5fa86953b36d2242becb991b2891d8ffc0':
  Fix Dvorak 4th-row color scheme of 7-inch tablet
2012-06-07 09:55:17 -07:00
Tadashi G. Takaoka
733b3c5fa8 am 65b72435: Fix Dvorak 4th-row color scheme of 7-inch tablet
* commit '65b72435237f9dbc0eca0038ebc666331aff079f':
  Fix Dvorak 4th-row color scheme of 7-inch tablet
2012-06-07 09:49:50 -07:00
Tadashi G. Takaoka
65b7243523 Fix Dvorak 4th-row color scheme of 7-inch tablet
Bug: 6625029
Change-Id: I6ea02e8e46d2bae29080cf9b4ad852a1b6fdd6f5
2012-06-07 08:03:58 -07:00
The Android Open Source Project
2740ccb564 am dd52a9dc: Reconcile with jb-release
* commit 'dd52a9dcada2c89a723c49b213c4679424ecc728':
2012-06-07 07:56:03 -07:00
The Android Open Source Project
dd52a9dcad Reconcile with jb-release
Change-Id: I187fd2f871882b894e1c7db7b2ff61763f8bc090
2012-06-07 07:51:32 -07:00
The Android Automerger
eb284f6994 merge in jb-release history after reset to jb-dev 2012-06-07 07:04:50 -07:00
Tom Ouyang
11dc22d964 Merge "Contacts binary dictionary updates with change in keyboard locale." 2012-06-07 01:19:44 -07:00
Tom Ouyang
2e8aa06002 Contacts binary dictionary updates with change in keyboard locale.
Bug: 6616436
Change-Id: I8d66a37f295134c5b9875b2a305a9be7442bd75d
2012-06-07 00:25:41 -07:00
Jean Chalard
c8a120f970 am eead5492: am 769cecf7: Close spell-checking dictionaries in a background thread
* commit 'eead5492615f0b05ef85ca1f88d3a41ce3f8d496':
  Close spell-checking dictionaries in a background thread
2012-06-06 21:52:46 -07:00
Jean Chalard
eead549261 am 769cecf7: Close spell-checking dictionaries in a background thread
* commit '769cecf7e79dc6e2a98e527bdb9943bef9a42396':
  Close spell-checking dictionaries in a background thread
2012-06-06 21:50:38 -07:00
Satoshi Kataoka
3e8c58f68d Separate state from proximity_info step1
Bug: 6548943

Change-Id: I7b4fbe20615a28151a74875be43b9f4a20e0dce9
2012-06-07 13:35:34 +09:00
Jean Chalard
769cecf7e7 Close spell-checking dictionaries in a background thread
Bug: 6584677
Change-Id: Ifd9b0f995f4e0cf4d35a7ecde767826ab976f0b8
2012-06-07 12:56:45 +09:00
Kurt Partridge
9b300f0caa Merge "add research log ui control" 2012-06-06 20:47:53 -07:00
Kurt Partridge
724bc479f7 add research log ui control
- lets users flag a particular time in the research log
- lets users delete the log for this session

also makes the UsabilityLog setting control whether the ResearchLog logs or not.

multi-project commit with I89067e7d3b8daca7179333f1dbe82224c26920fe

Bug: 6188932
Change-Id: I89864ef3ab53b0efe1ea8d75247be08712f0c399
2012-06-06 20:42:01 -07:00
Eric Fischer
4fff6a0498 am c27646cd: (-s ours) am 69b4e411: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'c27646cd2705786b33e23edd7f3902e40afecab8':
  Import translations. DO NOT MERGE
2012-06-06 17:14:01 -07:00
Eric Fischer
c27646cd27 am 69b4e411: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '69b4e411e1666a7a4abed72ab5484878b24cba35':
  Import translations. DO NOT MERGE
2012-06-06 17:11:23 -07:00
Eric Fischer
f4d42d07ac Merge "Import translations. DO NOT MERGE" 2012-06-06 17:09:37 -07:00
Eric Fischer
69b4e411e1 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-06 17:09:28 -07:00
Eric Fischer
2efdf6a09f Import translations. DO NOT MERGE
Change-Id: I7718b03a6f995edfb3cce07f761a4f56d573aa1b
2012-06-06 14:06:59 -07:00
Eric Fischer
80a53c0b74 Import translations. DO NOT MERGE
Change-Id: I6c285a7484375ce4aa4569af6249027f84711d60
2012-06-06 14:03:28 -07:00
Tadashi G. Takaoka
baad1d162c am 55628748: am 95ab6fff: Merge "Change spacebar and language switch key background color of phone" into jb-dev
* commit '5562874831219d5622b5d194fd3ee3e15251202d':
  Change spacebar and language switch key background color of phone
2012-06-06 10:51:07 -07:00
Satoshi Kataoka
91c8c4f3a7 am e08cfda1: am 5a8d2fd1: Merge "Cache UserHistoryDictionary for each language" into jb-dev
* commit 'e08cfda1ebea693c56681816076c419f23c51076':
  Cache UserHistoryDictionary for each language
2012-06-06 10:48:46 -07:00
Tadashi G. Takaoka
7520164ede am 269792b3: am 052a8205: Microphone key on 10-inch tablet on the far right vs where it is on phones
* commit '269792b384b356601f7b4bf08f487803f5710b68':
  Microphone key on 10-inch tablet on the far right vs where it is on phones
2012-06-06 10:48:45 -07:00
Tadashi G. Takaoka
5562874831 am 95ab6fff: Merge "Change spacebar and language switch key background color of phone" into jb-dev
* commit '95ab6fff29b83434307a1705bfe68d30bf440237':
  Change spacebar and language switch key background color of phone
2012-06-06 10:48:40 -07:00
Tadashi G. Takaoka
754b385dc3 am 960dce05: am 268a442d: Microphone key on 7-inch tablet on the far right vs where it is on phones
* commit '960dce0579d4a113c2a2ebf8f8279f2a64e09581':
  Microphone key on 7-inch tablet on the far right vs where it is on phones
2012-06-06 10:46:21 -07:00
Satoshi Kataoka
e08cfda1eb am 5a8d2fd1: Merge "Cache UserHistoryDictionary for each language" into jb-dev
* commit '5a8d2fd1d353b2039f0d340301f9dac779cb4e64':
  Cache UserHistoryDictionary for each language
2012-06-06 10:46:17 -07:00
Tadashi G. Takaoka
269792b384 am 052a8205: Microphone key on 10-inch tablet on the far right vs where it is on phones
* commit '052a82057b0b54e2c40191098a368adcc1e37e74':
  Microphone key on 10-inch tablet on the far right vs where it is on phones
2012-06-06 10:46:15 -07:00
Tadashi G. Takaoka
95ab6fff29 Merge "Change spacebar and language switch key background color of phone" into jb-dev 2012-06-06 10:46:14 -07:00
Satoshi Kataoka
5a8d2fd1d3 Merge "Cache UserHistoryDictionary for each language" into jb-dev 2012-06-06 10:43:50 -07:00
Tadashi G. Takaoka
960dce0579 am 268a442d: Microphone key on 7-inch tablet on the far right vs where it is on phones
* commit '268a442dc4b68faa6ab9355ea634bd76892a4642':
  Microphone key on 7-inch tablet on the far right vs where it is on phones
2012-06-06 10:43:45 -07:00
Tadashi G. Takaoka
562239bf51 am 59dae7e1: am 907ba593: Can specify Key.backgroundType in <Row> and <include> attribute
* commit '59dae7e141b6d6a8bea287f6699e34137390c5f9':
  Can specify Key.backgroundType in <Row> and <include> attribute
2012-06-06 10:42:38 -07:00
Tadashi G. Takaoka
052a82057b Microphone key on 10-inch tablet on the far right vs where it is on phones
This change also re-introduces colored action key, that was disbaled
by I1c7335c5.

Bug: 6568834
Change-Id: I0c04b86049325c84492d90457cee0c16c57937f8
2012-06-06 10:41:17 -07:00
Tadashi G. Takaoka
59dae7e141 am 907ba593: Can specify Key.backgroundType in <Row> and <include> attribute
* commit '907ba593975d5761f5ba01e689ae2d978b63c2f3':
  Can specify Key.backgroundType in <Row> and <include> attribute
2012-06-06 10:39:53 -07:00
Tadashi G. Takaoka
268a442dc4 Microphone key on 7-inch tablet on the far right vs where it is on phones
Bug: 6568834
Change-Id: If48635ead60dc119656f1b10c9b05a1918ebd668
2012-06-06 10:38:50 -07:00
Tadashi G. Takaoka
2bf014d2a8 Fix xml tag in comment
Bug: 6620122
Change-Id: I2852f77d78b242c1a96c53cdd1e4c0e299f8ea4f
2012-06-06 10:36:30 -07:00