6564 Commits

Author SHA1 Message Date
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
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
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
3f4867f49d Merge "Telephony: Add functionality to handle ICC IO error" 2014-04-25 23:58:11 +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
38250d9b84 Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
2014-04-18 16:39:47 -07: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
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
99a2333ec2 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-24 16:31:51 +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
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
ace827ccf1 am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image
* commit '50ac19e9b8d3435eab44cacbb62c5081f44df910':
  Disable Set Wallpaper button while loading image
2014-03-21 23:09:43 +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
b35962f77c am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '8114c3d02d6bf72c0627aea6ecf738074ac3f232':
  Change wallpaper sizing
2014-03-21 19:10:57 +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
bab95c0172 am 37050124: am a413a4ae: Fix the build. DO NOT MERGE
* commit '370501243685a39a52b6e389b97711b906d2d4f8':
  Fix the build.  DO NOT MERGE
2014-03-20 16:37:44 +00:00
Jim Miller
dca18258e8 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 15:42:20 +00:00
Chris Craik
726104a62a 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:29:46 +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
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
e5d754f941 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:27:47 +00:00
Adam Cohen
6091b4ce81 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:27:44 +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
36a107ddbd am 48988921: am d6408735: Merge "PacProcessor should be 32 bit only."
* commit '4898892118c00b3de7a9713d38b32c3dcaf00c91':
  PacProcessor should be 32 bit only.
2014-03-19 19:43:17 +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
Narayan Kamath
58f9a645e1 PacProcessor should be 32 bit only.
It depends on external/v8, which isn't ready for 64 bit yet.

Change-Id: Ibc9705665b81d3667826dedd6217f2eb6d451c81
2014-03-19 11:39:43 +00:00
Jeff Brown
b73417fc10 am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
* commit 'c9a7eeba15641da5a5bc8499e813e6c2211506ff':
  Refresh cast icon assets to improve visual contrast.
2014-03-19 00:31:06 +00:00
Jeff Brown
c9a7eeba15 am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
* commit '4cb1bc2877f8562e6d349a6c737a3055ef4eaa29':
  Refresh cast icon assets to improve visual contrast.
2014-03-19 00:25:41 +00:00
Jeff Brown
f1e8d36327 Refresh cast icon assets to improve visual contrast.
Bug: 13473719
Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa
2014-03-18 14:40:43 -07:00
Selim Cinek
47a023085b am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height
* commit '9c3fc0cc6003c4f66f32d8e5f22a4f3e7d22f817':
  DO NOT MERGE - Fixed crash for odd image width/height
2014-03-14 20:51:43 +00:00
Selim Cinek
9c3fc0cc60 am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height
* commit 'eb95e74e21a0e910704ca2fd67e074ab640bfba3':
  DO NOT MERGE - Fixed crash for odd image width/height
2014-03-14 20:47:34 +00:00
Selim Cinek
eb95e74e21 DO NOT MERGE - Fixed crash for odd image width/height
Due to an internal rounding in the renderer, the calculations
for the cropping area could be slightly offset, getting out
of the image boundaries. I sanitized the rect by ensuring they
are inside the image.

Bug: 12174629
Change-Id: Icc37790732ddd479631b898b23c05501d2dcd5be
2014-03-14 20:11:17 +00:00
Svetoslav
eccd4a5f92 am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit 'fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
  PrintSpooler crash if printer is reported to have only one color mode.
2014-03-14 04:12:42 +00:00
Adrian Roos
e2c6391587 am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '16858164c73f0696d12161e97bad9cb22c55e603':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-14 04:12:39 +00:00
jshe32X
7670b2bd49 NULL previous background bitmap upon changing wallpaper
Step to reproduce it on Nexus 10 with 4.4.2(KOT49H):
1. Long press on home screen.
2. Choose wallpaper from Wallpapers.
3. Select new wallpaper and set it.
4. Repeat step 1-3 several times.
See black background instead of the wallpaper.

There are two binder objects who hold reference to the
ImageWallpaper$DrawableEngine, which keeps the big chunk
bitmap from being recycled.
One is WallpaperService$IWallpaperEngineWrapper. The client
references went away slowly, maybe several minutes after
changing wallpaper. Then the finalizer has to been executed
to GC it.
The other one is WallpaperService$Engine$BaseIWindow. Don't
know who still held reference to it even after the window
was removed.
Anyway, let the bitmap be GCed first.

Change-Id: I27f6971a3edd26472b69e59b542b27fd7c8e7b90
Signed-off-by: jshe32X<jianchunx.shen@intel.com>
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
2014-03-14 08:09:49 +08:00
Svetoslav
fc1d04714e am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '11b7d9fa6685e742f5b3e3235a8e6e4920dbed02':
  PrintSpooler crash if printer is reported to have only one color mode.
2014-03-13 17:31:03 +00:00
Svetoslav
11b7d9fa66 Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 2014-03-13 17:26:44 +00:00
Adrian Roos
16858164c7 am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit 'cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-13 17:26:26 +00:00
Adrian Roos
91c9561cbe DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

Bug: 13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
2014-03-13 13:42:29 +00:00