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

153768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
800f3ca4dd am 14c8acef: am 5fb35780: am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver 
* commit '14c8acef21136a07e5e750b245874d779f410b53':
  Do not restore the media button event receiver
 2014-09-04 17:59:35 +00:00
Chris Wren
0ede908c1d am 4b6f4321: am c95be445: Merge "Honor per-app sensitivity setting." into lmp-dev 
* commit '4b6f432163c4d50a53a64b27e19f6e71b0b33541':
  Honor per-app sensitivity setting.
 2014-09-04 17:57:56 +00:00
RoboErik
28cfe661d7 am dd22920f: am 11370544: Merge "Update VolumeProvider apis per feedback" into lmp-dev 
* commit 'dd22920f2290ad0bf97c466d6d11e10a704e4d70':
  Update VolumeProvider apis per feedback
 2014-09-04 17:57:50 +00:00
Baligh Uddin
6bed40eddc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 17:49:32 +00:00
Baligh Uddin
b318691573 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 17:49:06 +00:00
Baligh Uddin
82a946d7de Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 17:49:05 +00:00
Baligh Uddin
d837c3e87d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 17:48:59 +00:00
Ruben Brunk
69a0966441 Merge "camera2: Fix Nakasi crash-on-start when using Camera2 API." into lmp-dev 2014-09-04 17:47:16 +00:00
Deepanshu Gupta
4df075bcb5 am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev 
* commit '057eb404363184b75ab0e5d3768a22126703f750':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:46:19 +00:00
Deepanshu Gupta
7055778ef5 am a9f56d5a: (-s ours) am 44db2b3e: am 5d1755e9: am c634383a: (-s ours) am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'a9f56d5a050845703bdcfff734d9d189bec2ddec':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:46:15 +00:00
Deepanshu Gupta
19fa86cfd6 am 5384d40e: (-s ours) am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '5384d40ed4ec8f3546be94e6cae7c0011ef235a5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:46:11 +00:00
Deepanshu Gupta
409e42a17e am e19464aa: (-s ours) am 9ee1556d: am 296b120c: am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'e19464aae4ba251c758f3b27601ef3470e0a8c2d':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:46:08 +00:00
Jean-Michel Trivi
14c8acef21 am 5fb35780: am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver 
* commit '5fb35780a53c239e34aec8beccd328cad9145e3d':
  Do not restore the media button event receiver
 2014-09-04 17:46:04 +00:00
Chris Wren
cb72862b53 am c95be445: Merge "Honor per-app sensitivity setting." into lmp-dev 
* commit 'c95be445c9a26f125fcca0b44a74da5e8c1d59bb':
  Honor per-app sensitivity setting.
 2014-09-04 17:45:49 +00:00
RoboErik
edca5977ed am 11370544: Merge "Update VolumeProvider apis per feedback" into lmp-dev 
* commit '11370544c65d0cdbd8d6da86dc70722bcdc5f60c':
  Update VolumeProvider apis per feedback
 2014-09-04 17:45:42 +00:00
Amith Yamasani
8fb6a608ea am 50ddcc0a: am bd1122e6: Merge "Allow adb install to work even if unknown sources is disallowed" into lmp-dev 
* commit '50ddcc0aac6b3156fe0c05b3fd559456e1db4a6f':
  Allow adb install to work even if unknown sources is disallowed
 2014-09-04 17:44:35 +00:00
Yorke Lee
cbd61cf075 am 42d221f3: am 002e85e1: Merge "Use TelecommManager APIs to detect if we are in a call" into lmp-dev 
* commit '42d221f34b50f8823695c26b65659faa2047564c':
  Use TelecommManager APIs to detect if we are in a call
 2014-09-04 17:44:30 +00:00
Chris Wren
0fb810a3fa Merge "Honor per-app sensitivity setting." into lmp-dev 2014-09-04 17:42:18 +00:00
RoboErik
f85a08d30f Merge "Update VolumeProvider apis per feedback" into lmp-dev 2014-09-04 17:38:01 +00:00
Amith Yamasani
798de61a84 am bd1122e6: Merge "Allow adb install to work even if unknown sources is disallowed" into lmp-dev 
* commit 'bd1122e6f59d028b7847f2defad53adb1c3c737c':
  Allow adb install to work even if unknown sources is disallowed
 2014-09-04 17:36:12 +00:00
Yorke Lee
015fc93377 am 002e85e1: Merge "Use TelecommManager APIs to detect if we are in a call" into lmp-dev 
* commit '002e85e1a3ad030bf77f700d545f9a41d7214c74':
  Use TelecommManager APIs to detect if we are in a call
 2014-09-04 17:36:00 +00:00
Deepanshu Gupta
057eb40436 am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev 
* commit 'a5176670c8ef21b42e0a2e7db07c968e3ceacb39':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:33:28 +00:00
Deepanshu Gupta
a9f56d5a05 am 44db2b3e: am 5d1755e9: am c634383a: (-s ours) am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '44db2b3ef65ff2b0aa340018a6db93cdd52caa60':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:33:25 +00:00
Deepanshu Gupta
5384d40ed4 am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b79bb54e92b03bc032a91084f8a5ab7246136d9f':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:33:21 +00:00
Deepanshu Gupta
e19464aae4 am 9ee1556d: am 296b120c: am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '9ee1556d601e1f1f60a01bb7137bad48a7923a3d':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:33:13 +00:00
Jean-Michel Trivi
5fb35780a5 am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver 
* commit 'daf113b118c658a493bac194d3b5ba8ab91dbd62':
  Do not restore the media button event receiver
 2014-09-04 17:33:09 +00:00
Amith Yamasani
dea8e01122 Merge "Allow adb install to work even if unknown sources is disallowed" into lmp-dev 2014-09-04 17:31:32 +00:00
Yorke Lee
135b59e597 Merge "Use TelecommManager APIs to detect if we are in a call" into lmp-dev 2014-09-04 17:27:25 +00:00
Kenny Guy
692356b7c3 Revert "Ensure all RemoteViews use myUserId rather than context." 
This reverts commit 5287e37687f117ac0b690100ad90842eff58d15a.
Reverting because only worked if settings cache had been populated
already.

Bug: 17302505
Change-Id: I4360606e9d9c6409951f0a02bd0b78c55085e0c6
 2014-09-04 18:24:31 +01:00
Deepanshu Gupta
a5176670c8 am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev 
* commit '033a54ec746bd8a4c5913f8290deb4a4ec653c50':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:22:13 +00:00
Deepanshu Gupta
44db2b3ef6 am 5d1755e9: am c634383a: (-s ours) am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '5d1755e9f51f81d54a3566aa6304919fbf467091':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:22:10 +00:00
Deepanshu Gupta
b79bb54e92 am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'f4ba8731441035d8f3bc4dc622e2eca6eeb47a3d':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:22:07 +00:00
Deepanshu Gupta
9ee1556d60 am 296b120c: am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '296b120c3053db8b92fb84cb7f433da7f4e99a25':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:22:04 +00:00
Jean-Michel Trivi
daf113b118 am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver 
* commit '5c6248c9321990f0fbe8ac7c061f0e61ba0725f1':
  Do not restore the media button event receiver
 2014-09-04 17:22:01 +00:00
Brian Carlstrom
34a23d5c95 am a4411ee0: am 12799b2f: Used LOCAL_SHARED_LIBRARIES for proper dependencies 
* commit 'a4411ee0bd067e1fe9ce6ecb4094105812a5f0c6':
  Used LOCAL_SHARED_LIBRARIES for proper dependencies
 2014-09-04 17:16:10 +00:00
Deepanshu Gupta
033a54ec74 am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev 
* commit 'c33fc8de1ddd2d27a499c146169b870513afca3b':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:14:58 +00:00
Deepanshu Gupta
5d1755e9f5 am c634383a: (-s ours) am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'c634383ac49b03cd8fd152b4278cad1b94b84bcf':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:14:53 +00:00
Deepanshu Gupta
f4ba873144 am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '338e32ba521df8cbd295e69d8f20626452baa4a5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:14:49 +00:00
Deepanshu Gupta
296b120c30 am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'a82db08e1d5f2c7b1751a93bc10d0fc5d231f9e4':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:14:46 +00:00
Jean-Michel Trivi
5c6248c932 am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver 
* commit '1310a1cdba8a0f5e1c8741a5fbcf81eb76c6c2b2':
  Do not restore the media button event receiver
 2014-09-04 17:14:42 +00:00
Brian Carlstrom
7dfd690888 am 12799b2f: Used LOCAL_SHARED_LIBRARIES for proper dependencies 
* commit '12799b2f1a8db1171ff1dd8db99d8de72574738a':
  Used LOCAL_SHARED_LIBRARIES for proper dependencies
 2014-09-04 17:05:27 +00:00
Brian Carlstrom
191cbad91f Used LOCAL_SHARED_LIBRARIES for proper dependencies 
bug:15938254
Change-Id: I710f689e8bcad66988ef3aa0aa189b185c8ad662
 2014-09-04 09:52:31 -07:00
Ricardo Cervera
2cb448298e am 44ba1d0e: am 6926b907: am 909cdff4: am c5b5366f: am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site 
* commit '44ba1d0eaf623873e410f9881a0ec29ea8017825':
  docs: Added SONY logo (hi-res) for Wear site
 2014-09-04 16:48:38 +00:00
Ricardo Cervera
693cce71ef am 6926b907: am 909cdff4: am c5b5366f: am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site 
* commit '6926b907b07d02219c5f3bb2beca535245b0630b':
  docs: Added SONY logo (hi-res) for Wear site
 2014-09-04 16:37:04 +00:00
Wink Saville
e340e16206 am 3de8efec: am bfa06279: Merge "Cleanup ISub.aidl" into lmp-dev 
* commit '3de8efecdb5bcf5645eb4e763c1aef9f8e91a044':
  Cleanup ISub.aidl
 2014-09-04 16:32:21 +00:00
Ricardo Cervera
2388750612 am 909cdff4: am c5b5366f: am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site 
* commit '909cdff437ad91ebb0d498389d1a352fca5c8883':
  docs: Added SONY logo (hi-res) for Wear site
 2014-09-04 16:26:48 +00:00
Wink Saville
7afd5dbc1f am bfa06279: Merge "Cleanup ISub.aidl" into lmp-dev 
* commit 'bfa06279cc8240015bd10b8be2748838122c7d11':
  Cleanup ISub.aidl
 2014-09-04 16:21:39 +00:00
Ricardo Cervera
909cdff437 am c5b5366f: am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site 
* commit 'c5b5366f1ba236a98cb5aa044b89c6302baf4540':
  docs: Added SONY logo (hi-res) for Wear site
 2014-09-04 16:16:24 +00:00
Wink Saville
0065e2e62b Merge "Cleanup ISub.aidl" into lmp-dev 2014-09-04 16:10:17 +00:00
Amith Yamasani
ece305d585 Allow adb install to work even if unknown sources is disallowed 
adb installs should continue to work for developer usecases,
but PackageInstaller continues to be blocked for sideloading
via the UI - browser, downloads, etc.

Bug: 13760585
Change-Id: I4f8c1445448584c17e5acf77b399579c2643f333
 2014-09-04 09:10:10 -07:00