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

114288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
2c64e2be0c am 70cd6886: am fb45a2e9: Merge "Fix layoutlib build" into klp-dev 
* commit '70cd68869d04b56883a8d2fa34f0468d730f227d':
  Fix layoutlib build
 2013-10-03 15:41:48 -07:00
Alan Viverette
92a827b816 am a6125957: am 093318ee: Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev 
* commit 'a612595733483213d757fd1bb9c976b06d61a38b':
  Add importantForAccessibility mode to block entire hierarchy
 2013-10-03 15:41:41 -07:00
Dianne Hackborn
8a5f7ab6e1 am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev 
* commit '22c298a5df7a9fa53826ecfa4925372b1eebf8bc':
  KLP/KitKat is now API 19.
 2013-10-03 15:39:44 -07:00
Jonathan Dixon
34eb4f3d16 am 4730dda8: am 46507f4b: Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 
* commit '4730dda880097b1c25096e323be8a527fd6e0b09':
  Decouple construction of WebView, CookieSyncManager, WebViewDatabase
 2013-10-03 15:39:42 -07:00
Eino-Ville Talvala
61e5349dfb am 31ea028e: am b77b7bab: Merge "Camera2: Implement idle callbacks" into klp-dev 
* commit '31ea028e71af59ebf7b5fe9dd215e61b8d86d162':
  Camera2: Implement idle callbacks
 2013-10-03 15:39:39 -07:00
Dianne Hackborn
7c55154d47 am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '80e75d3946fd4c5cdd913d217df1b8d32ec464ee':
  Implement issue #11050739: Show swapped out RAM
 2013-10-03 15:39:36 -07:00
Dianne Hackborn
61509ca5ba am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '479dde0bc21a1e9d0bb8dad801cfe015f6c7e416':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-03 15:39:33 -07:00
Dianne Hackborn
5eaac1ce33 am e31f959c: am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit 'e31f959c68a9dfa00daa5b5580ced31badfb1127':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String
 2013-10-03 15:39:30 -07:00
Dianne Hackborn
495fe22d68 am 2d3f995a: am d585f954: Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit '2d3f995a65f2acd60559b1db57ae3ab2346a1df0':
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
 2013-10-03 15:39:27 -07:00
Daniel Sandler
12aea9d797 am 97bc628f: am 0a660528: Merge "Goo goo ga joob." into klp-dev 
* commit '97bc628fa737a87b0b855b76404fd1527eca67f8':
  Goo goo ga joob.
 2013-10-03 15:39:24 -07:00
Jeff Sharkey
9701c4ef1d am 3adf2172: am fe5bf7a7: Merge "Fix mount path prefix checking." into klp-dev 
* commit '3adf2172c35b1fae86244641c6bb051c8ba39041':
  Fix mount path prefix checking.
 2013-10-03 15:39:21 -07:00
Marco Nelissen
d9ff894eae am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit '05f56fc121e176ef4e227639a7b636a875f38037':
  Add PowerManager method to assign blame to a single uid
 2013-10-03 15:39:18 -07:00
John Spurlock
12585551f4 am c4b27478: am 8e0ca288: Window decor rect should not include the nav bar if hidden. 
* commit 'c4b274782793e33d58cb119b3c294bbb31daea14':
  Window decor rect should not include the nav bar if hidden.
 2013-10-03 15:39:15 -07:00
Baligh Uddin
1b7ed578f2 am dd3162d9: (-s ours) am 778c2de0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'dd3162d9407c030036796f61e30eb2ba38ac88df':
  Import translations. DO NOT MERGE
 2013-10-03 15:39:12 -07:00
Baligh Uddin
18dc3d1f0a am 7c15b5f7: (-s ours) am 8e68d5fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7c15b5f753d5fecae0e7a085cb9bcce1c8ce02ac':
  Import translations. DO NOT MERGE
 2013-10-03 15:39:10 -07:00
Baligh Uddin
30d87502bf am a928cfd0: (-s ours) am 65f57e5f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a928cfd0c06f1c1c831e6909fc83e44ba994b30f':
  Import translations. DO NOT MERGE
 2013-10-03 15:39:06 -07:00
Baligh Uddin
608d9db23d am b3186207: (-s ours) am 68e70f9b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b318620758067e60a28624110a5af13fd7810cef':
  Import translations. DO NOT MERGE
 2013-10-03 15:39:04 -07:00
Baligh Uddin
b67ca3634c am 079fe0fb: (-s ours) am a6b90f39: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '079fe0fba31b0781eca73db934dfe2290fea3891':
  Import translations. DO NOT MERGE
 2013-10-03 15:39:01 -07:00
John Spurlock
89862d73ce am c20988e1: am 0ea4a5fb: Merge "Replace linear GradientDrawable with asset-based approach." into klp-dev 
* commit 'c20988e16b5a1129c28ca4d378456bbdc60e19e3':
  Replace linear GradientDrawable with asset-based approach.
 2013-10-03 15:38:58 -07:00
Craig Mautner
71bbf1086d am b690557c: am 02fa2332: Merge "Make DimLayer size dependent on stack layout." into klp-dev 
* commit 'b690557c84b33aa04d6fecf3e2c9fb737291a564':
  Make DimLayer size dependent on stack layout.
 2013-10-03 15:38:55 -07:00
John Spurlock
bee8af8207 am c3752cfb: am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev 
* commit 'c3752cfb6d5381795433ccdbcd8f84cada832790':
  Store decor rects per window for transition cropping.
 2013-10-03 15:38:52 -07:00
John Reck
35f2dcd02c am cdc605c6: am b885435c: Merge "Update liblayout" into klp-dev 
* commit 'cdc605c69597649c8e71161791ae64be48ce1f11':
  Update liblayout
 2013-10-03 15:38:50 -07:00
Christopher Tate
64884eef54 am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev 
* commit 'b61c82190d9d16cd4a7dff8af81aff7f43c19cc4':
  Fix cross-process race in initial files/cache dir creation
 2013-10-03 15:38:47 -07:00
Adam Lesinski
b2db2fbce3 am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev 
* commit '6d90862f2387d24c28e9d1c8f080cb9a4ff15011':
  Private flags are masked in correct variable
 2013-10-03 15:38:44 -07:00
Svetoslav
a0867328db am 36f38f4e: am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev 
* commit '36f38f4efc52f195a7f30f986ed3e6633aa179f4':
  Fix screen magnifier scaling due to ScaleGestureDetector changes.
 2013-10-03 15:38:42 -07:00
John Reck
cd6a2d3079 am 47dc3248: am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev 
* commit '47dc3248e09002a5a55dc427f752da8ebd623868':
  Reduce max recents on lowram
 2013-10-03 15:38:38 -07:00
Jim Miller
44c4dd9316 am 8990e28b: Merge "Update default keyguard clock to new UX specification" into klp-dev 
* commit '8990e28b5a7fcbd5e80862a74fff621c18aca2a6':
  Update default keyguard clock to new UX specification
 2013-10-03 15:38:25 -07:00
Adam Powell
d6239b9229 Merge "Add a scrubber to keyguard; layout tweaks" into klp-dev 2013-10-03 22:35:35 +00:00
Jim Miller
8990e28b5a Merge "Update default keyguard clock to new UX specification" into klp-dev 2013-10-03 22:32:25 +00:00
Alex Klyubin
aa947f1531 am a9bce468: am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG." 
* commit 'a9bce46876d6f1f82727ab6922748fcc6b43c767':
  Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
 2013-10-03 15:21:08 -07:00
Jim Miller
b0da1e70ad Update default keyguard clock to new UX specification 
Change-Id: I0d5f302d8bd5922acd45cfe1de42cb76cebc02e5
 2013-10-03 15:19:21 -07:00
Alex Klyubin
a9bce46876 am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG." 
* commit '84742149257554e804b155d15b0af762d6f737ca':
  Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
 2013-10-03 15:17:49 -07:00
Alex Klyubin
8474214925 Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG." 2013-10-03 22:12:36 +00:00
Alex Klyubin
6ab3d20d3c Make EntropyMixer mix in output of Hardware RNG into Linux RNG. 
On devices with Hardware RNG (HW RNG), this makes EntropyMixer
periodically (every three hours) read 512 bytes from HW RNG and mix
them into the Linux RNG.

This is done without increasing Linux RNG's entropy estimates to
avoid having to trust the quality of the HW RNG. This approach cannot
reduce the quality of the Linux RNG output, but may increase it.

Change-Id: Ifde851004301ffd41b2189151a64a0c5989c630f
 2013-10-03 15:07:37 -07:00
Yuhao Zheng
d2078bc8c9 New Telephony APIs to return MMS UA and UAProfUrl 
Added two public APIs under TelephonyManager to return MMS UserAgent and
UAProfUrl strings, for apps that handle SMS/MMS.

Bug: 11054501

Change-Id: Ifa1a64990fa2bf7d0e340d784a9672bf79525338
 2013-10-03 15:06:21 -07:00
Alex Klyubin
3e64aa117a am 6a603e7b: am 1a07229b: Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes." 
* commit '6a603e7be9036c22d61a4977afd17bb227cf6ea2':
  Reduce EntropyMixer seed size from 4096 to 512 bytes.
 2013-10-03 14:57:20 -07:00
Adam Powell
f8895248e2 Add a scrubber to keyguard; layout tweaks 
Switch KeyguardTransportControlView over to using RemoteController
instead of the internal API.

Guard transition animations behind a flag until we can work out some
intermittent issues.

Change-Id: Ie9f41339ce6e735c5d524db88437672f2c9859e2
 2013-10-03 14:55:18 -07:00
Michael Wright
448a1f6fed am cf5b34b0: Merge "Ensure WallpaperEngine has correct size information" into klp-dev 
* commit 'cf5b34b0c43df076cfe8b774c1c919303793fa7c':
  Ensure WallpaperEngine has correct size information
 2013-10-03 14:53:51 -07:00
Michael Wright
cf5b34b0c4 Merge "Ensure WallpaperEngine has correct size information" into klp-dev 2013-10-03 21:51:59 +00:00
Alex Klyubin
6a603e7be9 am 1a07229b: Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes." 
* commit '1a07229bc2042676c866051938ebe35d9cded900':
  Reduce EntropyMixer seed size from 4096 to 512 bytes.
 2013-10-03 14:36:49 -07:00
Alex Klyubin
1a07229bc2 Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes." 2013-10-03 21:34:23 +00:00
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
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
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