drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,171 Commits 1 Branch 0 Tags
Commit Graph

6663 Commits

Author SHA1 Message Date
Elliott Hughes
fc01a6687b am c1973c28: am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 
* commit 'c1973c2888bde77f2dd5dbdba6225afb8829ed46':
  Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
 2014-06-04 21:48:08 +00:00
Elliott Hughes
c0f4ac1bb8 Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 2014-06-04 21:13:57 +00:00
Narayan Kamath
00e3c58d02 am 73f7cd98: Merge "Fix build." 
* commit '73f7cd98d61eded2cc3af0f672937c7a2ec5c10a':
  Fix build.
 2014-06-03 14:08:51 +00:00
Narayan Kamath
26c6c03196 Fix build. 
Bad resolution of a manual rebase.

Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7
 2014-06-03 14:54:52 +01:00
Narayan Kamath
dd2e9d3386 am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs." 
* commit '7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
  Scan for renderscript files before deciding ABIs.
 2014-06-03 13:24:50 +00:00
Narayan Kamath
797b109c60 am 7ed98c43: Merge "Add an --abi argument to "pm install"" 
* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
  Add an --abi argument to "pm install"
 2014-06-03 13:24:45 +00:00
Narayan Kamath
d47e38b634 Scan for renderscript files before deciding ABIs. 
The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.

bug: 14900093

Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
 2014-06-03 12:58:35 +01:00
Narayan Kamath
6431d11cd4 Add an --abi argument to "pm install" 
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
 2014-06-03 11:11:47 +01:00
Elliott Hughes
04c987a806 am 79067b3c: am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '79067b3cb2f43e62b9a4d46082fb01cbcc513990':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:29:47 +00:00
Elliott Hughes
79067b3cb2 am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '5568e0e45fff7ffe5061770cb527b22d09cf5519':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:26:36 +00:00
Elliott Hughes
5568e0e45f Merge "Move frameworks/base off private libcore.ICU API." 2014-05-31 02:22:24 +00:00
Elliott Hughes
570f44b4ab Move frameworks/base off private libcore.ICU API. 
Change-Id: I55355b7ea68174063f31d6bb08a71bcb9dc76d62
 2014-05-30 19:20:20 -07:00
Jianzheng Zhou
4bb74f157a Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag 
Change-Id: Ied20e4c7e0e4aa648a76fbe80dd1f0dd30b948a9
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2014-05-30 09:54:51 +08:00
Narayan Kamath
f4e0bf9fe1 am 98993813: am b75b3aaa: Merge "Build PacProcessor for 64 bit." 
* commit '98993813b31f20c27f2c0a91daebdaedc382bb5b':
  Build PacProcessor for 64 bit.
 2014-05-28 09:23:21 +00:00
Narayan Kamath
98993813b3 am b75b3aaa: Merge "Build PacProcessor for 64 bit." 
* commit 'b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7':
  Build PacProcessor for 64 bit.
 2014-05-28 08:48:23 +00:00
Narayan Kamath
96132a1907 Build PacProcessor for 64 bit. 
external/chromium-libpac can now build for 64 bit.

Change-Id: I0bfd068ef4ea7d57686f11b79c32803e38bab719
 2014-05-27 17:06:18 +01:00
Narayan Kamath
eae7b53d3a am 34c6cb4c: am 6b5beb31: Merge "PacProccesor: Only build for 32-bit" 
* commit '34c6cb4c1af7a7dd8f8658dd401c74076943ffb8':
  PacProccesor: Only build for 32-bit
 2014-05-27 11:06:03 +00:00
Narayan Kamath
34c6cb4c1a am 6b5beb31: Merge "PacProccesor: Only build for 32-bit" 
* commit '6b5beb318b439b0b3aeabf42401bfed63bfbe2e2':
  PacProccesor: Only build for 32-bit
 2014-05-27 11:00:48 +00:00
Andreas Gampe
4694175624 PacProccesor: Only build for 32-bit 
PacProcessor relies on libpac from chromium, which is not built
for 64b right now.

(cherry picked from commit f8749200c06a8714ffd46f5e2ec81be57ad4f7f4)

Change-Id: Ic128e17b7437c130df29eeab3293b9c01f01d70b
 2014-05-27 11:56:22 +01:00
Jim Miller
6f3546796a am af103dd3: am 911176d7: am 607d5998: Fix crash in widget pager - DO NOT MERGE 
* commit 'af103dd39346d1bae3566cafbfcd1008bc6cef5c':
  Fix crash in widget pager - DO NOT MERGE
 2014-05-21 20:43:18 +00:00
Jim Miller
af103dd393 am 911176d7: am 607d5998: Fix crash in widget pager - DO NOT MERGE 
* commit '911176d7e6c8ba28ed7f7be63edcb17456f615fe':
  Fix crash in widget pager - DO NOT MERGE
 2014-05-21 20:39:41 +00:00
Jim Miller
911176d7e6 am 607d5998: Fix crash in widget pager - DO NOT MERGE 
* commit '607d59982a046d23770a7289be6272ad5983d6ae':
  Fix crash in widget pager - DO NOT MERGE
 2014-05-21 20:35:51 +00:00
Michael Wright
dc0c52f4f5 am 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami" 
* commit '7099995be5bfadcb03973d4ae952fd345bae264b':
  Extend support for nordic languages with Sami
 2014-05-19 18:23:50 +00:00
Michael Wright
7099995be5 am a84d24c3: Merge "Extend support for nordic languages with Sami" 
* commit 'a84d24c37a3e27cdd4f50807e9dc5fb6f14ea009':
  Extend support for nordic languages with Sami
 2014-05-19 18:19:20 +00:00
Mathieu Meisser
903c1ec383 Extend support for nordic languages with Sami 
Add access (via ralt combination) of Sami characters
into Danish, Norwegian and Swedish mappings.
Update Finnish mapping by fixing wrong Sami characters,
removing wrong ralt+shift mappings and adding support
with capslock+ralt for capital Sami's.
Remove unnecessary swap of MINUS and SLASH key
mapping in kcm.

Change-Id: I872ae2ad31272e8cf55ae1db01c7e30c6a40d5bc
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
 2014-05-17 11:53:28 +02:00
Michael Wright
d55fa5d584 am 3a123fda: am 0a5236a7: Merge "Add support for Latvian (qwerty) keyboard mapping" 
* commit '3a123fda8a48519601b8782845dfb176de16d871':
  Add support for Latvian (qwerty) keyboard mapping
 2014-05-17 01:09:43 +00:00
Michael Wright
3a123fda8a am 0a5236a7: Merge "Add support for Latvian (qwerty) keyboard mapping" 
* commit '0a5236a7cd3fa5a62a97f14a512dbeb5eb34772a':
  Add support for Latvian (qwerty) keyboard mapping
 2014-05-17 01:06:51 +00:00
Michael Wright
0a5236a7cd Merge "Add support for Latvian (qwerty) keyboard mapping" 2014-05-17 01:02:55 +00:00
Jim Miller
607d59982a Fix crash in widget pager - DO NOT MERGE 
Fixes bug 14299491

Change-Id: I3c94cbd7f7923dc5a429c9929bc432a5dd29d04f
 2014-05-16 22:18:49 +00:00
Jeff Sharkey
ddba067f0f am f521ee6f: am e3e2c471: Merge "Set ActionMode title to the number of selected files" 
* commit 'f521ee6fa9645bb944cf1f452cc40f4d8d580b4e':
  Set ActionMode title to the number of selected files
 2014-05-10 19:44:52 +00:00
Jeff Sharkey
f521ee6fa9 am e3e2c471: Merge "Set ActionMode title to the number of selected files" 
* commit 'e3e2c471b2504335e99ed15975c3c5c9dfbf2795':
  Set ActionMode title to the number of selected files
 2014-05-10 19:42:02 +00:00
Jeff Sharkey
e3e2c471b2 Merge "Set ActionMode title to the number of selected files" 2014-05-10 19:39:39 +00:00
Chris Wren
2dc97d48b9 am 90abb78b: am 678f7edd: Merge "Avoid SystemUI crash due to NPE" 
* commit '90abb78b51a35055f86dee35c4e391e74f325125':
  Avoid SystemUI crash due to NPE
 2014-05-08 21:08:24 +00:00
Chris Wren
90abb78b51 am 678f7edd: Merge "Avoid SystemUI crash due to NPE" 
* commit '678f7edd140f3914655bc600d207d3dcb986f881':
  Avoid SystemUI crash due to NPE
 2014-05-08 21:03:04 +00:00
Chris Wren
678f7edd14 Merge "Avoid SystemUI crash due to NPE" 2014-05-08 21:00:21 +00:00
Jeff Brown
4f8cd18880 am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev 
* commit '7f6ab17d414726868563105cd995b37dd519320b':
  Clean up some terminology related to interactive state.
 2014-05-01 23:29:13 +00:00
Jeff Brown
140ffc783c Clean up some terminology related to interactive state. 
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
 2014-05-01 15:22:27 -07:00
Michael Wright
1e67bcec50 am 263c36a1: am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper" 
* commit '263c36a144a66d30dd51abd7ca0120480e449aa5':
  NULL previous background bitmap upon changing wallpaper
 2014-04-30 01:24:32 +00:00
Michael Wright
263c36a144 am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper" 
* commit 'ade631eed0df228e343f2a00db653058ff588846':
  NULL previous background bitmap upon changing wallpaper
 2014-04-30 01:22:05 +00:00
Michael Wright
bba434af67 am 10884694: am 357c75e7: Merge "Add missing character combinations for international layouts" 
* commit '108846942f4296fa12b09dd70d60a21c69deace2':
  Add missing character combinations for international layouts
 2014-04-30 01:19:56 +00:00
Michael Wright
ade631eed0 Merge "NULL previous background bitmap upon changing wallpaper" 2014-04-30 01:19:10 +00:00
Michael Wright
108846942f am 357c75e7: Merge "Add missing character combinations for international layouts" 
* commit '357c75e74760933f05ff89352ee86dd540633782':
  Add missing character combinations for international layouts
 2014-04-30 00:07:11 +00:00
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
Mathieu Meisser
04f8532776 Add missing character combinations for international layouts 
Czech: add missing capslock for numbers and shift+ralt
mappings.
Slovak: fix wrong ralt mappings, add missing ralt mappings
and fixed wrong PLUS key character.
US intl: add missing capslock+ralt support.
Swiss French and Swiss German: add missing ralt mapping for key
numbers 4 and 5, and add missing capslock and capslock+
shift for SEMICOLON and APOSTROPHE.

Change-Id: I02c94bf13d5268d5d1e648c96b7251cb7564f233
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
 2014-04-29 16:52:40 +02:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
 2014-04-28 18:36:53 +00:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system. 
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
 2014-04-28 11:11:32 -07:00
Stefan Wysocki
22d3990273 Set ActionMode title to the number of selected files 
After change of orientation ActionMode is recreated without previously
set title. It needs to be updated in onCreateActionMode callback.

Change-Id: If5f36e8ad6d1b5cf04ed242611fd037969d73517
 2014-04-28 10:47:34 +02:00
Wink Saville
c79963c3cb am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error" 
* commit '1c1827a6402c3a1f38ba077289a9022f6e6d3f73':
  Telephony: Add functionality to handle ICC IO error
 2014-04-26 00:25:44 +00:00
Wink Saville
3f4867f49d Merge "Telephony: Add functionality to handle ICC IO error" 2014-04-25 23:58:11 +00:00
Elliott Hughes
02e857441f am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:59:05 +00:00