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

6633 Commits

Author SHA1 Message Date
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
Elliott Hughes
cacbe1b1ef Use the suggested public API instead of libcore.os. 
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
 2014-04-24 16:19:27 -07:00
Baligh Uddin
89ed56fa6c Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:07:52 +00:00
Baligh Uddin
d14bb3cfb9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:10 +00:00
Baligh Uddin
abd2a4a449 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:06 +00:00
Baligh Uddin
c2c527a6f4 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:03 +00:00
Baligh Uddin
13c48fba16 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:03 +00:00
Baligh Uddin
611dd7b70a Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:03 +00:00
Baligh Uddin
2d45d4de48 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:57 +00:00
Baligh Uddin
5eb7136de9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:55 +00:00
Baligh Uddin
71b82aedca Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:55 +00:00
Baligh Uddin
2d6e077d1d Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:48 +00:00
Baligh Uddin
42c0488a4b Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:44 +00:00
Baligh Uddin
cf361e2670 Import translations. DO NOT MERGE 
Change-Id: Ieceadfdafb3e1353a30494c8a9731efcf91b9e8b
Auto-generated-cl: translation import
 2014-04-22 17:54:46 -07:00
Baligh Uddin
2e9dc0e241 Import translations. DO NOT MERGE 
Change-Id: Iae8e8f588200714d11fe7dced5aab7ec63181e8f
Auto-generated-cl: translation import
 2014-04-22 17:12:07 -07:00
Baligh Uddin
c0be1c09ca Import translations. DO NOT MERGE 
Change-Id: Idf24bec3b74bbe1abc88c2a3c2da451be9ed5c02
Auto-generated-cl: translation import
 2014-04-22 17:11:22 -07:00
Baligh Uddin
3870b9dd83 Import translations. DO NOT MERGE 
Change-Id: I3106f51a639078291c298ca4bbd75062e788a313
Auto-generated-cl: translation import
 2014-04-22 17:09:18 -07:00
Baligh Uddin
1fa38d2165 Import translations. DO NOT MERGE 
Change-Id: I1aa31fe5b005c2cdef0b250806d682141cdf4fc3
Auto-generated-cl: translation import
 2014-04-22 17:08:37 -07:00
Baligh Uddin
8e54756f90 Import translations. DO NOT MERGE 
Change-Id: I236254c3ae3302004f19821a7d7022ae49f6e908
Auto-generated-cl: translation import
 2014-04-22 17:05:01 -07:00
Baligh Uddin
bd41f66b90 Import translations. DO NOT MERGE 
Change-Id: Ia514ffa26785292a7659a5e3950cc3125d50736e
Auto-generated-cl: translation import
 2014-04-22 17:04:17 -07:00
Baligh Uddin
e5a1728e2f Import translations. DO NOT MERGE 
Change-Id: Ib7d1feda99c656bcea0c0efc41e9f04bda7049b9
Auto-generated-cl: translation import
 2014-04-22 16:39:03 -07:00
Baligh Uddin
368a984e1b Import translations. DO NOT MERGE 
Change-Id: I6ac555548303cd6b32be846c0479bbe78a977c3a
Auto-generated-cl: translation import
 2014-04-22 16:37:07 -07:00
Baligh Uddin
f80cf264de Import translations. DO NOT MERGE 
Change-Id: Iae11d6890917425aa6c6269d46372f4e6d6c08a2
Auto-generated-cl: translation import
 2014-04-22 16:36:32 -07:00
Baligh Uddin
0ee991bc0d Import translations. DO NOT MERGE 
Change-Id: I757cae4af2ba6dfac51383bf48f17708e44adf6f
Auto-generated-cl: translation import
 2014-04-22 16:35:44 -07:00
Baligh Uddin
78448af37f Import translations. DO NOT MERGE 
Change-Id: Idc8ada2c34c0846b4ad8c3094e78d6beff2cc38e
Auto-generated-cl: translation import
 2014-04-22 16:35:06 -07:00
Ying Wang
717884ea10 am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 
* commit '9df9ad7e29aecf88fdeb026bda07963ab6789396':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
 2014-04-21 13:45:33 +00:00
Ying Wang
38250d9b84 Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs. 
Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
 2014-04-18 16:39:47 -07:00
Narayan Kamath
286a247e4c am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies." 
* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
  Re-implement native library search and copies.
 2014-04-10 09:26:44 +00:00
Ramin Zaghi
1378aba7ae Re-implement native library search and copies. 
We now use a two step approach :

- First we look through the list of shared libraries in an
  APK, and choose an ABI based on the (priority)  list of ABIs
  a given device supports.
- Then we look through the list of shared libraries and copy
  all shared libraries that match the ABI we've selected.

This fixes a long-standing bug where we would sometimes copy
a mixture of different ABIs to the device, and also allows us
to clearly pick an ABI to run an app with.

The code in NativeLibraryHelper has been refactored so that all
file name validation & matching logic is done in a single place
(NativeLibrariesIterator). This allows us to avoid a lot of
redundant logic and straightens out a few corner cases (for eg.
where the abi determination & copying logic do not agree on
what files to skip).

bug: https://code.google.com/p/android/issues/detail?id=65053
bug: 13647418

Change-Id: I34d08353f24115b0f6b800a7eda3ac427fa25fef
Co-Authored-By: Zhenghua Wang <zhenghua.wang0923@gmail.com>
Co-Authored-By: Ramin Zaghi <ramin.zaghi@arm.com>
Co-Authored-By: Narayan Kamath <narayan@google.com>
 2014-04-09 17:16:40 +01:00
Michael Wright
c9b937bbfa am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings" 
* commit '6a14146b379b33a6bf947f02b2550fa97c5619b6':
  Add support for additional international keyboard mappings
 2014-03-28 23:05:36 +00:00