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

150014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
fc5f24d874 am db511f23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'db511f2372fb542baa83838d9552d249a8c2f164':
  Import translations. DO NOT MERGE
 2014-08-15 22:35:47 +00:00
Baligh Uddin
bd42c307c4 am e2541778: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'e2541778bfe330449612c02661257318f69916bd':
  Import translations. DO NOT MERGE
 2014-08-15 22:35:43 +00:00
Baligh Uddin
0039271391 am a519df6a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'a519df6a42ed2937544b7a0e8aa831507fe3c09e':
  Import translations. DO NOT MERGE
 2014-08-15 22:35:39 +00:00
Baligh Uddin
5b63492976 am 3f374ac1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '3f374ac15c99468abee39489c23dfa3f571689b1':
  Import translations. DO NOT MERGE
 2014-08-15 22:35:35 +00:00
Robert Greenwalt
18b08ad2b5 am 26ca16ce: am 90e32866: Merge "Configure MTU based on network MTU parameter" into lmp-dev 
* commit '26ca16ce704d69e36722786586d8e4449dbabe91':
  Configure MTU based on network MTU parameter
 2014-08-15 22:23:46 +00:00
Baligh Uddin
129ad0e15b am ad6b1426: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ad6b1426f3cc912c2a30b59270a4b9c38fd7d3c6':
  Import translations. DO NOT MERGE
 2014-08-15 22:20:17 +00:00
Baligh Uddin
062feaf395 am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '2f53238fe440d8615d8874e2fb23535c29b47aec':
  Import translations. DO NOT MERGE
 2014-08-15 22:20:13 +00:00
Baligh Uddin
b2df3e40d5 am 97ffe946: (-s ours) Import translations. DO NOT MERGE 
* commit '97ffe946f1e9aa961e3278f84b344a4a93b02210':
  Import translations. DO NOT MERGE
 2014-08-15 22:20:09 +00:00
Robert Greenwalt
2d6c37cd66 am 90e32866: Merge "Configure MTU based on network MTU parameter" into lmp-dev 
* commit '90e32866d257e2d3ab66a2c8c59abb179a080797':
  Configure MTU based on network MTU parameter
 2014-08-15 22:16:57 +00:00
Jeff Davidson
f206ab9db3 am 8450fe3b: am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev 
* commit '8450fe3b1ce69a24e373ebca6302739103f1c03b':
  Fix default scorer provisioning.
 2014-08-15 22:08:11 +00:00
Jay Shrauner
e88c570943 am 42e1f3bf: am 4a21b277: Merge "Prevent ConcurrentModificationExceptions" into lmp-dev 
* commit '42e1f3bf465e0da059fbb54364580858954a10ed':
  Prevent ConcurrentModificationExceptions
 2014-08-15 22:08:06 +00:00
Adam Lesinski
ab9b1f5b2a am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 
* commit '5bcfb6b98261c94a6ff33438e6b29ca71bb3c0eb':
  Fix assumption about DynamicRefTable in aapt
 2014-08-15 22:07:59 +00:00
Jeff Davidson
c4f1557ba2 am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev 
* commit 'bffe81a70721acab9e8b912206559cd53725c6c7':
  Fix default scorer provisioning.
 2014-08-15 22:00:58 +00:00
Jay Shrauner
1cfb60f0b5 am 4a21b277: Merge "Prevent ConcurrentModificationExceptions" into lmp-dev 
* commit '4a21b277b9ae7087c1dad6c13b50c50d6af7c733':
  Prevent ConcurrentModificationExceptions
 2014-08-15 22:00:53 +00:00
Adam Lesinski
9e4056b7af am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 
* commit '2fdf2db8f15a23fea354ecbf4929585dc4c44e5c':
  Fix assumption about DynamicRefTable in aapt
 2014-08-15 21:53:01 +00:00
Sunny Goyal
a4dd2c336f am 6ba6c6ce: am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev 
* commit '6ba6c6cecbfe58295c07d6c793aebbc3d9ea2ec2':
  Returning null when preview image is not available for AppWidgetProviderInfo
 2014-08-15 21:47:45 +00:00
Christopher Tate
a981cfba7b am 5e6afbc2: am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev 
* commit '5e6afbc2c5dafec254601ac3968a8c26219c91be':
  Tighten restore-at-install behavior
 2014-08-15 21:47:40 +00:00
Sunny Goyal
be55d637d9 am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev 
* commit 'c49494811aa1ed42c3f0b0519cb037e239f8b0e8':
  Returning null when preview image is not available for AppWidgetProviderInfo
 2014-08-15 21:41:11 +00:00
Christopher Tate
1db2391d9f am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev 
* commit '2c286400bf4913c24dea7d0653314bdf162aaa16':
  Tighten restore-at-install behavior
 2014-08-15 21:41:06 +00:00
Jeff Brown
c13ff2e4f5 Merge "Revert "Throw exception when inset drawable is missing drawable attribute"" into lmp-dev 2014-08-15 21:23:40 +00:00
Jeff Brown
2e1c9b517e Revert "Throw exception when inset drawable is missing drawable attribute" 
This reverts commit b16a6331cce2c3559ed9414c6aca238c5042e919.

Bug: 17072675
Change-Id: Ie2403095df10aa0dd18545a3d2a323ae463037e4
 2014-08-16 02:06:16 +00:00
Alan Viverette
0a9614f5fb Throw exception when inset drawable is missing drawable attribute 
BUG: 17068252
Change-Id: Id9c9791501ce9d56fdd67236c84775550c89032c
 2014-08-15 14:28:30 -07:00
Alan Viverette
aeda0586f3 Merge "Fix date and time picker styling" into lmp-dev 2014-08-15 21:23:40 +00:00
Alan Viverette
7ca0bb5d4d Merge "Better handling of unresolved theme attributes" into lmp-dev 2014-08-15 21:23:40 +00:00
Alan Viverette
34a14f967a Better handling of unresolved theme attributes 
Also adds a (very obviously wrong) default color to RippleDrawable

Change-Id: I6d29b371f4e59accbebf25eb059b1f372b9184b0
 2014-08-15 17:15:39 -07:00
Alan Viverette
6a2f703fed Merge "Scrapping the view at position zero is still position zero" into lmp-dev 2014-08-15 21:23:40 +00:00
Alan Viverette
4771b55d13 Scrapping the view at position zero is still position zero 
BUG: 16418789
Change-Id: I8334d6b37efa1f853152ef2cea041db69e41d24e
 2014-08-15 18:02:23 -07:00
Alan Viverette
14a0fbf225 Merge "Fix menu styling" into lmp-dev 2014-08-15 21:23:40 +00:00
Alan Viverette
b9e1a7c226 Fix menu styling 
BUG: 17069607
Change-Id: Ic6b46fc56546f0e472509110d378c2662f6b4583
 2014-08-15 17:32:22 -07:00
Alan Viverette
cf8f58350b Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev 2014-08-15 21:23:40 +00:00
Andy Hung
efb3a8b37a Merge "Fix 7.1 audio playback from AudioTrack" into lmp-dev 2014-08-15 21:23:40 +00:00
Jeff Davidson
cab3eb0c0b Merge "Fix default scorer provisioning." into lmp-dev 2014-08-15 21:23:40 +00:00
Adam Lesinski
91348eb957 Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 2014-08-15 21:23:40 +00:00
Christopher Tate
6cbc07b7c0 Merge "Tighten restore-at-install behavior" into lmp-dev 2014-08-15 21:23:40 +00:00
Andy Hung
ad720aeea7 Fix 7.1 audio playback from AudioTrack 
Uses AudioFormat.CHANNEL_OUT_7POINT1_SURROUND.

Bug: 16951383
Change-Id: I7e94598d5cae1a741b8b1e0492b202163bf9f9fd
 2014-08-15 14:23:06 -07:00
Alan Viverette
518ff0de95 Fix date and time picker styling 
Removes done buttons from widgets, fixes date picker day selection, fixes
dialog layouts in landscape, updates colors. Adds API on AlertDialog for
setting the view by resource ID, which is necessary to correctly inflate
the view against the dialog's parent view.

BUG: 16941550
BUG: 16852521
BUG: 16878697
BUG: 16838659
BUG: 17047435
Change-Id: I138858ce06cd4abf68a2c3361ec170370236b33b
 2014-08-15 14:20:35 -07:00
Justin Mattson
6be7cf6f92 am 2e502ee5: am f6c0767d: Merge "Add fragment animations to setup leanback theme" into lmp-dev 
* commit '2e502ee519cc6e67921fb249232a502c15fa479d':
  Add fragment animations to setup leanback theme
 2014-08-15 21:17:39 +00:00
Amith Yamasani
38992b95e8 am e52fb6f4: am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev 
* commit 'e52fb6f4df210523946fbc041207438d8264472c':
  Copy certain settings to the managed profile
 2014-08-15 21:17:26 +00:00
Julia Reynolds
cdf03e4c1c am 289bbb2d: am 08aeb505: Merge "Apply lockdowns when user restrictions are set." into lmp-dev 
* commit '289bbb2d827e73893a201f2ecde04f19c86bfc5f':
  Apply lockdowns when user restrictions are set.
 2014-08-15 21:17:05 +00:00
Justin Mattson
d3077b95f8 am f6c0767d: Merge "Add fragment animations to setup leanback theme" into lmp-dev 
* commit 'f6c0767d46d5f42129a760c705ad0cb6e1e2fbe6':
  Add fragment animations to setup leanback theme
 2014-08-15 21:03:06 +00:00
Adam Lesinski
2cb761e3dd Fix assumption about DynamicRefTable in aapt 
Packages without any resources should not expect to have
a DynamicRefTable.

Bug:16895517
Bug:17056720
Change-Id: Id006f6bdbf08f30505f6ba5982bc9d1b09db0f0a
 2014-08-15 14:01:43 -07:00
Adrian Roos
78c5c9721c am e0a0e0e3: am 384e2274: Fix errors that could lead to brightness flickering 
* commit 'e0a0e0e364e2fa37b1a9a8f27a7d612257b1f1a0':
  Fix errors that could lead to brightness flickering
 2014-08-15 20:59:27 +00:00
Ruchi Kandoi
1fb09ae4a5 am eb8012c4: am 1bac45b5: Merge "Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"" into lmp-dev 
* commit 'eb8012c4811293d47258e1ea6fe69333ff999728':
  Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"
 2014-08-15 20:59:14 +00:00
Chet Haase
4829093924 am e7144508: am 6954e4f0: Merge "Minor doc fixes from API council recommendations." into lmp-dev 
* commit 'e7144508762507a69e6516d29e39c134c782bdb7':
  Minor doc fixes from API council recommendations.
 2014-08-15 20:59:09 +00:00
Erik Pasternak
102723b899 am 93228d99: am b7d0449d: Merge "Add metadata and notifications to OneMedia" into lmp-dev 
* commit '93228d992c30bbe6503bbf6866173203963fe9a4':
  Add metadata and notifications to OneMedia
 2014-08-15 20:59:01 +00:00
John Spurlock
8d87a7fd9c am c1164b4f: am dcd90bbe: Merge "Zen: tweak audience interruption logic." into lmp-dev 
* commit 'c1164b4f56eabe8ecec1f1f3cedafa4c10edd502':
  Zen: tweak audience interruption logic.
 2014-08-15 20:58:55 +00:00
RoboErik
bed405b7e4 am 4ed18b42: am 9ea4316f: Merge "Fix crash in legacy apps that register without a looper" into lmp-dev 
* commit '4ed18b42539fb6a452cef7ae60d598d87a2fe76e':
  Fix crash in legacy apps that register without a looper
 2014-08-15 20:58:49 +00:00
Narayan Kamath
b7f70bddf3 am 9b0fe82e: am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev 
* commit '9b0fe82e88a0e1d7e806f9ca7c5966bc009b00ac':
  Fix getPackageInfo for the "android" package in the system server.
 2014-08-15 20:58:38 +00:00
Amith Yamasani
f62621845c am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev 
* commit 'a728a4182ab5db257e6a1f90519c10ae00f29967':
  Copy certain settings to the managed profile
 2014-08-15 20:52:44 +00:00
Julia Reynolds
bceac60c98 am 08aeb505: Merge "Apply lockdowns when user restrictions are set." into lmp-dev 
* commit '08aeb505d0f65c678e27214170aaf7ad14b88c79':
  Apply lockdowns when user restrictions are set.
 2014-08-15 20:31:49 +00:00