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

11350 Commits

Author SHA1 Message Date
Adrian Roos
4a915ab505 am 288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 
* commit '288f65e3811d17273085bc5c8b553f9ba8833dd4':
  Fix NPE in FlashlightController
  Fix stale unlock icon
 2014-10-28 16:44:31 +00:00
Adrian Roos
288f65e381 Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 
* changes:
  Fix NPE in FlashlightController
  Fix stale unlock icon
 2014-10-28 15:23:14 +00:00
Winson Chung
0baa55a743 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 
automerge: b55f7d7

* commit 'b55f7d79d19e8d8786fab8faabedb2f253bfacf8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-27 23:53:52 +00:00
Winson Chung
b55f7d79d1 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 2014-10-27 23:39:11 +00:00
Eric Laurent
af93061493 am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev 
* commit '670a82cbb1b62e69fa7ef7387eed545a76c96f76':
  audioservice: fix default stream volume
 2014-10-27 20:36:54 +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
Eric Laurent
670a82cbb1 Merge "audioservice: fix default stream volume" into lmp-mr1-dev 2014-10-27 19:40:30 +00:00
winsonchung
f14fdda212 Fixing potential crash when the task loader is stopped. (Bug 18135583) 
Change-Id: I44f766e52f05c38a1b6c4a2e7942e3d6ecaae501
 2014-10-27 12:08:54 -07:00
Eric Laurent
91377de6f2 audioservice: fix default stream volume 
When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.

Bug: 17507571.

Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
 2014-10-27 10:13:00 -07:00
Adrian Roos
fa81d2126a Fix NPE in FlashlightController 
Bug: 18007548
Change-Id: Iecd1303feeb8062741752862312043ecd75cebbe
 2014-10-27 16:57:43 +01: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
Adrian Roos
b9ae09066c Fix stale unlock icon 
Bug: 17405104
Change-Id: I2076c5008fc3617b8a0da5f547bbdca27ce875f4
 2014-10-27 14:20:30 +01:00
Svet Ganov
5e1e4ef419 am b32f04b7: Merge "Printing from two apps at the same time not working." into lmp-mr1-dev 
* commit 'b32f04b785306f06d7d07b824fb8dcc1b4a61aa6':
  Printing from two apps at the same time not working.
 2014-10-25 00:22:57 +00:00
Svet Ganov
b32f04b785 Merge "Printing from two apps at the same time not working." into lmp-mr1-dev 2014-10-25 00:16:58 +00:00
Svet Ganov
99a82437ed Printing from two apps at the same time not working. 
When printing from two apps at the same time the second print UI is
getting stuck. There were a couple of issues here:

AdapterView was not notifying for item selection if the data changes
after scheduling a dalayed selection notification and the notification
execution. The code assumed that a layout pass will occur and posponed
the notification after the layout pass but it is not guaranteed that
such a layout pass will occur. Now we delay only if a layout pass is
being scheduled.

Also when binding to the PDF rendering service the print spooler was
using the same intent and as a result two print activites were getting
the same renderer instance while they should get separate ones. Now
we use different data in the intent to ensure we get separate renderer
instances.

Change-Id: I6aa7c7b041957804b4273549dd837a6d70064efc
 2014-10-24 17:02:32 -07:00
Winson Chung
56f77a6f53 Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)" into lmp-mr1-dev 
automerge: 0841cf7

* commit '0841cf7f37d7b20a08fa894c366f32fde55ea7e9':
  Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)
 2014-10-24 22:25:31 +00:00
Winson Chung
0841cf7f37 Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)" into lmp-mr1-dev 2014-10-24 22:08:12 +00:00
Jeff Sharkey
ea1841a3c1 Merge "Use default volume description when missing label." into lmp-mr1-dev 
automerge: cc66a23

* commit 'cc66a236f90cbef7f9562b4179c3aec517f4f082':
  Use default volume description when missing label.
 2014-10-24 21:41:19 +00:00
Jeff Sharkey
cc66a236f9 Merge "Use default volume description when missing label." into lmp-mr1-dev 2014-10-24 21:33:00 +00:00
Jeff Sharkey
c99d00be67 Use default volume description when missing label. 
Some mounted storage volumes may not have a user-defined label.  In
those cases, use the default description for the volume.

Bug: 17781505
Change-Id: I8558ba2615c2ff2647a5d44afaec83249df466ab
 2014-10-24 13:57:47 -07:00
Svet Ganov
fb7c62c143 Merge "Crash in print spooler if printing app killed from recents." into lmp-mr1-dev 
automerge: 7cf7c36

* commit '7cf7c364386d18b94d212d98072e97c1c3d87e26':
  Crash in print spooler if printing app killed from recents.
 2014-10-24 20:46:17 +00:00
Jeff Sharkey
043f8dd274 Merge "Recent directories can\'t show file size." into lmp-mr1-dev 
automerge: 379551e

* commit '379551ebd54947cdff5600af52940f9c283aac1f':
  Recent directories can't show file size.
 2014-10-24 20:44:53 +00:00
Svet Ganov
7cf7c36438 Merge "Crash in print spooler if printing app killed from recents." into lmp-mr1-dev 2014-10-24 20:32:19 +00:00
Jeff Sharkey
379551ebd5 Merge "Recent directories can't show file size." into lmp-mr1-dev 2014-10-24 20:29:59 +00:00
Jeff Sharkey
0166ddf5bb Recent directories can't show file size. 
Don't show the toggle to the user, which can avoid crashing.

Bug: 17942524
Change-Id: Iaedd61b7c69e14b57508cb9865d1e0124ca2e505
 2014-10-24 13:06:32 -07:00
Svet Ganov
4237c92d85 Crash in print spooler if printing app killed from recents. 
If the printing app with the print UI on top is killed from recents we get
a crash because: 1) the remote print document was not transitioned to a
failed state if the printing app dies (this is an unrecoverable failure);
2) the print preview controller was destroyed asyncronosly during which it
also asynchronously disconnects from the rendering service which however
happens after the system has already cleaned up all connections of the print
UI activity as it is being destoryed.

bug:18109386

Change-Id: If6200b14a8aa90622228bbb659e9c4962226f561
 2014-10-24 13:01:54 -07:00
Winson Chung
00f65038bb am 272b0a1d: Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev 
* commit '272b0a1d6acdb7c4d244a498f3769e20c35f43d1':
  Fixing issue where Recents would not work if the time is changed. (Bug 17995039)
 2014-10-24 18:39:28 +00:00
Winson Chung
272b0a1d6a Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev 2014-10-24 18:32:02 +00:00
Winson Chung
e60abbd8f2 am 623484d2: Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev 
* commit '623484d231436ee209089adaa6b88b68f0ebf534':
  Ensuring that user-specific Recent tasks are removed. (Bug 18036610)
 2014-10-24 18:30:38 +00:00
Winson Chung
788dd73c9e am 6697322a: Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev 
* commit '6697322af724d44ee59259d4f5563b07c24f62b4':
  Should use Activity.onEnterAnimationComplete. (Bug 18031283)
 2014-10-24 18:30:33 +00:00
Winson Chung
bac679b0d4 Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321) 
Change-Id: I7fc627c79fe369e444ab411d109c439f796d67ff
 2014-10-24 11:29:12 -07:00
Winson Chung
623484d231 Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev 2014-10-24 18:25:10 +00:00
Winson Chung
6697322af7 Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev 2014-10-24 18:24:54 +00:00
Svet Ganov
0abcda5929 am fdef09ec: Merge "Sometimes historical printers not properly ordered." into lmp-mr1-dev 
* commit 'fdef09ecef877605f47cc763eb497364f27e5c45':
  Sometimes historical printers not properly ordered.
 2014-10-24 16:48:26 +00:00
Selim Cinek
31e307e600 am 1b459f89: Merge "Cleaned up status bar closing handling" into lmp-mr1-dev 
* commit '1b459f89a738fa913ed12fe893e435b2f6cc9416':
  Cleaned up status bar closing handling
 2014-10-24 16:48:21 +00:00
Svet Ganov
fdef09ecef Merge "Sometimes historical printers not properly ordered." into lmp-mr1-dev 2014-10-24 16:42:18 +00:00
Selim Cinek
1b459f89a7 Merge "Cleaned up status bar closing handling" into lmp-mr1-dev 2014-10-24 16:41:19 +00:00
Selim Cinek
dbbcfbe8ae Cleaned up status bar closing handling 
This could lead to a bug where there was a hole in the shade.

Bug: 17961295
Change-Id: Ief4bb3f79433a062c4904329e7ca130987d7fe0f
 2014-10-24 17:52:35 +02:00
Christoph Studer
629a9a0b39 am 6709fba9: Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev 
* commit '6709fba99e76480ae2728a7832c0c9796a11658a':
  SysUI: Reset ExpandableNotiRow.mActualHeight on reset()
 2014-10-24 15:20:40 +00:00
Christoph Studer
6709fba99e Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev 2014-10-24 15:15:03 +00:00
Selim Cinek
962c5ab849 am 2985dd76: Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev 
* commit '2985dd763b21c63f54ef3d5f26cae249480ea05a':
  Fixed a bug where the indication text could get too high
 2014-10-24 15:03:06 +00:00