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

137721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
887aa0024f Update global actions bug report item. 
New icon, update title to match confirm dialog, new status
line for build information.

Remove redundant QS tile.

Bug:15385554
Change-Id: Idc36dc9ce1cabfa61fd8acac56dc3a70d5dc6645
 2014-06-02 15:01:58 -04:00
Yuhao Zheng
597b637070 Merge "More ANQP parsing" 2014-06-02 18:38:45 +00:00
Mike Lockwood
9dc96cf0fc am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit 'a0183b02e4c6f53587519b445a546192b4a20146':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:32:26 +00:00
Mike Lockwood
307a37c2af am 1ac54ec6: am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '1ac54ec69bfcda2638b05c7daa4300ec5749e7b8':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:32:20 +00:00
Mike Lockwood
a0183b02e4 am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:28:51 +00:00
Mike Lockwood
1ac54ec69b am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:28:42 +00:00
Mike Lockwood
8868d1290a am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '1c725866da02c3e1f62fb416ea3450caed406f2a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:25:35 +00:00
Mike Lockwood
750e78bb76 am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '27eb205e21e7715764084085f382d690e0406c63':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:25:28 +00:00
Mike Lockwood
1c725866da Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 2014-06-02 18:21:17 +00:00
Mike Lockwood
27eb205e21 Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 2014-06-02 18:20:39 +00:00
John Reck
776512d4b6 am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-dev 
* commit 'feccbdc4d0bee3eb4c395bd93ba51cbc6616527a':
  Add setStartValue to RNA
 2014-06-02 18:19:44 +00:00
John Reck
82e71a756e Merge "Add setStartValue to RNA" into lmp-preview-dev 2014-06-02 18:13:14 +00:00
Raph Levien
88554f5f7d am dfc40743: Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev 
* commit 'dfc40743fda406614a2200a31e8a670b7fa46cd8':
  Revert ascent/descent/lineGap of Roboto to Roboto v1 values
 2014-06-02 18:08:19 +00:00
Raph Levien
a9efb28408 Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev 2014-06-02 18:04:45 +00:00
Jae Seo
d5cc4a281e Put TV Input Framework under android.media.tv, including TvContract 
Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
 2014-06-02 11:02:52 -07:00
John Reck
c6b3264e16 Add setStartValue to RNA 
Bug: 15198607
 Should be good-enough for Ripples to use for pseudo-chaining
 support.

Change-Id: Ia8666928ccb69ae401cb583751632a52bd928b63
 2014-06-02 11:00:09 -07:00
vandwalle
2d0f71eea2 handle removal of self added configurations 
Change-Id: Ib2891ac38a4a876b0cd4f198cf26198b9fc12909
 2014-06-02 10:56:45 -07:00
Raph Levien
d573794d83 Support fallbacks for custom typefaces (Minikin) 
This patch adds the fallback font list to custom typefaces created from
files and assets, as well as those created by name. This is a fix for
the deskclock half of bug 15139067 "Centered text isn't working".

Change-Id: I0cc60951953dfb73817a98ddfee5713f0387ee90
 2014-06-02 10:56:23 -07:00
Adrian Roos
dcdd150e6c am 2726d500: Merge "Fix keyguard camera logic" into lmp-preview-dev 
* commit '2726d500c4e6ae63dbc4ee3b070cd2f6ba008602':
  Fix keyguard camera logic
 2014-06-02 17:52:56 +00:00
Yuhao Zheng
7f28e844c1 More ANQP parsing 
Change-Id: Ie24eeffa145f2a1bda0cd8e74a52103fdf4b7674
 2014-06-02 10:49:53 -07:00
Adrian Roos
e205192c72 Merge "Fix keyguard camera logic" into lmp-preview-dev 2014-06-02 17:48:07 +00:00
Alan Viverette
57f285d3ab am 73d37038: Merge "Fix null paint in GradientDrawable, make default values explicit" into lmp-preview-dev 
* commit '73d370389338b97f801631182bd9a650b42f9a1b':
  Fix null paint in GradientDrawable, make default values explicit
 2014-06-02 17:45:04 +00:00
Alan Viverette
ba25e8906f am c710f6da: Merge "Fix default GridView list selector" into lmp-preview-dev 
* commit 'c710f6da778e3bfd26af87b9116ac264e341d007':
  Fix default GridView list selector
 2014-06-02 17:44:59 +00:00
Jeff Sharkey
d8e9050e22 Merge "Read data from stdin/stdout to follow adb change." 2014-06-02 17:44:47 +00:00
Alan Viverette
08847c8344 Merge "Fix null paint in GradientDrawable, make default values explicit" into lmp-preview-dev 2014-06-02 17:36:50 +00:00
Alan Viverette
076aabda48 Merge "Fix default GridView list selector" into lmp-preview-dev 2014-06-02 17:36:01 +00:00
dcashman
559321abbf Merge "Add ArrayUtils methods and tests for consumption by KeySet code." 2014-06-02 17:34:09 +00:00
Adrian Roos
a06905b8f7 Fix keyguard camera logic 
Starts non-secure camera if possible and hides camera if
it is not available.

Bug: 14384051
Change-Id: Ib0b93562bb22eb543c054adaf8f7a211862f480a
 2014-06-02 19:32:29 +02:00
dcashman
874d0d4032 Add ArrayUtils methods and tests for consumption by KeySet code. 
Adds methods for dealing specifically with long data types.  Used by
PackageKeySetData as part of the KeySet work.  Add appropriate test methods
to MoreAsserts as well.

Bug: 6967056
Change-Id: I1e263301b353e0cd1b45126be6ef5ec310f311a8
 2014-06-02 10:29:40 -07:00
Santos Cordon
24bec88db0 am 00eb98bc: Merge "Add necessary APIs to support conference calling." into lmp-preview-dev 
* commit '00eb98bc93f11df3b869eca32f04f71d44ee4e6d':
  Add necessary APIs to support conference calling.
 2014-06-02 17:26:42 +00:00
Santos Cordon
a6701df92a Merge "Add necessary APIs to support conference calling." into lmp-preview-dev 2014-06-02 17:21:04 +00:00
RoboErik
830fd7036e am c7ed6f69: Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev 
* commit 'c7ed6f69d474f23df89d36ed94ff0062daa8dcbc':
  Minimum work to make volume handling work with sessions
 2014-06-02 17:15:14 +00:00
Craig Mautner
e0d50cc15b Compare task userId with userId profiles. 
Change comparison of Task.mUserId from comparing with only the
current user id to comparing with all current profile user ids.

Fixes bug 14930145.

Change-Id: Ibbae08da6f4eaa31b171becdd8957293758f527b
 2014-06-02 10:11:53 -07:00
RoboErik
e78755e180 Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev 2014-06-02 17:10:07 +00:00
Andrew Solovay
e2c6327a38 am ec3ade5e: am 164ecfaa: am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 
* commit 'ec3ade5e8e7fffd439f25a53c74f67e63b86c4d2':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.
 2014-06-02 17:07:25 +00:00
Andrew Solovay
ec3ade5e8e am 164ecfaa: am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 
* commit '164ecfaa4106952ab77631353d2a94ae13f3c03a':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.
 2014-06-02 17:02:52 +00:00
Andrew Solovay
164ecfaa41 am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 
* commit 'be9bf6344c45f68314e3de9e8712c86bd3d0b1e8':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.
 2014-06-02 16:59:43 +00:00
Andrew Solovay
be9bf6344c am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 
* commit 'a68757bb3edfa7b55a349e0b00551a22b6ef9be5':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.
 2014-06-02 16:56:30 +00:00
Andrew Solovay
a68757bb3e Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 2014-06-02 16:53:46 +00:00
Eric Laurent
3a4398a76c am 209fc1ae: AudioManager: do not mandate a looper 
* commit '209fc1ae7abb6965cb4f18bf68ff8c350e9d40d9':
  AudioManager: do not mandate a looper
 2014-06-02 16:49:15 +00:00
Roozbeh Pournader
a5fea19536 Revert ascent/descent/lineGap of Roboto to Roboto v1 values 
Everything else is left intact to minimize side effects.

Bug: 15309595, 15330620
Change-Id: I7f10bc093423132b037403aa3abd9304d788f32e
 2014-06-02 16:45:58 +00:00
Nicolas Prevot
f3bbf2b801 Merge "Small fix related to cross-profile result intents." 2014-06-02 16:38:03 +00:00
Eric Laurent
ddc93ce343 AudioManager: do not mandate a looper 
Having a listener for audio port updates is not mandatory.
do not throw an excepion when AudioManager is contructed
from a thread without looper.

Bug: 15368707.
Change-Id: If5ce54bf4efdff8b785098649fa1cd0564861e1e
 2014-06-02 09:16:02 -07:00
Nicolas Prevot
6b942b8c52 Small fix related to cross-profile result intents. 
Change-Id: Id99d6406cdd8ceddacf6fee0cf66e7e59d749a15
 2014-06-02 15:20:42 +01:00
Jorim Jaggi
c7ad12f458 am 56a043ba: Merge "Implement unlock hint." into lmp-preview-dev 
* commit '56a043ba215b35096769bac402b93e857333b1e4':
  Implement unlock hint.
 2014-06-02 13:40:34 +00:00
Florin Malita
9ec2eabe5a Merge "Add a native Canvas wrapper." 2014-06-02 13:37:11 +00:00
Jorim Jaggi
58136d0211 Merge "Implement unlock hint." into lmp-preview-dev 2014-06-02 13:36:42 +00:00
Jorim Jaggi
9012958742 Implement unlock hint. 
Before, users didn't have any clue how to unlock their phone. Now
they have. Also, a tap now dismisses the notification shade in the
unlocked state.

Bug: 14080971
Bug: 15189435
Bug: 15282191
Bug: 15126962

Change-Id: I779344b043b4415809dd98217b7cb9ff6d57fa3e
 2014-06-02 15:35:54 +02:00
Jungshik Jang
052591143b am 3a981600: (-s ours) Merge "DO NOT MERGE: Start Device Discovery after logical address allocation." into lmp-preview-dev 
* commit '3a9816007c30c48568a28ad8c4cc622e7879cec7':
  DO NOT MERGE: Start Device Discovery after logical address allocation.
 2014-06-02 11:44:18 +00:00
Jungshik Jang
50af6ffa6d am 072ea747: (-s ours) Merge "DO NOT MERGE: Register HdmiControlService" into lmp-preview-dev 
* commit '072ea747d3dc71ed9c9ff3fc1ba9f25cbaa1d447':
  DO NOT MERGE: Register HdmiControlService
 2014-06-02 11:44:13 +00:00