Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
63c7a655be am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev 
* commit '1b33396ee4047e79777495a8682b9117e88bba5c':
  Deprecate Resources.getDrawable(int) in favor of the two-arg version
 2014-12-02 23:11:36 +00:00
Ricardo Cervera
ce9936a85e am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit '152470a29212479c8ccc9e2c1a9f26188a5b7411':
  docs: Long press to dismiss fix by Wayne
 2014-12-02 23:11:30 +00:00
Svetoslav
a1ec54b454 Inconsistent media sizes for es-US locale. 
The pdf_printer_media_sizes array for es-US was missing
resulting in using European paper sizes for US locale and
as a result no default media size for this locale. This
resulted in printing not working for es-US.

bug:18536264

Change-Id: Ied552a63d628be38dc5249f3cd6107cbeaa692a8
 2014-12-02 15:09:59 -08:00
RoboErik
870c5a6593 Tweak the behavior of the MediaSessionStack 
This makes the following changes in behavior:
-We will only cache a pending intent for a session if it reaches the
 one of the playing states.
-If a previously priority session is removed the next session only
 gets priority if it is in a playing state. Otherwise we use the removed
 session's PendingIntent.
-The last session to have been playing or to have been added gets
 priority after any currently playing sessions, but only if it is still
 in the list of active sessions.
-We will only use a session that isn't playing and isn't the most recently
 playing/added if we don't have a PendingIntent from the last playing session
 to fall back on.

bug:18589421
Change-Id: I650c56a782bb1f1d5e64d7574a7d2387606f3b17
 2014-12-02 15:08:26 -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
Alan Viverette
1b33396ee4 Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev 2014-12-02 23:07:03 +00:00
Ricardo Cervera
152470a292 am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit '8c71df8dd89c68128e709eab60da8105772d6194':
  docs: Long press to dismiss fix by Wayne
 2014-12-02 23:05:07 +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
Alan Viverette
c10e3960d9 Deprecate Resources.getDrawable(int) in favor of the two-arg version 
This is a landmine for developers. If they need to obtain an unthemed
drawable, they should be using an explicit null theme.

BUG: 18579576
Change-Id: Ibca6b4c3e8e50dca144571244e035caec6fa91f8
 2014-12-02 14:58:08 -08:00
Ricardo Cervera
8c71df8dd8 am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit 'f9b8bd5e73cdb694eab1b158e7b313be60534820':
  docs: Long press to dismiss fix by Wayne
 2014-12-02 22:56:38 +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
Ricardo Cervera
f9b8bd5e73 am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit '6ee2ca2f1e24d27c7a1e2430ad0272ef9f921a4a':
  docs: Long press to dismiss fix by Wayne
 2014-12-02 22:50:48 +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
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
Tor Norbye
ce1c67cdd7 Add BIND_IMPORTANT to @BindServiceFlags 
bindService calls passing BIND_IMPORTANT is being flagged
as invalid in Android Studio because our tools metadata
(derived from @BindServiceFlags) does not know that BIND_IMPORTANT
(and BIND_ADJUST_WITH_ACTIVITY) are allowed.

https://code.google.com/p/android/issues/detail?id=81489

Change-Id: Ifad899f581f01c96bff46e304013219b80710c87
 2014-12-02 14:02:06 -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