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

176076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
625fa573b4 am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-03 00:30:56 +00:00
Chris Wren
83cb9cad31 am 723bce8a: am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes" 
* commit '723bce8a0d4fa900ca4344c03e5e82b5881fcf19':
  Keep deleteIntent when copying Notification attributes
 2014-12-03 00:30:44 +00:00
Baligh Uddin
2135ce48a1 am 97267def: (-s ours) am e3a16016: (-s ours) am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '97267def8219d6ad3d8a96449b08653ae1bd6832':
  Import translations. DO NOT MERGE
 2014-12-03 00:30:35 +00:00
Baligh Uddin
fa2b3c24c7 am 52632ad8: (-s ours) am 74724945: (-s ours) am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '52632ad881c96e785518e18fde1a72e6f6e25a42':
  Import translations. DO NOT MERGE
 2014-12-03 00:30:30 +00:00
Baligh Uddin
12cadd4daf am 3b027a37: (-s ours) am 3bcc97e7: (-s ours) am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3b027a374e6e8ba084b6dcfcdbf81ee581e20517':
  Import translations. DO NOT MERGE
 2014-12-03 00:30:26 +00:00
Baligh Uddin
68ccc097e9 am e105a70a: (-s ours) am 261db4f3: (-s ours) am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e105a70ae1dcfdbca15e188f27d7d3a1bea788d2':
  Import translations. DO NOT MERGE
 2014-12-03 00:30:22 +00:00
Jinsuk Kim
7ef3d12832 am eb6c6d63: am 566d15f6: am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev 
* commit 'eb6c6d634774d85eceac135a91fdeaf3a884152e':
  CEC: Set the parameter of <System Audio Mode Request> right
 2014-12-03 00:30:08 +00:00
Alan Viverette
5c39807a57 am 73d28900: resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp 
* commit '73d28900e96b84b2833954669f1db95326f3d6e0':
  Consider RTL layout in DPAD navigation in AbsSeekBar
 2014-12-03 00:29:46 +00:00
Craig Mautner
7ef0d514c3 am 61a7b7cf: am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev 
* commit '61a7b7cff57dc66a1f64c9d7519fc1f6844b6915':
  Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
 2014-12-03 00:29:30 +00:00
Stuart Scott
cacd99bd2c am cc4cd6e1: am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 
* commit 'cc4cd6e1abe81d1edda7f1489dbd26298d38a699':
  Subscription Info density-dependent text size and localized SIM slot index
 2014-12-03 00:29:21 +00:00
Nick Kralevich
2ae769782e resolved conflicts for merge of ef9b1643 to master 
Change-Id: Ifcde272f882e55998b16e02cca1e827dec35ce6f
 2014-12-02 16:22:57 -08:00
Adam Lesinski
9438ad1599 am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 23:07:43 +00:00
Adam Lesinski
e580d6617f am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit 'e89a286541e242ad96705fcdd1fe2c6a9eafb4a0':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 23:00:06 +00:00
Adam Lesinski
e89a286541 Merge changes If2c7e09f,Ie21f227c 
* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 22:52:37 +00:00
Chris Wren
723bce8a0d am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes" 
* commit '47a5cb122ab495e8420c46d8f324bddcd38920af':
  Keep deleteIntent when copying Notification attributes
 2014-12-02 22:45:22 +00:00
Chris Wren
47a5cb122a am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes" 
* commit 'acd01ff07668a608cb4890a2ea1533a2397149c8':
  Keep deleteIntent when copying Notification attributes
 2014-12-02 22:38:28 +00:00
Chris Wren
acd01ff076 Merge "Keep deleteIntent when copying Notification attributes" 2014-12-02 22:31:09 +00:00
Baligh Uddin
97267def82 am e3a16016: (-s ours) am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e3a160169bc26bcac35d1759423ab4e98a18d063':
  Import translations. DO NOT MERGE
 2014-12-02 22:27:22 +00:00
Baligh Uddin
52632ad881 am 74724945: (-s ours) am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '747249454ed12b4def32f82c461d5590bec2f2f8':
  Import translations. DO NOT MERGE
 2014-12-02 22:27:16 +00:00
Baligh Uddin
3b027a374e am 3bcc97e7: (-s ours) am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3bcc97e7a1eab012d55fa85fa352a95f7c26f547':
  Import translations. DO NOT MERGE
 2014-12-02 22:27:11 +00:00
Baligh Uddin
e105a70ae1 am 261db4f3: (-s ours) am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '261db4f3a8709a0773d0932dd1052f526e59da3c':
  Import translations. DO NOT MERGE
 2014-12-02 22:27:06 +00:00
Baligh Uddin
e3a160169b am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '92ad4dd017a13364b4001bdb04911202932f81c2':
  Import translations. DO NOT MERGE
 2014-12-02 22:20:03 +00:00
Baligh Uddin
747249454e am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'fccaa58c5e254c9fdbf1e90ebfa0d0e27fc33585':
  Import translations. DO NOT MERGE
 2014-12-02 22:19:58 +00:00
Baligh Uddin
3bcc97e7a1 am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '6774911ee2954eebf2b2003e97b949be6bdbd836':
  Import translations. DO NOT MERGE
 2014-12-02 22:19:53 +00:00
Baligh Uddin
261db4f3a8 am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '30460ae37e2d4f8ffda646af471b7039b519d65a':
  Import translations. DO NOT MERGE
 2014-12-02 22:19:48 +00:00
Baligh Uddin
92ad4dd017 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-02 22:16:25 +00:00
Baligh Uddin
fccaa58c5e Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-02 22:15:07 +00:00
Baligh Uddin
6774911ee2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-02 22:14:50 +00:00
Baligh Uddin
30460ae37e Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-02 22:14:47 +00:00
Baligh Uddin
c46c0d9d82 Import translations. DO NOT MERGE 
Change-Id: I6acd5c2437f73dcbeca9cf6746c0a7c23c98eebc
Auto-generated-cl: translation import
 2014-12-02 14:14:05 -08:00
Baligh Uddin
d8be365ef8 Import translations. DO NOT MERGE 
Change-Id: I59cdaeb46767c757f817f3e15b7794e7773aa41d
Auto-generated-cl: translation import
 2014-12-02 14:09:14 -08:00
Baligh Uddin
864eedc401 Import translations. DO NOT MERGE 
Change-Id: I1fa46bb80033e1eee5de30cbf0d0d5d07ae4147c
Auto-generated-cl: translation import
 2014-12-02 14:07:25 -08:00
Jinsuk Kim
eb6c6d6347 am 566d15f6: am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev 
* commit '566d15f653c2e2c8440090bb2cca1baaad658436':
  CEC: Set the parameter of <System Audio Mode Request> right
 2014-12-02 22:05:11 +00:00
Baligh Uddin
2c6e7510a1 Import translations. DO NOT MERGE 
Change-Id: I5bfbdcf0a1631d7a0d6c19acabaa89f454ac177e
Auto-generated-cl: translation import
 2014-12-02 14:04:01 -08:00
Alan Viverette
73d28900e9 resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp 
Change-Id: Icb394ddc92eb64732993ef345284e63c9844f76b
 2014-12-02 13:58:27 -08:00
Jinsuk Kim
566d15f653 am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev 
* commit 'fb020862e0d8740d31ead217fd4d308450b4170d':
  CEC: Set the parameter of <System Audio Mode Request> right
 2014-12-02 21:58:18 +00:00
Jinsuk Kim
fb020862e0 Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev 2014-12-02 21:50:44 +00:00
Craig Mautner
61a7b7cff5 am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev 
* commit 'e4e7d2cdf40407240d63ef4f0a3249e726a1d632':
  Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
 2014-12-02 21:27:23 +00:00
Craig Mautner
e4e7d2cdf4 am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev 
* commit '41ec0400056daa97d40bd4a8225b7d4f0d665598':
  Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
 2014-12-02 21:20:17 +00:00
Stuart Scott
cc4cd6e1ab am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 
* commit '15b2d9ab44690156e067020e12b329997ef5bba6':
  Subscription Info density-dependent text size and localized SIM slot index
 2014-12-02 21:18:29 +00:00
Craig Mautner
41ec040005 Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev 2014-12-02 21:14:00 +00:00
Stuart Scott
15b2d9ab44 am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 
* commit '4e779ecd56faad5901854e030f593c5d4ad3dee8':
  Subscription Info density-dependent text size and localized SIM slot index
 2014-12-02 21:11:48 +00:00
Stuart Scott
4e779ecd56 Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 2014-12-02 21:04:54 +00:00
Craig Mautner
ca0a124da0 Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED 
Windows that had FLAG_SHOW_WHEN_LOCKED and FLAG_DISMISS_KEYGUARD set
would ignore the FLAG_DISMISS_KEYGUARD if the lockscreen was
insecure. This change adds a test for insecure keyguards when the
two flags are set together.

Fixes bug 18563298.

Change-Id: I3027c7ec476d3ac15978f7e6a78b3c2050cbab02
 2014-12-02 12:43:18 -08:00
Paul Lawrence
ef9b16431e am 1056d5a9: am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev 
* commit '1056d5a997e3f30230e1e4316310586dd15a4600':
  Add mechanism for securely returning parameters though NativeDaemonConnector
  Revert "DO NOT MERGE: Don't log passwords returned from vdc"
 2014-12-02 20:30:01 +00:00
Paul Lawrence
1056d5a997 am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev 
* commit '75f304f922dcb27e57dcbea17a36d426f6b223a7':
  Add mechanism for securely returning parameters though NativeDaemonConnector
  Revert "DO NOT MERGE: Don't log passwords returned from vdc"
 2014-12-02 20:22:18 +00:00
Paul Lawrence
75f304f922 Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev 
* changes:
  Add mechanism for securely returning parameters though NativeDaemonConnector
  Revert "DO NOT MERGE: Don't log passwords returned from vdc"
 2014-12-02 20:17:33 +00:00
Ricardo Cervera
85ed352c36 am 4c754150: am 0e8c7737: am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit '4c75415055eb023d4f868a6f22a7f05a1115a8e0':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 20:07:53 +00:00
Jorim Jaggi
9ab2b30e15 am d6cdffd1: am 5c1459f5: am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev 
* commit 'd6cdffd1b38df68efd9cd13827f365185f3ea86d':
  Update dark mode on notifications when content is updated
 2014-12-02 19:57:24 +00:00
Ricardo Cervera
4c75415055 am 0e8c7737: am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit '0e8c773775bf6d2ae9986a64b8aece332992c6d4':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 19:57:08 +00:00