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

146805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph Studer
9226f8a3b2 am 6b8a2734: Merge "SysUI: Display group children when no summary is present" into lmp-dev 
* commit '6b8a27343fec2c72074adde1687d45d43fbb95d9':
  SysUI: Display group children when no summary is present
 2014-07-30 20:21:08 +00:00
Chong Zhang
6f3c284ed7 am baba0e42: fix for MediaCodecList bitrate range exception 
* commit 'baba0e4282e875271b79912135bd6418f58913b1':
  fix for MediaCodecList bitrate range exception
 2014-07-30 20:20:59 +00:00
Ye Wen
7b58ac80c0 am e13e2eef: Merge "Move archived column from pdu/sms to threads (1/4)" into lmp-dev 
* commit 'e13e2eefca4db78cd80cb36bd79074934b1d32b4':
  Move archived column from pdu/sms to threads (1/4)
 2014-07-30 20:16:49 +00:00
Chong Zhang
cad266aad9 fix for MediaCodecList bitrate range exception 
Bug: 16627391

Change-Id: I8c5ba580d7b875d1e2a0ebbf398cf65dd5c4555f
 2014-07-30 20:15:03 +00:00
Julia Reynolds
d133e05e5f am 72746e41: Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev 
* commit '72746e415e325a9d54a19f8c82fdbd98b9d3658b':
  API council - DISALLOW_APPS_CONTROL -- need better documentation.
 2014-07-30 20:08:15 +00:00
Geoff Mendal
bc658872e4 am 6764ce22: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6764ce228db63bcb8e2f33ad8acbff878090e434':
  Import translations. DO NOT MERGE
 2014-07-30 19:51:14 +00:00
Christoph Studer
0de6eb9db8 am 572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev 
* commit '572532d089d15057c5e00a1d7fcf926d7555299f':
  Strip RemoteViews from Notifications, re-create them in SysUI
 2014-07-30 19:36:45 +00:00
Derek Sollenberger
f875fdf4fc am 673af558: Merge "Disable fallback chaining in Skia." into lmp-dev 
* commit '673af5582dda0d0cb8a3667fbadef747d22193f1':
  Disable fallback chaining in Skia.
 2014-07-30 19:36:41 +00:00
Geoff Mendal
5d1fbe7d4a am 9d832d1e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '9d832d1e324cc1bee418b68d285b2a08b3a22fa8':
  Import translations. DO NOT MERGE
 2014-07-30 19:29:15 +00:00
Sandeep Siddhartha
3aebb32267 am 059ffa19: Merge "Make startRecognition async" into lmp-dev 
* commit '059ffa19ae00611f53da5c817ad21587e2057149':
  Make startRecognition async
 2014-07-30 19:07:20 +00:00
Jose Lima
9b51ad4d30 am 28ba97e3: Added LEANBACK_SETTINGS Intent category 
* commit '28ba97e3c095f61765504435c7f8725e48ab09ff':
  Added LEANBACK_SETTINGS Intent category
 2014-07-30 19:00:05 +00:00
Jose Lima
73915cf2ca Added LEANBACK_SETTINGS Intent category 
- Added new Intent category (as a hidden/system API) to be
     used to identify Leanback settings activities that should
     be listed in the Leanback launcher.

Change-Id: Ia31244fb87a66f63ddad562e02e577111573d728
 2014-07-30 18:56:25 +00:00
Adam Lesinski
23e6d3a2de am c6240e72: Fix large memory corruption in AAPT 
* commit 'c6240e72855a978e31756b0be6bc83e0afdd17bf':
  Fix large memory corruption in AAPT
 2014-07-30 18:51:18 +00:00
Adam Lesinski
57079519f4 Fix large memory corruption in AAPT 
When assigning a new string pool to a package, don't release the
reference to the old memory immediately, as the cleanup code that
is called after references the old memory.

Bug: 16155257
Change-Id: I3eaeb81191b71a282a0ef82856023f09707f1b17
 2014-07-30 18:46:51 +00:00
Paul Jensen
ca9fb9c69f am 43293a8b: Merge "Use a new socket for each of the host\'s IP addresses." into lmp-dev 
* commit '43293a8b947508b66efdc36f7d52435d537dddb6':
  Use a new socket for each of the host's IP addresses.
 2014-07-30 18:43:36 +00:00
Nicolas Prevot
bfb22aeaf0 am 58e96946: Using the selector to check if an intent can be forwarded. 
* commit '58e9694623705b3916f0256c26c88ea3ae18b47b':
  Using the selector to check if an intent can be forwarded.
 2014-07-30 18:35:46 +00:00
Nicolas Prevot
ce673ffd22 Using the selector to check if an intent can be forwarded. 
In IntentFowarderActivity, if the selector of an intent is defined,
use it to check if the intent can be forwarded.

Change-Id: Ic77f70bca5596e0a5fb0fec9b7a693afaa649089
 2014-07-30 18:23:43 +00:00
Geoff Mendal
2553d7a173 am 6206b2b9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6206b2b9ddd33240b4b42d2cf2031e9be079efe6':
  Import translations. DO NOT MERGE
 2014-07-30 18:20:19 +00:00
Alan Lau
84a849a349 am c8ca58e1: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'c8ca58e116947af902071d640c7421948a92ac51':
  Import translations. DO NOT MERGE
 2014-07-30 17:46:06 +00:00
Alan Lau
58d40c8eae am b4e90a2a: am 231a32a1: (-s ours) am c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 
* commit 'b4e90a2a2cc1dbd7f188e8933876b35d56d693ff':
  Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
 2014-07-30 17:46:02 +00:00
Alan Lau
c788815693 Merge branch 'lmp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 2014-07-30 17:41:34 +00:00
Alan Lau
0716daabda am 231a32a1: (-s ours) am c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 
* commit '231a32a132011abda6dabca31446297a75914dad':
  Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
 2014-07-30 17:41:28 +00:00
Alan Lau
231a32a132 am c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 
* commit 'c006227265d7ac705ebeef2f7d87104fdb63f32a':
  Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
 2014-07-30 17:37:02 +00:00
Chris Craik
3994a00e59 am 9e364150: Use RoundRect clipping for circle reveal animation 
* commit '9e3641505c18d661f513250fa945787663f3adfb':
  Use RoundRect clipping for circle reveal animation
 2014-07-30 17:21:24 +00:00
Chris Craik
af4d04cab6 Use RoundRect clipping for circle reveal animation 
bug:16630975

Also, remove inverse clipping feature from reveal animator.

Change-Id: I770a4eb48cd123b0ca0f39d16a0f3eefd1be3653
 2014-07-30 17:15:50 +00:00
Behdad Esfahbod
7de9f33a8b am 7e7b8c80: Merge "Clean up Minikin includes" into lmp-dev 
* commit '7e7b8c80571a0dd725ec23e7b3f3e64a2b67d64a':
  Clean up Minikin includes
 2014-07-30 17:13:07 +00:00
Xia Ying
0a64663c15 am 7fc2aaaf: SMS 8-bit GSM characters decoding support 
* commit '7fc2aaaf1649decacb34ac56fbaf5ab79c8f11cb':
  SMS 8-bit GSM characters decoding support
 2014-07-30 17:13:03 +00:00
Xia Ying
482c6e7db4 SMS 8-bit GSM characters decoding support 
Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet
string that's stored in 8-bit unpacked format) characters.

Change-Id: I790dd448a8aaed952d5e24961d9fc509112f7486

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
 2014-07-30 10:03:31 -07:00
Ricardo Cervera
e800de4fb3 am d7d27723: am 9ae4c6f8: am b6bfa9e4: am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit 'd7d277231833de9fb86839a535c159a981ce91e7':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:59:23 +00:00
ztenghui
b488d13860 am da818af6: API Review: VectorDrawable. Remove clipToPath, add MiterLimit 
* commit 'da818af60ab36d6f5cc3e71b1024fa9b7afe4dd0':
  API Review: VectorDrawable. Remove clipToPath, add MiterLimit
 2014-07-30 16:53:52 +00:00
Ricardo Cervera
7560953e5a am 9ae4c6f8: am b6bfa9e4: am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit '9ae4c6f8744b6767efbb912dbfd64ce3da13e60e':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:53:34 +00:00
Ricardo Cervera
9ae4c6f874 am b6bfa9e4: am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit 'b6bfa9e45a953b83289ee57da661746deae7a63f':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:49:57 +00:00
ztenghui
d511fc2fa4 API Review: VectorDrawable. Remove clipToPath, add MiterLimit 
bug:16488254

Change-Id: I693fd46eaf9af016ea9cefe44b559e0aee7c8f03
 2014-07-30 16:47:19 +00:00
Ricardo Cervera
b6bfa9e45a am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit 'a7898781d6182b5c73a0a3899b71162f92582f66':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:46:07 +00:00
Yorke Lee
954f358f04 am f4c289dc: Merge "ContactsContract API changes" into lmp-dev 
* commit 'f4c289dc2bb5085eb8a01d7546f7d5e2a6e301d5':
  ContactsContract API changes
 2014-07-30 16:43:37 +00:00
Geoff Mendal
f62af27846 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 16:17:51 +00:00
Geoff Mendal
aa31e475d2 Import translations. DO NOT MERGE 
Change-Id: Iac3087ace0ea7c351d1606f37000bfa134249184
Auto-generated-cl: translation import
 2014-07-30 12:36:23 -07:00
Geoff Mendal
92725af936 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 16:17:51 +00:00
Geoff Mendal
6a85959838 Import translations. DO NOT MERGE 
Change-Id: I548370fd62b7a26852d16ddbd22ef67ea6369080
Auto-generated-cl: translation import
 2014-07-30 12:20:32 -07:00
Geoff Mendal
4dfd455d49 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 16:17:51 +00:00
Geoff Mendal
e061d44997 Import translations. DO NOT MERGE 
Change-Id: Ie02a99d4e746803f482713fe8a35ef31fdb5fdcb
Auto-generated-cl: translation import
 2014-07-30 11:04:05 -07:00
Geoff Mendal
b55853e8a3 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 16:17:51 +00:00
Geoff Mendal
bead503b15 Import translations. DO NOT MERGE 
Change-Id: Iec046e9a3d34bef3d8055f3eb00e243baf69c8fa
Auto-generated-cl: translation import
 2014-07-30 10:40:00 -07:00
Alan Lau
c006227265 Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 2014-07-30 16:17:51 +00:00
Alan Lau
273906bb6a Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator"" 
This reverts commit 77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f.

Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058
 2014-07-30 17:30:15 +00:00
Chris Wren
b0d07db5ce am 6d23f4fd: Merge "Add a log and statistics for notification expansion." into lmp-dev 
* commit '6d23f4fdbe2c191000628e963d14fa8288a06d12':
  Add a log and statistics for notification expansion.
 2014-07-30 15:36:54 +00:00
Robin Lee
6a41c8c43a am e6818f08: Merge "Don\'t turn off screen after wiping user profiles" into lmp-dev 
* commit 'e6818f08d6d052bdb7d13effd22c32218e15d95d':
  Don't turn off screen after wiping user profiles
 2014-07-30 15:19:35 +00:00
PauloftheWest
fd2c6b468f am e33e0512: Fixed a bug where Bluetooth was turned on with the drop-down in quick settings. 
* commit 'e33e0512b0c53f386112777057dbf332927e3688':
  Fixed a bug where Bluetooth was turned on with the drop-down in quick settings.
 2014-07-30 15:14:29 +00:00
Jorim Jaggi
3fe5ea3e78 am e8404d19: Implement nice header transition when opening QS 
* commit 'e8404d1948a9e449e82a7c3bd57ee264f9b02f2b':
  Implement nice header transition when opening QS
 2014-07-30 15:10:07 +00:00
PauloftheWest
64fe15846c Fixed a bug where Bluetooth was turned on with the drop-down in quick settings. 
Bug: 16547579

Change-Id: I3326aa1f4076d46dc0f8f87f14b44f097e684105
 2014-07-30 15:08:10 +00:00