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

158088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Sandler
dfb39ce332 Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev 2014-12-03 00:22:19 +00:00
George Mount
561261d444 Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 2014-12-03 00:13:28 +00:00
Adam Lesinski
130e30fe24 Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev 2014-12-02 23:50:51 +00:00
Christopher Tate
3bec50908b Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev 2014-12-02 23:44:20 +00:00
Christopher Tate
9939136121 Merge "Midnight should mean midnight" into lmp-mr1-dev 2014-12-02 23:44:00 +00:00
Adam Lesinski
4c488ff931 AAPT: Add custom transition classes to Proguard keep set 
Bug:18590044
Change-Id: Ib24831e669a09f0e6f32434081c0e2499702399c
 2014-12-02 15:40:17 -08:00
Alan Viverette
d72901f0d4 Merge "Update drawable container constant state following clone" into lmp-mr1-dev 2014-12-02 23:31:10 +00:00
Alan Viverette
9a888816de Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev 2014-12-02 23:30:54 +00:00
Alan Viverette
a6f8b2ce55 Deprecate one-arg getDrawableForDensity, update currents.txt 
BUG: 18579576
Change-Id: I7df6ec2952ab121e2be8ae0a016ccf36f6fba2ff
 2014-12-02 15:26:33 -08:00
Svetoslav
cdd3356da9 Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev 2014-12-02 23:16:38 +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
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
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
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
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
Baligh Uddin
2c6e7510a1 Import translations. DO NOT MERGE 
Change-Id: I5bfbdcf0a1631d7a0d6c19acabaa89f454ac177e
Auto-generated-cl: translation import
 2014-12-02 14:04:01 -08: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
41ec040005 Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev 2014-12-02 21:14:00 +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
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
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
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
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
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
Dianne Hackborn
221b545cda Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 2014-12-02 19:22:07 +00:00
Kweku Adams
d537987b17 Changing AUDIO_TURNED_ON constant. 
Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED.

Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a
 2014-12-02 19:18:13 +00:00
Ricardo Cervera
a107b5150b am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit '64f49162460eaddf49f9d56c5dc6a01f472e790c':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 19:13:54 +00:00
Ricardo Cervera
64f4916246 docs: Layout fixes for the Custom UI on Wear class 
Change-Id: I7e499374b5903fb3412c9c42a44c75f7a0bf28f0
 2014-12-02 11:05:22 -08:00
Ricardo Cervera-Navarro
fcae79f65d am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs 
* commit 'd5412e35801243e14123f2a0f03759073eb20fb6':
  Sensor documentation fixes.
 2014-12-02 19:01:22 +00:00
Christopher Tate
f6f8cca782 Midnight should mean midnight 
...not noon-or-midnight.  Fix the initial fstrim delay to properly refer
to midnight rather than ambiguous 12-hour "zero" so that fstrim job
consideration always starts overnight rather than possibly at the following
day's noon, depending on when the device was booted.

Bug 18076397

Change-Id: Ife3cd5bdeb14c7832b6e2a2de88dcfd1ba731b67
 2014-12-02 10:55:09 -08:00
Ricardo Cervera-Navarro
d5412e3580 am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs 
* commit '0ac703fc8f4569338acc823221089c62480f0d7c':
  Sensor documentation fixes.
 2014-12-02 18:53:20 +00:00
Andrew Lee
4ef369fce9 Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev 2014-12-02 18:51:01 +00:00
Christoph Studer
27ef018846 Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev 2014-12-02 18:49:51 +00:00
Ricardo Cervera-Navarro
0ac703fc8f am 1108b845: Merge "Sensor documentation fixes." into lmp-docs 
* commit '1108b845f940debde0c1959a9293cafdc264afcc':
  Sensor documentation fixes.
 2014-12-02 18:46:30 +00:00
Svet Ganov
eaaf0512fc Crash in print spooler when back pressed before content update complted. 
We are updating the printed content asynchronously. If the user cancels
printing before the first update is complete the spooler components are
in a destroyed state but we attempt to handle the completed update resulting
in a crash. Now if printing is cancelled we ignore the update result.

bug:18525491

Change-Id: I1ef47a17de19896cba2c7a1dd2bfc205065e0a5a
 2014-12-02 18:43:05 +00:00
Marvin Paul
5aeed158df Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev 2014-12-02 18:36:32 +00:00
Ricardo Cervera-Navarro
1108b845f9 Merge "Sensor documentation fixes." into lmp-docs 2014-12-02 18:33:50 +00:00
Dianne Hackborn
a01a0faebf Fix issue #18510117: Returning from an activity started with... 
...startActivityForResult causes SecurityExpcetion

The ReferrerIntent hack was becoming visible to apps, which caused
a mismatch between marshalling/unmarshalling of the IPC call.

Change-Id: Ibcb788327b5bae4426efc826551799fa87d1cbaa
 2014-12-02 10:33:14 -08:00