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

170405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
92692c0284 Keep snapshot order matching the shared elements. 
Bug 18578796

When no snapshot was created, we weren't adding anything to
the snapshot list. When a snapshot is not created, we should
add an null snapshot to the snapshot list to keep them in
order.

Change-Id: I522e485163229230037dcdd635b83cff800df28f
 2014-12-02 14:31:31 -08: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
Christoph Studer
934025e8d7 Turn off DEBUG_GESTURES 
Stop spamming the logs.

Bug: 18584495
Change-Id: Icc7337005a0efc0590b502e93c459f05f0a9ace9
 2014-12-02 22:12:50 +00: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
Svetoslav
94ef9e6bc8 Allow more space for the printer spinner to avoid truncation. 
The save to PDF option is truncated in Russian. While the printer
name can be arbitrarily long, the Save to PDF printer should not
be truncated.

bug:18546218

Change-Id: Id35bd638c505783a2288c1602960e8d74ec3b882
 2014-12-02 13:46:36 -08: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
Ricardo Cervera
6ee2ca2f1e docs: Long press to dismiss fix by Wayne 
Bug: 17924105

Change-Id: Ifbc26b923771e7389e4df6abe9005bc3f0269c1e
 2014-12-02 13:09:45 -08: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
Jason Sams
81cd2b18bd Fix bug in passing of context flags and version. 
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
 2014-12-02 12:37:04 -08:00
Jing Zhao
e6edb161a7 Separate voice/data roaming state and type 
It is possible for voice and data to register on different networks so
that the roaming state for them could be different. Provide separated
APIs to handle voice and data roaming.

Also, add the configuration of CDMA international roaming indicators.

Bug: 17318123
Change-Id: Iede9132cbf94bc9971702bd9232374585edd5cd0
 2014-12-02 12:33:06 -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
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
Ricardo Cervera
0e8c773775 am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit 'affe473213deb4b2d1b9354cc57e2f517840e21a':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 19:49:54 +00:00
Jorim Jaggi
d6cdffd1b3 am 5c1459f5: am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev 
* commit '5c1459f5e4ac9687a5fe602efa5f9ad4992c94a1':
  Update dark mode on notifications when content is updated
 2014-12-02 19:49:32 +00:00
Christopher Tate
864d42eb96 Properly recognize repeating wakeup alarms 
The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral.  Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.

Bug 18591317

Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427
 2014-12-02 11:48:53 -08:00
Jorim Jaggi
5c1459f5e4 am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev 
* commit 'dad13577e5c699ab34e4243204cf767de4a0f0cd':
  Update dark mode on notifications when content is updated
 2014-12-02 19:41:43 +00:00
Ricardo Cervera
affe473213 am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit 'aa59bf2dd81e974c37eff8be3b529ed48b0b59c3':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 19:41:30 +00:00
Dianne Hackborn
1c2f6ca136 am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 
* commit '2f58bab7b026fbe010aad8ae777f3abda295dc66':
  Fix issue #18510117: Returning from an activity started with...
 2014-12-02 19:40:10 +00:00
Kweku Adams
51de927f5a am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant. 
* commit 'fa99c345c440a37ae0cc74cba6ffd6e88ab9ddb2':
  Changing AUDIO_TURNED_ON constant.
 2014-12-02 19:40:04 +00:00
Alan Viverette
850cdbe58c am 71c5d62d: Merge "Consider RTL layout in DPAD navigation in AbsSeekBar" 
* commit '71c5d62d9680207c4d3d25ac3f590f3667b250eb':
  Consider RTL layout in DPAD navigation in AbsSeekBar
 2014-12-02 19:36:03 +00:00
Jorim Jaggi
dad13577e5 Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev 2014-12-02 19:35:42 +00:00
Dianne Hackborn
2f58bab7b0 am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 
* commit '221b545cdaba2522fbb299428ac048641410c284':
  Fix issue #18510117: Returning from an activity started with...
 2014-12-02 19:33:28 +00:00
Kweku Adams
fa99c345c4 am d537987b: Changing AUDIO_TURNED_ON constant. 
* commit 'd537987b173f6b48f5196a2ae7d445af1a49e2bb':
  Changing AUDIO_TURNED_ON constant.
 2014-12-02 19:33:23 +00:00
Ricardo Cervera
aa59bf2dd8 am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit 'a107b5150b38a8c6585631b1773d6c10f682f42b':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 19:32:49 +00:00