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

170500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Geoff Mendal
2ac7b66ea6 Merge "Import translations. DO NOT MERGE" 2014-10-27 15:38:43 +00:00
Geoff Mendal
5121550e06 Import translations. DO NOT MERGE 
Change-Id: Ie6cfa6bd725f2392f7dafe74dc0a2f2915877849
Auto-generated-cl: translation import
 2014-10-27 08:28:30 -07: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
6e90d2a3a2 am df70dc51: (-s ours) am 323995c9: (-s ours) am 088260d3: (-s ours) am b3a33967: (-s ours) Import translations. DO NOT MERGE 
* commit 'df70dc51cedd60184a1a503a2cc824218b111fde':
  Import translations. DO NOT MERGE
 2014-10-27 14:03:19 +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
c58cabca58 am 65c0d6ad: am 14882cf3: am e828b6c0: Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev 
* commit '65c0d6ad0c9413df9dae659eb7bc88f49c7c55c9':
  AudioService: Restore ringer-mode validation check.
 2014-10-27 13:46:31 +00:00
Geoff Mendal
3069a9a18b am a3c19368: (-s ours) am 90ad228e: (-s ours) am 9162890f: (-s ours) Import translations. DO NOT MERGE 
* commit 'a3c19368ac6fff5c825da64c598bfaac1464910a':
  Import translations. DO NOT MERGE
 2014-10-27 13:41:21 +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
Geoff Mendal
0f9479a5c8 am c5993d24: (-s ours) am 01c73d1e: (-s ours) Import translations. DO NOT MERGE 
* commit 'c5993d247089e634b5d17984d0c8fb201899d7fb':
  Import translations. DO NOT MERGE
 2014-10-27 13:36:47 +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
Geoff Mendal
0be35480bb Import translations. DO NOT MERGE 
Change-Id: I248a938c719ca34f05b61deaf5a9a73f4170a170
Auto-generated-cl: translation import
 2014-10-27 06:03:54 -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
3be2d19b97 am f47b7c42: am 2c3f6616: am 5b820a8a: Fix build 
* commit 'f47b7c42cb23751d8ece8c5d244acfed43474b0d':
  Fix build
 2014-10-27 04:32:24 +00:00
Bill Yi
4fb9b753b5 am 69e61b5a: (-s ours) am 5a71f832: (-s ours) Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master 
* commit '69e61b5a5be11f9adab3bdab4bfe1cc0c4c95c0f':
 2014-10-27 04:19:54 +00: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
2eef7ef099 am bae8d7e6: am 03bdbca2: am 470b77b8: Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev 
* commit 'bae8d7e64afedc973ff27881e37779810d24e48c':
  TIF: change input state based on the number of available streams
 2014-10-27 02:10:00 +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
efcd54bd97 am 73c463c8: am c12508e7: am f0d7cdbd: am 956ee53b: am 4fee8c89: docs: Home page - fix card images that are showing up on the home page 
* commit '73c463c8d8f91b2ca4cd302d0f91852f5e499ade':
  docs: Home page - fix card images that are showing up on the home page
 2014-10-25 09:53: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
Joe Fernandez
c12508e716 am f0d7cdbd: am 956ee53b: am 4fee8c89: docs: Home page - fix card images that are showing up on the home page 
* commit 'f0d7cdbda58683d7af87eda1deb64f2969704a1b':
  docs: Home page - fix card images that are showing up on the home page
 2014-10-25 09:35:54 +00:00
Joe Fernandez
f0d7cdbda5 am 956ee53b: am 4fee8c89: docs: Home page - fix card images that are showing up on the home page 
* commit '956ee53b07f649b83d4c1eeda718c1bfbb3b19e1':
  docs: Home page - fix card images that are showing up on the home page
 2014-10-25 09:23:54 +00:00
Joe Fernandez
956ee53b07 am 4fee8c89: docs: Home page - fix card images that are showing up on the home page 
* commit '4fee8c89eb49d4935b4a2725f82d3a08f6a938d3':
  docs: Home page - fix card images that are showing up on the home page
 2014-10-25 09:15:06 +00:00
Joe Fernandez
4fee8c89eb docs: Home page - fix card images that are showing up on the home page 
Change-Id: I943b9b819f91069f961c5f93b14f01499f587e19
 2014-10-25 01:46:20 -07:00
Svet Ganov
5329b48404 am a6a440b6: am b32f04b7: Merge "Printing from two apps at the same time not working." into lmp-mr1-dev automerge: 5e1e4ef 
* commit 'a6a440b69114ec74502c52254059a9c902d4f6d4':
  Printing from two apps at the same time not working.
 2014-10-25 03:41:48 +00:00
Luan Nguyen
d420746e4b am 4870dab8: am ae5c3ee2: am 9167652e: am fba8fddf: am 781fe92c: Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev 
* commit '4870dab8646719c86bdc84c139523216d5b0ebe4':
  docs: Fix metadata description. Add new gesture test. Split layout test.
 2014-10-25 03:41:41 +00:00