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
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
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
Selim Cinek
c3db8011d7
am 58e99f56: am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit '58e99f564d552984d5088969a2aa827812db10ac':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 23:10:32 +00:00
Selim Cinek
58e99f564d
am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit 'b6e077dcbe1034007fd52b48951637a9be4bab74':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 23:04:57 +00:00
Selim Cinek
b6e077dcbe
am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit '7718fc1291c73576417f0c25d88f5105f7ae7365':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 22:15:37 +00:00
Selim Cinek
7718fc1291
Fixed crash when setting wallpaper with built in rotation
...
If an image had a built in rotation, a crash could occur,
when setting it. An example was a panorama image which had
a rotation of 90 degrees
Change-Id: Iede8226dac3a40f08d39a69162eb388e6aba97ec
Bug: 13507421
2014-03-27 19:34:01 +00:00
Olivier Gay
d2923266ae
Add support for additional international keyboard mappings
...
Add kcm mapping files for Arabic, Greek, Hebrew, Lithuanian
and Spanish (Latin).
Change-Id: I35cb2a4d6e016c6f565fba05710ba1626452fe68
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-03-27 17:49:52 +01:00
Selim Cinek
f7805dd77a
am 7290b56b: am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
...
* commit '7290b56b51119070c549d88d3946d61e34f62ba3':
Fixed wallpaper bug where wrong size was taken when cropping
2014-03-25 03:54:14 +00:00
Selim Cinek
7290b56b51
am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
...
* commit '8ae8689d165299bd0bbd0e04bff987dad352c8f5':
Fixed wallpaper bug where wrong size was taken when cropping
2014-03-25 03:46:27 +00:00
John Spurlock
e2cae0a657
am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
...
* commit '2b45d84e24946d0cbbcc577ca3e195c0db687c9a':
Unhide Notification kind, rename to category.
2014-03-24 17:44:53 +00:00
Selim Cinek
8ae8689d16
am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
...
* commit 'c41853cee89b391cd2d4d93205ea69c746ccfa4c':
Fixed wallpaper bug where wrong size was taken when cropping
2014-03-24 16:25:09 +00:00
John Spurlock
cf44a124ab
Unhide Notification kind, rename to category.
...
Change-Id: I8e6d5a30dff519d7ed4f38e018646dd2bc55db33
2014-03-24 11:02:36 -04:00
Selim Cinek
c41853cee8
Fixed wallpaper bug where wrong size was taken when cropping
...
When cropping, the selected area of the image was incorrectly
cropped to the size of the view instead of the size of the image
Bug: 13617446
Change-Id: If54a0891fa2cdeee70ba63752874f1543d401701
2014-03-24 13:53:06 +01:00
Selim Cinek
d9e5761a4e
am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image
...
* commit '04ea3ca000312f4eccc44347c37c49471081b852':
Disable Set Wallpaper button while loading image
2014-03-21 22:52:52 +00:00
Selim Cinek
04ea3ca000
am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image
...
* commit '50ac19e9b8d3435eab44cacbb62c5081f44df910':
Disable Set Wallpaper button while loading image
2014-03-21 22:46:33 +00:00
Selim Cinek
50ac19e9b8
am ba126c09: Disable Set Wallpaper button while loading image
...
* commit 'ba126c09a5c00cb0a96da6ece0b4ab4d7ed2d8cb':
Disable Set Wallpaper button while loading image
2014-03-21 22:41:07 +00:00
Selim Cinek
ba126c09a5
Disable Set Wallpaper button while loading image
...
Bug: 13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
(cherry picked from commit 0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)
2014-03-21 22:15:10 +00:00
Unsuk Jung
7bde0fc751
am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
...
* commit '2270ac96d5d8ab6c2d1601f8dd5d8409762fb35f':
Change wallpaper sizing
2014-03-21 19:17:01 +00:00
Unsuk Jung
2270ac96d5
am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
...
* commit '8114c3d02d6bf72c0627aea6ecf738074ac3f232':
Change wallpaper sizing
2014-03-21 19:11:01 +00:00
Unsuk Jung
8114c3d02d
am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
...
* commit '1a70f391608e82fcc5550c76ccc7bf8bac5bbc10':
Change wallpaper sizing
2014-03-21 19:05:40 +00:00
Michael Jurka
3368a63c64
Change wallpaper sizing
...
Bug: 11997581
- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary
Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
(cherry picked from commit 824a4b5ea4c58592b9b2ebe787f5fb6974e7cabe)
2014-03-21 10:29:27 +00:00
Jim Miller
e397d90fbd
am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE
...
* commit 'e0683de51e56d7a95c88c5c744f45c72a54a95bc':
Fix the build. DO NOT MERGE
2014-03-20 16:24:01 +00:00
Jim Miller
aebe3b6ca4
am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
...
* commit 'abde0aaa7958976b8f3a66e348d6a5152b0d838e':
Attempt to fix a bug where SIM progress dialog gets stuck.
2014-03-20 15:47:31 +00:00
Jim Miller
e0683de51e
am 37050124: am a413a4ae: Fix the build. DO NOT MERGE
...
* commit '370501243685a39a52b6e389b97711b906d2d4f8':
Fix the build. DO NOT MERGE
2014-03-20 02:47:04 +00:00
Chris Craik
9208bb4a2b
am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
...
* commit '00efaea980c7a9f84f326b22aef740cb5438d282':
Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
2014-03-20 02:30:15 +00:00
Chris Craik
dac298005c
Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
2014-03-20 02:19:54 +00:00
Jim Miller
3705012436
am a413a4ae: Fix the build. DO NOT MERGE
...
* commit 'a413a4ae3280be6c45e84e85d7be3379a5cb51e4':
Fix the build. DO NOT MERGE
2014-03-20 01:49:31 +00:00
Jim Miller
a413a4ae32
Fix the build. DO NOT MERGE
...
Change-Id: Ic34e351f86cfb8299b666e860c067d905cce6747
2014-03-19 18:38:09 -07:00
Jim Miller
abde0aaa79
am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
...
* commit '375ff2c4a7b42d6dfd333e0ffa351be88fdab034':
Attempt to fix a bug where SIM progress dialog gets stuck.
2014-03-20 01:14:40 +00:00
Jim Miller
375ff2c4a7
am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
...
* commit '2598fbd71a2109ab307d32935a13fa1eab150e8d':
Attempt to fix a bug where SIM progress dialog gets stuck.
2014-03-20 01:08:43 +00:00
Jim Miller
2598fbd71a
Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
2014-03-20 01:04:13 +00:00
Adam Cohen
14c1fb4d1b
am 5b137544: am 0dca4fc9: am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
...
* commit '5b1375445afef5ce0cbceaa69fc44667e3e358fb':
[DO NOT MERGE] Fix wallpaper cropping bugs
2014-03-19 20:30:25 +00:00
Adam Cohen
e4498ce4b7
am 55d9907d: am cc8fbb59: am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev
...
* commit '55d9907d595d5938dba52298fe82693b1799687b':
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
2014-03-19 20:30:21 +00:00
Adam Cohen
5b1375445a
am 0dca4fc9: am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
...
* commit '0dca4fc929638755454cc46a4eb21e86b3fcb0c8':
[DO NOT MERGE] Fix wallpaper cropping bugs
2014-03-19 20:24:02 +00:00
Adam Cohen
55d9907d59
am cc8fbb59: am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev
...
* commit 'cc8fbb5999687e9413a9b0a8576c21116fc558db':
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
2014-03-19 20:23:59 +00:00
Adam Cohen
0dca4fc929
am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
...
* commit '55b523cc3fac7fd008094b690a0fa8c5527d569c':
[DO NOT MERGE] Fix wallpaper cropping bugs
2014-03-19 20:18:41 +00:00
Adam Cohen
cc8fbb5999
am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev
...
* commit '8acbe8887a753c0d2e86153d00cf426781c19cf2':
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
2014-03-19 20:18:37 +00:00
Adam Cohen
55b523cc3f
Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
2014-03-19 20:16:11 +00:00
Glenn Kasten
2fb4a6bb9e
am 48988921: am d6408735: Merge "PacProcessor should be 32 bit only."
...
* commit '4898892118c00b3de7a9713d38b32c3dcaf00c91':
PacProcessor should be 32 bit only.
2014-03-19 19:42:43 +00:00
Michael Jurka
929e75e8d0
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
...
Bug: 12034934
Change-Id: Ice1b1140bd6e351dd4e520f555f245d84a645aac
(cherry picked from commit 2ab14daebac46307d2364733481edc3115bbf98c)
2014-03-19 17:57:17 +00:00
Michael Jurka
c82618c660
[DO NOT MERGE] Fix wallpaper cropping bugs
...
- take into account that image decoder might not
respect inSampleSize
- check rounded values so we don't have crop rects
that lie outside a bitmap's dimensions
- correctly set initial scale on bitmaps that are
larger than the screen size
- switch to using asynctask when setting wallpaper
dimensions
(cherry picked from commit e39c9a953ca11319b747b3aa79f4ccd082b775b7)
Change-Id: I43372f0bff37f139c8bc83f9956a967d0b4a8708
2014-03-19 17:56:55 +00:00