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

165461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
47545d4777 am 649fee03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 5a1a14a -s ours 
automerge: 39545fc  -s ours

* commit '39545fce48e41a3de73df3b6a423c43e72d49457':
  Import translations. DO NOT MERGE
 2014-10-27 21:29:03 +00:00
Geoff Mendal
a3983b27e6 am 496f0ea6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: e5661ee  -s ours

* commit 'e5661ee3deb18c060b36fd12ee88ca37ec25fdda':
  Import translations. DO NOT MERGE
 2014-10-27 21:28:04 +00:00
Adrian Roos
b3726de168 am 4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev 
automerge: f9b36d5

* commit 'f9b36d5ef94c92a66c08167d5e7e911e5ea8c645':
  SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState
 2014-10-27 21:27:01 +00:00
Jorim Jaggi
f53bc26f4e am f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev 
automerge: 97f1a97

* commit '97f1a97d89366159374c2be3d74e0642705d80bf':
  Fix padding between battery and system icons
 2014-10-27 21:25:59 +00:00
Jorim Jaggi
7157ce9e94 am 9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev 
automerge: 876820e

* commit '876820eb670936815e9064f816a8ce14bda64455':
  Fix system icon widths
 2014-10-27 21:24:41 +00:00
Jorim Jaggi
05e7c26b0d am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev 
automerge: 286f361

* commit '286f36112e424a173a5a57f881545045c54ec76b':
  Add padding when both data icon and wifi icon is visible
 2014-10-27 21:23:43 +00:00
George Mount
06e74b30ae am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev 
automerge: 7b042be

* commit '7b042be5e2975eddf1da915be052ad70fc07c115':
  Fix transition being canceled improperly.
 2014-10-27 21:22:49 +00:00
George Mount
8b92704f02 am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev 
automerge: 3437192

* commit '34371925470e43dfe1b194fd3f6d0b942f13f1bd':
  Add resizeClip attribute to ChangeBounds.
 2014-10-27 21:21:18 +00:00
Geoff Mendal
39545fce48 am 649fee03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 5a1a14a -s ours 
* commit '649fee03263decf9df12db01f02cf77779a388ce':
  Import translations. DO NOT MERGE
 2014-10-27 20:36:35 +00:00
Geoff Mendal
e5661ee3de am 496f0ea6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '496f0ea68ae043dd8fd26b8a9577c496e25083c0':
  Import translations. DO NOT MERGE
 2014-10-27 20:36:30 +00:00
Adrian Roos
f9b36d5ef9 am 4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev 
* commit '4bc3c8bd643ca6840bf5b3fe01d8221f3a389d96':
  SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState
 2014-10-27 20:36:25 +00:00
Jorim Jaggi
97f1a97d89 am f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev 
* commit 'f129ee377ab2771a5159fde9208da8c26207d41b':
  Fix padding between battery and system icons
 2014-10-27 20:36:20 +00:00
Jorim Jaggi
876820eb67 am 9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev 
* commit '9016d8fa80d1f3d17c612fdc7edcfabb70b1c29e':
  Fix system icon widths
 2014-10-27 20:36:16 +00:00
Jorim Jaggi
286f36112e am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev 
* commit '312c1e79d49a1ce7f7202f3bedb3a8d1fa110e4d':
  Add padding when both data icon and wifi icon is visible
 2014-10-27 20:36:10 +00:00
George Mount
7b042be5e2 am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev 
* commit 'e0f76e9a6d352c45a1729b99ea0df59bd4359423':
  Fix transition being canceled improperly.
 2014-10-27 20:36:05 +00:00
George Mount
3437192547 am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev 
* commit '03d5c6f55b316a5b0e1aae405077d1083df60b36':
  Add resizeClip attribute to ChangeBounds.
 2014-10-27 20:35:59 +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
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
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
Geoff Mendal
9162890f05 Import translations. DO NOT MERGE 
Change-Id: I39fda7f92c545242da499b8bb93a044820e17560
Auto-generated-cl: translation import
 2014-10-27 06:17:58 -07: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