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

116072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
63c375d325 am 27b82632: Merge "Retain IME assignment if no windows accept input." into klp-dev 
* commit '27b826325c6201a0bb96efb1011c752408ece18a':
  Retain IME assignment if no windows accept input.
 2013-10-03 14:33:15 -07:00
Raph Levien
63b3eb6523 Fix Text appears on top of existing text when composing in gmail. 
Fix for bug 6473708. This patch changes from "last update wins" to
merging together the change regions, in the logic of deciding which
blocks need to be updated for painting, so that when there are multiple
changes batched for a draw, they're all taken into account.

Change-Id: I183d453c436125e5efec7031b4d61b43989653f9
 2013-10-03 14:28:54 -07:00
Craig Mautner
27b826325c Merge "Retain IME assignment if no windows accept input." into klp-dev 2013-10-03 21:28:38 +00:00
Vinit Deshapnde
e72aa641d3 am 3eb6e4b4: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 
* commit '3eb6e4b4e46d64f96cba2d92265f7d3da0b8106a':
  Fix EAP-TLS reconnect after reboot issue
 2013-10-03 14:23:28 -07:00
Vinit Deshapnde
3eb6e4b4e4 Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 2013-10-03 21:19:52 +00:00
Michael Wright
5203a8b50b Ensure WallpaperEngine has correct size information 
Currently it's possible for the WallpaperManagerService to receive a
request to change the desired wallpaper size between when it attaches
to the WallpaperService and when the Engine attaches back to it. This
means that the Engine will be created with the prior dimensions and
won't receive the update. Check to see if we're in this state and
make note to update the Engine once it attaches to ensure that the
Engine always has the correct dimensions.

Bug: 10853302
Change-Id: I8d5cd3371b269dbb4c0ff2d75c68529b69028ae5
 2013-10-03 14:16:42 -07:00
Robert Greenwalt
3ea0c99b67 Revert "Use a build-specific wifi country code" 
This reverts commit c33cd23c17c24df33550a6662cedfe60b323604a.

bug:11064682
Change-Id: I35825a7005e75f3abf02f23f31dee1cb7b101c31
 2013-10-03 21:15:54 +00:00
Craig Mautner
ae87962e3e Retain IME assignment if no windows accept input. 
Was skipping over the default assignment due to new null value for
windows (ag/361266).

Fixes bug 10987178.

Change-Id: I89efd41ab54b42de384eec84c5e937cc2a59d099
 2013-10-03 14:07:45 -07:00
Marco Nelissen
70cd68869d am fb45a2e9: Merge "Fix layoutlib build" into klp-dev 
* commit 'fb45a2e9cde403c4bb7ac62195795bcfad4b8da6':
  Fix layoutlib build
 2013-10-03 13:56:39 -07:00
Alex Klyubin
3c2ae2f4ed Reduce EntropyMixer seed size from 4096 to 512 bytes. 
The suggested seed size from Linux drivers/char/random.c is 512 bytes
rather than the 4096 bytes currently used.

Change-Id: I3dd55105f0a95ce9cda34b4cf08987b8a28c4ac9
 2013-10-03 13:56:09 -07:00
Marco Nelissen
fb45a2e9cd Merge "Fix layoutlib build" into klp-dev 2013-10-03 20:51:36 +00:00
Ben Gruver
b70c534900 Merge "Check the return value of listFiles on the ifw directory" 2013-10-03 20:45:58 +00:00
Marco Nelissen
7e6f2ee4d2 Fix layoutlib build 
Change-Id: Ica9f506ae06311d9bcd98bc11e64a8699d4f88cb
 2013-10-03 13:40:46 -07:00
Alan Viverette
a612595733 am 093318ee: Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev 
* commit '093318eeac4fd839c722a902612c2f00e1da2f71':
  Add importantForAccessibility mode to block entire hierarchy
 2013-10-03 13:35:23 -07:00
Alan Viverette
093318eeac Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev 2013-10-03 20:33:56 +00:00
Dianne Hackborn
22c298a5df am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev 
* commit '7192c6d7c6272c788e5e72ca416354491119fbfa':
  KLP/KitKat is now API 19.
 2013-10-03 12:26:31 -07:00
Jonathan Dixon
4730dda880 am 46507f4b: Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 
* commit '46507f4bc7ce4e77881391a1cc4ffa33fcb9ed59':
  Decouple construction of WebView, CookieSyncManager, WebViewDatabase
 2013-10-03 12:26:27 -07:00
Eino-Ville Talvala
31ea028e71 am b77b7bab: Merge "Camera2: Implement idle callbacks" into klp-dev 
* commit 'b77b7babd5da8b0e8517bfe30aaa904313926566':
  Camera2: Implement idle callbacks
 2013-10-03 12:20:24 -07:00
Dianne Hackborn
80e75d3946 am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '0d763a901e6f205c05fbec3123225a41672def45':
  Implement issue #11050739: Show swapped out RAM
 2013-10-03 12:20:12 -07:00
Dianne Hackborn
479dde0bc2 am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '6a6f96a296679c23f61b58b34985c8b25960a151':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-03 12:20:07 -07:00
Dianne Hackborn
e31f959c68 am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit 'd143d1ffd7656d1ad3ec4fbccd26564035bca787':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String
 2013-10-03 12:20:04 -07:00
Dianne Hackborn
2d3f995a65 am d585f954: Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit 'd585f95406f8b12e36ca436faea7113ecd8704fd':
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
 2013-10-03 12:19:56 -07:00
Daniel Sandler
97bc628fa7 am 0a660528: Merge "Goo goo ga joob." into klp-dev 
* commit '0a660528374f0cf4fc24eb610ea048c99cbd27a1':
  Goo goo ga joob.
 2013-10-03 12:19:51 -07:00
Jeff Sharkey
3adf2172c3 am fe5bf7a7: Merge "Fix mount path prefix checking." into klp-dev 
* commit 'fe5bf7a7c7dcf3353c345d18471b90426d9404a3':
  Fix mount path prefix checking.
 2013-10-03 12:19:48 -07:00
Marco Nelissen
05f56fc121 am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit '95867a652410b5f0193cf301f5737381bcbd3a88':
  Add PowerManager method to assign blame to a single uid
 2013-10-03 12:19:42 -07:00
John Spurlock
c4b2747827 am 8e0ca288: Window decor rect should not include the nav bar if hidden. 
* commit '8e0ca288fe3f7bbb7d25751fa00be218b3940f18':
  Window decor rect should not include the nav bar if hidden.
 2013-10-03 12:19:39 -07:00
Dianne Hackborn
7192c6d7c6 Merge "KLP/KitKat is now API 19." into klp-dev 2013-10-03 19:19:10 +00:00
Baligh Uddin
dd3162d940 am 778c2de0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '778c2de060473636ba7237a460b53a2f03f50f05':
  Import translations. DO NOT MERGE
 2013-10-03 12:19:08 -07:00
Baligh Uddin
7c15b5f753 am 8e68d5fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8e68d5fceb11446f3b9f87f73d1d4a10def45b76':
  Import translations. DO NOT MERGE
 2013-10-03 12:18:50 -07:00
Baligh Uddin
a928cfd0c0 am 65f57e5f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '65f57e5f49674b91cbf70c5f1aed6a5d16f5c0a8':
  Import translations. DO NOT MERGE
 2013-10-03 12:18:47 -07:00
Baligh Uddin
b318620758 am 68e70f9b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '68e70f9b144f474b3d63e1fbb04711a9e6bc9d19':
  Import translations. DO NOT MERGE
 2013-10-03 12:18:45 -07:00
Baligh Uddin
079fe0fba3 am a6b90f39: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a6b90f39f1372e45b6026517d3b7085e0448e765':
  Import translations. DO NOT MERGE
 2013-10-03 12:18:41 -07:00
John Spurlock
c20988e16b am 0ea4a5fb: Merge "Replace linear GradientDrawable with asset-based approach." into klp-dev 
* commit '0ea4a5fb8de62acb057651a4821af9b8699d9fcf':
  Replace linear GradientDrawable with asset-based approach.
 2013-10-03 12:18:36 -07:00
Craig Mautner
b690557c84 am 02fa2332: Merge "Make DimLayer size dependent on stack layout." into klp-dev 
* commit '02fa2332ac9f2972a0c651229ae456641f519363':
  Make DimLayer size dependent on stack layout.
 2013-10-03 12:18:33 -07:00
John Spurlock
c3752cfb6d am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev 
* commit 'e660ecc436c6bb9d3476298e97976a24b432482e':
  Store decor rects per window for transition cropping.
 2013-10-03 12:18:31 -07:00
John Reck
cdc605c695 am b885435c: Merge "Update liblayout" into klp-dev 
* commit 'b885435c7c77d0610f449e413766d30780eeda37':
  Update liblayout
 2013-10-03 12:18:28 -07:00
Christopher Tate
b61c82190d am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev 
* commit 'ef4f8222fc671d2453e4bcb35978afdfa9734b78':
  Fix cross-process race in initial files/cache dir creation
 2013-10-03 12:18:26 -07:00
Adam Lesinski
6d90862f23 am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev 
* commit 'd65825ab1cdbfd88122beaaad8cf815434cbf46d':
  Private flags are masked in correct variable
 2013-10-03 12:18:23 -07:00
Svetoslav
36f38f4efc am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev 
* commit '9907a109ced54cffc7b4f5e9e81365c78df1f1a9':
  Fix screen magnifier scaling due to ScaleGestureDetector changes.
 2013-10-03 12:18:17 -07:00
John Reck
47dc3248e0 am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev 
* commit '9a93f6f039920c2e24cdef172c9cbd39586b949c':
  Reduce max recents on lowram
 2013-10-03 12:18:14 -07:00
Dianne Hackborn
6bc3789b39 KLP/KitKat is now API 19. 
Bug: 10348975

Change-Id: I19bf1a56064deda2e59085520960aac8ce3a825b
 2013-10-03 12:17:31 -07:00
Jonathan Dixon
46507f4bc7 Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 2013-10-03 18:52:56 +00:00
Eino-Ville Talvala
b77b7babd5 Merge "Camera2: Implement idle callbacks" into klp-dev 2013-10-03 18:33:54 +00:00
Dianne Hackborn
0d763a901e Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 2013-10-03 17:45:42 +00:00
Dianne Hackborn
6a6f96a296 Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 2013-10-03 17:44:38 +00:00
Dianne Hackborn
d143d1ffd7 Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 2013-10-03 17:44:18 +00:00
Dianne Hackborn
fd6c7b12c3 Fix issue #10378741: configupdater needs to be explicit when it calls startService() 
Not enough time to fix everything, so instead we'll make it a warning
in this release and finish up turning it into a target-SDK based
exception in the next release.

Change-Id: I5aae64a1225a145f03ba4162238b53d5e401aba2
 2013-10-03 10:42:26 -07:00
Mike Lockwood
84b6292c33 move libandroidfw to frameworks/native 
Change-Id: Ic5b8a2742c7141156ab0f00ca29097bfe92bce60
 2013-10-03 10:30:18 -07:00
Dianne Hackborn
d585f95406 Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 2013-10-03 17:23:04 +00:00
Daniel Sandler
0a66052837 Merge "Goo goo ga joob." into klp-dev 2013-10-03 17:20:21 +00:00