Commit Graph

3 Commits

Author SHA1 Message Date
Satoshi Kataoka
9c739939a3 Add missing res dir
Change-Id: I50e79bbb1f2eab33c7e5a76086bbe41f7e757ada
2012-11-06 13:49:17 +09:00
Satoshi Kataoka
555e15a96a Merge remote-tracking branch 'goog/master' into mergescriptpackage
Conflicts:
	java/res/values-ca/strings.xml
	java/res/values-cs/strings.xml
	java/res/values-de/strings.xml
	java/res/values-es/strings.xml
	java/res/values-hr/strings.xml
	java/res/values-hu/strings.xml
	java/res/values-it/strings.xml
	java/res/values-lv/strings.xml
	java/res/values-nb/strings.xml
	java/res/values-nl/strings.xml
	java/res/values-pl/strings.xml
	java/res/values-pt/strings.xml
	java/res/values-ro/strings.xml
	java/res/values-ru/strings.xml
	java/res/values-sv/strings.xml
	java/res/values-sw/strings.xml
	java/res/values-tr/strings.xml
	java/res/values-uk/strings.xml
	java/res/values-zh-rCN/strings.xml
	java/res/values-zh-rTW/strings.xml
	java/src/com/android/inputmethod/latin/RichInputConnection.java

Change-Id: Iba00dd5b86cb16d72968bc7e40d75853845b6dcb
2012-11-06 12:49:53 +09:00
Kurt Partridge
25405eafb0 ResearchLogger clean up splash screen
- simpler text
- AlertDialog implementation
- declining users are redirected to regular IME

Bug: 6188932
Change-Id: Ifb983c3511125f8919f4a8b25aeee7de66dbb0cb
2012-08-30 22:52:00 -07:00