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

112792 Commits

Author SHA1 Message Date
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
Marco Nelissen
fb45a2e9cd Merge "Fix layoutlib build" into klp-dev 2013-10-03 20:51:36 +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 : Show swapped out RAM" into klp-dev 
* commit '0d763a901e6f205c05fbec3123225a41672def45':
  Implement issue : Show swapped out RAM
 2013-10-03 12:20:12 -07:00
Dianne Hackborn
479dde0bc2 am 6a6f96a2: Merge "Fix issue : configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '6a6f96a296679c23f61b58b34985c8b25960a151':
  Fix issue : 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 : AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit 'd143d1ffd7656d1ad3ec4fbccd26564035bca787':
  Fix issue : AppOpsManager.startWatchingMode should take a String
 2013-10-03 12:20:04 -07:00
Dianne Hackborn
2d3f995a65 am d585f954: Merge "Fix issue : CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit 'd585f95406f8b12e36ca436faea7113ecd8704fd':
  Fix issue : 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 : Show swapped out RAM" into klp-dev 2013-10-03 17:45:42 +00:00
Dianne Hackborn
6a6f96a296 Merge "Fix issue : 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 : AppOpsManager.startWatchingMode should take a String" into klp-dev 2013-10-03 17:44:18 +00:00
Dianne Hackborn
fd6c7b12c3 Fix issue : 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
Dianne Hackborn
d585f95406 Merge "Fix issue : 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
Dianne Hackborn
4a7d824c3b Fix issue : CTS: android.os.cts.ParcelTest#testReadBundle... 
...fails from KRS84 across all platforms

My fix for issue  was wrong, wrong, wrong.  The problem was
actually just a stupid mistake in ArrayMap.erase().  This makes it
all right.

Change-Id: I762f7a2d5100bceb86a091ab3d6368edc21b4266
 2013-10-03 10:19:20 -07:00
Jeff Sharkey
fe5bf7a7c7 Merge "Fix mount path prefix checking." into klp-dev 2013-10-03 17:18:38 +00:00
Jonathan Dixon
eb9e801424 Decouple construction of WebView, CookieSyncManager, WebViewDatabase 
Bug 10932261

Most of this flow exists purely to get the Context from
CookieSyncManager.createInstance over to WebViewDatabaseClassic. Make
that depenency more explicit (with a TODO to remove it) and this allows
a much simpler CookieSyncManager implementation for the normal case.
Note after this patch, CookieSyncManager.getInstance() is technically fine
to call without a prior call to createInstance, but retaining the
ordering requirement as a convenience for anyone developing on new OS
but still supporting the older versions.
(Note that CookieSyncManager instance is not required for correct
operation of either existing webview, so these changes only impact
the public API contract of object lifetimes, not the underlying
implementation)

Change-Id: I51fdd6622704f1c749277fee6df2f84ac4c704d2
 2013-10-03 17:53:33 +01:00
Marco Nelissen
95867a6524 Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 2013-10-03 16:34:57 +00:00
Jeff Sharkey
5786a278a5 Fix mount path prefix checking. 
Uncovered as part of writing CTS tests.

Bug: 10577541
Change-Id: I7832bcd551bedeea0b2ee5d6926aba6ac9bd0fd2
 2013-10-03 09:32:01 -07:00
Marco Nelissen
d983ba5cac Add PowerManager method to assign blame to a single uid 
Currently used by audioflinger to account for recording wakelocks.
b/10985160

Change-Id: I18fc8487f2a197bf02b5269a4bcae9e75b6c2207
 2013-10-03 08:49:36 -07:00
John Spurlock
8e0ca288fe Window decor rect should not include the nav bar if hidden. 
Bug:11059726
Change-Id: Ia445af030ac34da8e361d909978caa3f2793cfda
 2013-10-03 11:46:06 -04:00
Eino-Ville Talvala
e841d4e165 Camera2: Implement idle callbacks 
- Rework camera callback binder interface
- Connect up idle, disconnect callbacks
- A few unit tests for shutter firing and idle use

Bug: 10549462
Change-Id: I8455a8a0561e366b7edeef6b101682be2ec44d79
 2013-10-03 15:44:32 +00:00
Wink Saville
3ec8e7fb79 Use networkType to display wifi and mobile notification separately. 
There are two bugs one is I was clearing the notification in
CaptivePortalTracker when entering the ActivateState. (double check
according to bug 5021626 we should be calling enter)

Second is we could have the need to display both icons but can't
because we only allow one.

The solution I'm proposing here is to allow two notifications and
have then controlled separately.

Bug: 10886908
Change-Id: I30e7130bc542535492d175640a4990c592f32806
 2013-10-03 08:34:46 -07:00
Daniel Sandler
2fdb68b3c2 Goo goo ga joob. 
Bug: 10240151
Change-Id: I7b702c397cb9f5ac3294ae27ffc6185df6a64678
 2013-10-03 00:19:35 -04:00