Yohei Yukawa
ad7bcb25f6
Merge "Add an API sample to show subtype enabler."
2015-12-15 04:30:14 +00:00
Yohei Yukawa
fafac8ef79
Add an API sample to show subtype enabler.
...
At least on AOSP InputMethodManager#showInputMethodAndSubtypeEnabler()
has been broken for long time. Also, there has been a valid alternative
way to do the same thing.
This CL adds an API sample to officially encourage people to use
Settings.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS intent rather than trying
to rely on InputMethodManager#showInputMethodAndSubtypeEnabler(), which
is highly likely to be broken.
Bug: 26189558
Change-Id: I915a2d81948598ed08b4ef9111bdd128fd93f3df
2015-12-14 18:59:44 -08:00
Shinichiro Hamaji
f1c9df1bdd
Merge "Define a rule to build a dummy .dex.toc file" am: 3578bf1c87
...
am: 4f959f7826
* commit '4f959f78260ee583592093c026dcac560be89720':
Define a rule to build a dummy .dex.toc file
2015-12-14 23:43:18 +00:00
Shinichiro Hamaji
4f959f7826
Merge "Define a rule to build a dummy .dex.toc file"
...
am: 3578bf1c87
* commit '3578bf1c877e745a986aadd60242154d083fa981':
Define a rule to build a dummy .dex.toc file
2015-12-14 23:29:52 +00:00
Shinichiro Hamaji
3578bf1c87
Merge "Define a rule to build a dummy .dex.toc file"
2015-12-14 23:07:58 +00:00
Shinichiro Hamaji
ee81f7eb90
Define a rule to build a dummy .dex.toc file
...
This is a preparation of
https://android-review.googlesource.com/#/c/186470/
Bug: 24597504
Change-Id: I5b403f4b3ae29579d11653103464819c61063b3e
2015-12-14 18:34:45 +09:00
Christopher Tate
cb7c506c95
Add libcore/ojluni/ to Eclipse/IntelliJ templates
...
Change-Id: I96367a42fa4d0c3a2ac5471cdbc43a09e540ad61
2015-12-11 16:48:45 -08:00
Josh Gao
33f6d1f079
Merge "Move adb tests to system/core/adb." am: 4d00ec0adb
...
am: 4b41037bce
* commit '4b41037bce4633cd9b4fc19cc86e721688ff00af':
Move adb tests to system/core/adb.
2015-12-10 15:42:39 -08:00
Dan Albert
d62e063997
Merge "Update byteswap.h from bionic to match endian.h." am: b6d57640cc
...
am: 8811e5bdda
* commit '8811e5bdda5e188d3e63c3a36b643164c4b4c2ba':
Update byteswap.h from bionic to match endian.h.
2015-12-10 15:42:20 -08:00
Josh Gao
4b41037bce
Merge "Move adb tests to system/core/adb."
...
am: 4d00ec0adb
* commit '4d00ec0adbf38a64c413eee8c6c576f04669bc59':
Move adb tests to system/core/adb.
2015-12-10 10:17:32 -08:00
Dan Albert
8811e5bdda
Merge "Update byteswap.h from bionic to match endian.h."
...
am: b6d57640cc
* commit 'b6d57640ccb4a9adabcf1582d4cb7141823c2a7e':
Update byteswap.h from bionic to match endian.h.
2015-12-10 10:17:17 -08:00
Josh Gao
4d00ec0adb
Merge "Move adb tests to system/core/adb."
2015-12-10 18:09:47 +00:00
Dan Albert
b6d57640cc
Merge "Update byteswap.h from bionic to match endian.h."
2015-12-10 18:07:06 +00:00
Dan Albert
6e84c13895
Update byteswap.h from bionic to match endian.h.
...
Change-Id: I79e445a167800ce083039d0cb65c5a966d7e6a72
2015-12-09 19:17:28 -08:00
Filip Gruszczynski
e32aaa0f02
Use new Window API in caption overlay activity sample.
...
Bug: 25486369
Bug: 25818398
Change-Id: I37692748471481063c3e655fb1008856b7ba2845
2015-12-09 16:49:05 -08:00
Josh Gao
5cd0f10ebc
Move adb tests to system/core/adb.
...
Change-Id: Ieeb0e1122a7b13a784ec8c19cf360c7699dcd9ff
2015-12-09 11:25:57 -08:00
Yohei Yukawa
873cd08bae
Merge "Fix exception in MakeFileParser" am: 85fad37aa7
...
am: 65ce0716fc
* commit '65ce0716fcd4c202278aaadc8269962844c8015f':
Fix exception in MakeFileParser
2015-12-09 19:20:09 +00:00
Yohei Yukawa
65ce0716fc
Merge "Fix exception in MakeFileParser"
...
am: 85fad37aa7
* commit '85fad37aa7ff73341006cbb890eb80a4c5144694':
Fix exception in MakeFileParser
2015-12-09 11:17:21 -08:00
Yohei Yukawa
85fad37aa7
Merge "Fix exception in MakeFileParser"
2015-12-09 19:11:13 +00:00
Xiaohui Chen
0b7e903d4c
Fix exception in MakeFileParser
...
The code currently tries to parse all "$" as variables. Now narrow it
down to only "$()" as it should.
Bug: 23155276
Change-Id: I1732ce757a9f7d611e90138b595a0aa1d3ce6009
2015-12-08 19:03:23 -08:00
Teng-Hui Zhu
8b5cd2fe95
Correct the R.java import
...
am: 61ea82804c
* commit '61ea82804ca5b496a7530a3e833b217f3c6e61f4':
Correct the R.java import
2015-12-08 23:58:50 +00:00
Teng-Hui Zhu
61ea82804c
Correct the R.java import
...
Change-Id: Idc58008f28e6974eb3b4597cc8182db34596ab51
2015-12-08 15:42:47 -08:00
Dan Albert
51501abcb8
Merge changes from topic \'update-endian-h\' am: a3a48fc603
...
am: 4d377171b6
* commit '4d377171b6237b389358da81e720077c4a50f07d':
Update endian.h from bionic.
Always use the newest sys/cdefs.h.
2015-12-08 23:38:39 +00:00
Dan Albert
4d377171b6
Merge changes from topic \'update-endian-h\'
...
am: a3a48fc603
* commit 'a3a48fc60311d2d85139e328e7e4435eebe76046':
Update endian.h from bionic.
Always use the newest sys/cdefs.h.
2015-12-08 23:34:44 +00:00
Dan Albert
a3a48fc603
Merge changes from topic 'update-endian-h'
...
* changes:
Update endian.h from bionic.
Always use the newest sys/cdefs.h.
2015-12-08 23:28:18 +00:00
Dan Albert
616a494ec1
Update endian.h from bionic.
...
This consolidates the guts of the three endian.h files (endian.h,
sys/endian.h, and machine/endian.h) into just sys/endian.h, and turns
the others into headers that forward to it.
This also consolidates all the architecture specific machine/endian.h
files into a single generic header.
Finally, this is also the update version of sys/endian.h, which just
forwards to compiler builtins rather than implementing it ourselves.
Change-Id: Ifce64dc684ce3d3231f3f43a94c083bbd8661840
2015-12-08 14:20:25 -08:00
Dan Albert
c57abe4eb2
Always use the newest sys/cdefs.h.
...
This is all macros, so there's no reason to have one per API level.
This is still quite a ways from matching what we have in bionic, but
that's a problem for another day.
Change-Id: I804edfd6299d9ba15a3ba59e1091f301eace2142
2015-12-08 14:19:48 -08:00
Tenghui Zhu
3c356ac985
Merge "Add the vector drawable support lib demo code" into mnc-ub-dev
...
am: 6574effbd5
* commit '6574effbd547a286e8ae2c613170c86e7081ea8a':
Add the vector drawable support lib demo code
2015-12-08 21:38:40 +00:00
Tenghui Zhu
6574effbd5
Merge "Add the vector drawable support lib demo code" into mnc-ub-dev
2015-12-08 21:32:32 +00:00
Elliott Hughes
a91d077402
Merge "win32: for Unicode cmdline args, switch from cmd.exe to powershell.exe" am: 6f859c4b4f
...
am: 1053438876
* commit '1053438876fc7d960f39cbc20e7f0a6a214768d4':
win32: for Unicode cmdline args, switch from cmd.exe to powershell.exe
2015-12-08 21:01:52 +00:00
Elliott Hughes
1053438876
Merge "win32: for Unicode cmdline args, switch from cmd.exe to powershell.exe"
...
am: 6f859c4b4f
* commit '6f859c4b4f1fb8298d19103ccfd551f0f67904cd':
win32: for Unicode cmdline args, switch from cmd.exe to powershell.exe
2015-12-08 20:59:21 +00:00
Elliott Hughes
6f859c4b4f
Merge "win32: for Unicode cmdline args, switch from cmd.exe to powershell.exe"
2015-12-08 20:53:07 +00:00
Teng-Hui Zhu
ddf2bab3ea
Add the vector drawable support lib demo code
...
b/22564270
Change-Id: Id4f721cfd6e9450d8346410997ecfc1f2c3926c1
2015-12-07 15:44:48 -08:00
Kirill Grouchnikov
0810f900e3
Align DrawerLayout width with Material design spec.
...
am: 903605cba5
* commit '903605cba59773341f511ab3d14b9f9de939c210':
Align DrawerLayout width with Material design spec.
2015-12-07 23:29:05 +00:00
Kirill Grouchnikov
903605cba5
Align DrawerLayout width with Material design spec.
...
Bug: 26027590
Change-Id: If5e80c99f3be5ebd89c0b5d2e915db4c0da14adc
2015-12-04 23:27:02 -05:00
Dan Albert
707dc298ef
Merge "Update uchar.h from bionic." am: 008a22f9b9 am: 7d7f8702f3
...
am: d59b8ed3db
* commit 'd59b8ed3dbee9374bf1d006624c6a524ca72a528':
Update uchar.h from bionic.
2015-12-04 21:49:26 +00:00
Dan Albert
b475e5b969
Merge "Fix complex.h for clang." am: 0cdb55f880 am: 2f3b724142
...
am: 92ed8387cf
* commit '92ed8387cf3b261cad3d8f1c8eb661dc0a51933d':
Fix complex.h for clang.
2015-12-04 21:49:17 +00:00
Dan Albert
d59b8ed3db
Merge "Update uchar.h from bionic." am: 008a22f9b9
...
am: 7d7f8702f3
* commit '7d7f8702f3f99670274ec4bf8f18a717e2acc0d5':
Update uchar.h from bionic.
2015-12-04 13:46:00 -08:00
Dan Albert
92ed8387cf
Merge "Fix complex.h for clang." am: 0cdb55f880
...
am: 2f3b724142
* commit '2f3b724142c5b67eb2e24c12f0920654285f0dcb':
Fix complex.h for clang.
2015-12-04 13:45:50 -08:00
Dan Albert
7d7f8702f3
Merge "Update uchar.h from bionic."
...
am: 008a22f9b9
* commit '008a22f9b9588ff3df3e0605970f3cf39442df96':
Update uchar.h from bionic.
2015-12-04 21:42:34 +00:00
Dan Albert
2f3b724142
Merge "Fix complex.h for clang."
...
am: 0cdb55f880
* commit '0cdb55f8807f86509f3a7c3b33dfe2cf98067c7e':
Fix complex.h for clang.
2015-12-04 21:42:24 +00:00
Dan Albert
008a22f9b9
Merge "Update uchar.h from bionic."
2015-12-04 21:36:21 +00:00
Dan Albert
0cdb55f880
Merge "Fix complex.h for clang."
2015-12-04 21:36:15 +00:00
Dianne Hackborn
55769bbc8c
Merge "Extend foreground service test to demonstrate doze behavior."
2015-12-04 21:29:09 +00:00
Dan Albert
53bc2e2f1e
Update uchar.h from bionic.
...
char16_t and char32_t should not be defined when building as C. For
GCC they are, but not for clang. Pull in the updated bionic header
which has the fix for this.
Change-Id: I41b292ece36af79bbe835706bee4441b298215ff
2015-12-04 11:29:12 -08:00
Dan Albert
4efb18d5f5
Fix complex.h for clang.
...
From the comment about __NDK_FPABI__ vs __NDK_FPABI_MATH__:
NOTE: Disable for clang for now unless _NDK_MATH_NO_SOFTFP=1, because clang before 3.4 doesn't
allow change of calling convension for builtin and produces error message reads:
a.i:564:6: error: function declared 'aapcs' here was previously declared without calling convention
int sin(double d) __attribute__((pcs("aapcs")));
^
a.i:564:6: note: previous declaration is here
This applies to current clang as well, not just pre-3.4. Mark these
math functions as math functions.
Change-Id: I001b31df540aa3f61eec049f89346cbf2f11f128
2015-12-04 11:22:26 -08:00
Kirill Grouchnikov
a29dac054f
Merge "Fix drawer layout sample app layout issue." into mnc-ub-dev
...
am: 559507c607
* commit '559507c6075a3a2922fe41d34b04c629358bdc00':
Fix drawer layout sample app layout issue.
2015-12-04 15:37:28 +00:00
Kirill Grouchnikov
559507c607
Merge "Fix drawer layout sample app layout issue." into mnc-ub-dev
2015-12-04 15:34:00 +00:00
Yuichi Araki
8286da9213
Merge "Add use of NavigationView without drawer" into mnc-ub-dev
...
am: 6e96f544ef
* commit '6e96f544ef706d02a91f59215516769b8cf86106':
Add use of NavigationView without drawer
2015-12-04 04:24:40 +00:00
Yuichi Araki
9a8e7f280f
Merge "Add usage of hideable BottomSheetBehavior" into mnc-ub-dev
...
am: 78bb3f6176
* commit '78bb3f61768f8ad6b1b461688262c970c4cf45aa':
Add usage of hideable BottomSheetBehavior
2015-12-04 04:21:24 +00:00