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

165835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
61fcad92ab docs: Add SearchXonY to Common Intents 
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
 2014-10-27 18:09:11 +00:00
Jeff Hao
e8d9810cde Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev 2014-10-27 17:46:23 +00:00
Wink Saville
4dec130c39 Merge "Change subId to int from long" into lmp-mr1-dev 2014-10-27 17:34:47 +00:00
Eric Laurent
91377de6f2 audioservice: fix default stream volume 
When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.

Bug: 17507571.

Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
 2014-10-27 10:13:00 -07:00
Evan Charlton
2ad5eb538d Merge "Move telecom permission to the public API" into lmp-mr1-dev 2014-10-27 17:08:33 +00:00
Narayan Kamath
e87d36f892 Merge "Revert "Remove unused apache related API."" 2014-10-27 16:55:42 +00:00
Narayan Kamath
31f54ef815 Revert "Remove unused apache related API." 
This reverts commit 3f2714e18bfd979aefefa1d45c50a69fca21cf14.

Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
 2014-10-27 16:55:14 +00:00
Geoff Mendal
649fee0326 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
automerge: 5a1a14a  -s ours

* commit '5a1a14a8174213edcd5f1d7f8fbc427122b25f99':
  Import translations. DO NOT MERGE
 2014-10-27 16:42:51 +00:00
Geoff Mendal
2781409191 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: 4d785f1  -s ours

* commit '4d785f1a033cfd4d5261b3493b6d8153b1a5d596':
  Import translations. DO NOT MERGE
 2014-10-27 16:30:07 +00:00
Narayan Kamath
9834af9ccf Merge "Remove unused apache related API." 2014-10-27 16:17:21 +00:00
Narayan Kamath
00fd36399f Merge "Remove tests/SslLoad." 2014-10-27 16:16:23 +00:00
Narayan Kamath
3c8cf51f86 Merge "Stop using apache http to download Gps XTRA data." 2014-10-27 16:16:11 +00:00
Adrian Roos
fa81d2126a Fix NPE in FlashlightController 
Bug: 18007548
Change-Id: Iecd1303feeb8062741752862312043ecd75cebbe
 2014-10-27 16:57:43 +01:00
Geoff Mendal
5a1a14a817 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-27 15:55:19 +00:00
Geoff Mendal
ad66c3b0b1 Import translations. DO NOT MERGE 
Change-Id: I4fc460aa64d5ea79e6ac16ce7b700b9a316819d1
Auto-generated-cl: translation import
 2014-10-27 08:53:05 -07:00
Geoff Mendal
4d785f1a03 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-27 15:51:29 +00:00
Geoff Mendal
496f0ea68a Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-27 15:50:38 +00:00
Geoff Mendal
935bc33693 Import translations. DO NOT MERGE 
Change-Id: Iff4ddd0201aae07d5a847087ba53cd50aa1ba5c3
Auto-generated-cl: translation import
 2014-10-27 08:48:48 -07:00
Geoff Mendal
592931437c Import translations. DO NOT MERGE 
Change-Id: I05a75d27b0c7752e6afc0d51169e82f7547607df
Auto-generated-cl: translation import
 2014-10-27 08:47:13 -07:00
Calin Juravle
f7d24d2443 Merge "PreInitializeNativeBridge only if its Available" 2014-10-27 15:16:03 +00:00
Calin Juravle
79ec4c15ab PreInitializeNativeBridge only if its Available 
Also, assert that we always have a private application directory for non
system_server case.

Change-Id: I8397d7f7b04cde0bf65b60ca415bf3f4b349783c
 2014-10-27 14:45:33 +00:00
Adrian Roos
4bc3c8bd64 Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev 2014-10-27 14:32:20 +00:00
Jorim Jaggi
f129ee377a Merge "Fix padding between battery and system icons" into lmp-mr1-dev 2014-10-27 14:32:15 +00:00
Jorim Jaggi
9016d8fa80 Merge "Fix system icon widths" into lmp-mr1-dev 2014-10-27 14:31:54 +00:00
Jorim Jaggi
312c1e79d4 Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev 2014-10-27 14:31:33 +00:00
George Mount
e0f76e9a6d Merge "Fix transition being canceled improperly." into lmp-mr1-dev 2014-10-27 14:31:29 +00:00
George Mount
03d5c6f55b Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev 2014-10-27 14:30:34 +00:00
Geoff Mendal
df70dc51ce am 323995c9: (-s ours) am 088260d3: (-s ours) am b3a33967: (-s ours) Import translations. DO NOT MERGE 
* commit '323995c99e5f61e50ab59350ae919c2715857dcf':
  Import translations. DO NOT MERGE
 2014-10-27 13:59:41 +00:00
Geoff Mendal
323995c99e am 088260d3: (-s ours) am b3a33967: (-s ours) Import translations. DO NOT MERGE 
* commit '088260d3a7548489c497628585c94077b934f789':
  Import translations. DO NOT MERGE
 2014-10-27 13:54:12 +00:00
Geoff Mendal
088260d3a7 am b3a33967: (-s ours) Import translations. DO NOT MERGE 
* commit 'b3a33967d2496e8cb9e4174392ff8ffa44d41c8f':
  Import translations. DO NOT MERGE
 2014-10-27 13:47:56 +00:00
John Spurlock
65c0d6ad0c am 14882cf3: am e828b6c0: Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev 
* commit '14882cf3773c7c142c9a8aa4eb7c95a80e5711f9':
  AudioService: Restore ringer-mode validation check.
 2014-10-27 13:41:18 +00:00
Geoff Mendal
a3c19368ac am 90ad228e: (-s ours) am 9162890f: (-s ours) Import translations. DO NOT MERGE 
* commit '90ad228e003226918ae62325e9b9a98253fc7198':
  Import translations. DO NOT MERGE
 2014-10-27 13:36:48 +00:00
John Spurlock
14882cf377 am e828b6c0: Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev 
* commit 'e828b6c034f7330ee70d72d1af979b0a35f883d9':
  AudioService: Restore ringer-mode validation check.
 2014-10-27 13:35:52 +00:00
Geoff Mendal
b3a33967d2 Import translations. DO NOT MERGE 
Change-Id: I6bbba14271ba04f3e4b4836f3e81a22d1c53938f
Auto-generated-cl: translation import
 2014-10-27 06:33:49 -07:00
John Spurlock
e828b6c034 Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev 2014-10-27 13:31:20 +00:00
Geoff Mendal
90ad228e00 am 9162890f: (-s ours) Import translations. DO NOT MERGE 
* commit '9162890f056c895d68975baf1665f4d60bd6b0c9':
  Import translations. DO NOT MERGE
 2014-10-27 13:31:12 +00:00
Geoff Mendal
c5993d2470 am 01c73d1e: (-s ours) Import translations. DO NOT MERGE 
* commit '01c73d1e68349bbd2a4a0d42c68b009720a7e78a':
  Import translations. DO NOT MERGE
 2014-10-27 13:30:49 +00:00
Geoff Mendal
01c73d1e68 Import translations. DO NOT MERGE 
Change-Id: I93babd2bb45e9ad743f0a06154a55d2809b6f12a
Auto-generated-cl: translation import
 2014-10-27 06:23:02 -07:00
Adrian Roos
b9ae09066c Fix stale unlock icon 
Bug: 17405104
Change-Id: I2076c5008fc3617b8a0da5f547bbdca27ce875f4
 2014-10-27 14:20:30 +01:00
Geoff Mendal
9162890f05 Import translations. DO NOT MERGE 
Change-Id: I39fda7f92c545242da499b8bb93a044820e17560
Auto-generated-cl: translation import
 2014-10-27 06:17:58 -07:00
Christoph Studer
1382e67e1c NoMan: Add update bit to notification_enqueue log 
Log whether an enqueued notification updated a previously present
notification.

Bug: 18083122
Change-Id: Ie6ed69f0bf53c668701b44e33282ca74b509a7e3
 2014-10-27 13:29:43 +01:00
Yuncheol Heo
8ecb7219df CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>. 
- Some TV doesn't ask the menu status actively, so we'll send it
  together when sending <ActiveSource>.

Bug: 18109775
Change-Id: I4f7378bb9feaa11d9c9e5a2f6633e19cd41a5fc5
 2014-10-27 17:35:17 +09:00
Wonsik Kim
f47b7c42cb am 2c3f6616: am 5b820a8a: Fix build 
* commit '2c3f661678e0f047033b4e78ee74f643e1a1fcc4':
  Fix build
 2014-10-27 03:00:10 +00:00
Bill Yi
69e61b5a5b am 5a71f832: (-s ours) Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master 
* commit '5a71f83227f0340a265f34b226d8fe01d4dd9773':
 2014-10-27 02:50:36 +00:00
Wonsik Kim
2c3f661678 am 5b820a8a: Fix build 
* commit '5b820a8aa1a200824e44aede6bc1e381a6d69dd5':
  Fix build
 2014-10-27 02:46:22 +00:00
Wonsik Kim
5b820a8aa1 Fix build 
Bug: 17648994
Change-Id: I35e1c89c707c4e9809cc3e4b6cf5b57dae898ba0
 2014-10-27 11:02:10 +09:00
Wonsik Kim
bae8d7e64a am 03bdbca2: am 470b77b8: Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev 
* commit '03bdbca2a9582691063585ce5fca11e6a33bdfaf':
  TIF: change input state based on the number of available streams
 2014-10-27 02:01:13 +00:00
Wonsik Kim
03bdbca2a9 am 470b77b8: Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev 
* commit '470b77b8cf185f75ef38e8757be72d46b504cf9f':
  TIF: change input state based on the number of available streams
 2014-10-27 01:34:21 +00:00
Wonsik Kim
470b77b8cf Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev 2014-10-27 00:59:44 +00:00
Joe Fernandez
73c463c8d8 am c12508e7: am f0d7cdbd: am 956ee53b: am 4fee8c89: docs: Home page - fix card images that are showing up on the home page 
* commit 'c12508e716763066b624c9e28b5ac61df553c536':
  docs: Home page - fix card images that are showing up on the home page
 2014-10-25 09:47:58 +00:00