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

10678 Commits

Author SHA1 Message Date
Svetoslav
ca9dde9932 am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev 
* commit '3b42928c318d2732d75bb9c0ed7b864c47a265a2':
  Print spooler UI polish and bug fixes.
 2014-09-05 22:45:40 +00:00
Svetoslav
6552bf3da6 Print spooler UI polish and bug fixes. 
1. Added an empty state for pages that are being rendered.

2. Fixed a NPA on a binder thread when destoroying the
   remote print adapter.

3. Fixed a rare crash when the print activity gets an
   activity class callback while initializing.

4. Changed the preview pages on phone in land to four.

5. Fixed a flicker from a list of pages to an empty state
   and then back to the list of pages.

bug:15704969
bug:16966145

Change-Id: I0eea2f30a102d8fefcbf90187fa6d8612fb19434

Conflicts:
	packages/PrintSpooler/src/com/android/printspooler/widget/PageContentView.java
 2014-09-05 15:21:50 -07:00
Eino-Ville Talvala
3954f349cd am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit '8a52744d343dee6cc4958d0cc59484c036f3bf9f':
  Camera2: Final API revisions
 2014-09-05 20:55:50 +00:00
Eino-Ville Talvala
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
RoboErik
8c1f4d1793 am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 
* commit '52dcc8a1dbd3e48e65253fa82b35bceb8428da75':
  rename add/removeCallback to register/unregisterCallback
 2014-09-05 19:53:58 +00:00
RoboErik
dfafca7691 Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 2014-09-05 19:49:36 +00:00
Eino-Ville Talvala
fd887436bd Camera2: Final API revisions 
- Rename listeners to callbacks. Listeners are single-method and are interfaces,
  while callbacks are abstract may get more methods in the future.
- Use register/unregister for registering callbacks, not add/remove.

Bug: 17389922
Change-Id: Ic6b46ad79cb43a43a85e2a4b63f059d3af99798b
 2014-09-05 12:43:11 -07:00
RoboErik
14f717a506 rename add/removeCallback to register/unregisterCallback 
bug:17390821
Change-Id: Id610b481083686dba2a28b6c7c47b747f89eef4f
 2014-09-05 11:40:33 -07:00
Svetoslav
5cf8b4b751 am f1a858c7: Fix broken aidl 
* commit 'f1a858c7887ba8af0cf991fd6fa8a1f72e069ff1':
  Fix broken aidl
 2014-09-05 17:29:23 +00:00
Svetoslav
d0c362de1c Fix broken aidl 
Change-Id: I2187abd75b4f60e790b747a492ad610592f2ef53
 2014-09-05 10:19:39 -07:00
Svetoslav
6fadd4436b am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev 
* commit '4c8c9ac06fc213d9bc9d82c39d55f425fee5b429':
  Update FrameStats API per api-council request.
 2014-09-05 17:13:29 +00:00
Svetoslav
bd7958e6d9 am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '6f0cf112a712cd1a9e77a9b2b66e5f771d4e061e':
  Addressing API council comments for UserManager.
 2014-09-05 17:13:24 +00:00
Svetoslav
53dcd394aa Update FrameStats API per api-council request. 
bug:17390382

Change-Id: I50518834569f4d0ec394709294537256f03530e0
 2014-09-05 10:07:02 -07:00
Svetoslav
c7d62f02b8 Addressing API council comments for UserManager. 
bug:17390424

Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
 2014-09-05 10:07:02 -07:00
Tom O'Neill
2596b43ebe am 971e730a: Merge "Suppress location tile in QS on lock screen" into lmp-dev 
* commit '971e730a5d646719688a70a59d8b7c987945d4ef':
  Suppress location tile in QS on lock screen
 2014-09-05 16:41:51 +00:00
Tom O'Neill
08e76661bc Merge "Suppress location tile in QS on lock screen" into lmp-dev 2014-09-05 16:37:44 +00:00
Jorim Jaggi
5f6a4726d1 am 0e2b27df: Merge "Don\'t update notification layer when collapsing the panel" into lmp-dev 
* commit '0e2b27df7d672c0b765fd37b2a0d96ba6266a0d5':
  Don't update notification layer when collapsing the panel
 2014-09-05 16:31:19 +00:00
Jorim Jaggi
89b39b2b07 Merge "Don't update notification layer when collapsing the panel" into lmp-dev 2014-09-05 16:22:25 +00:00
Jorim Jaggi
8fbe98981e am 3dadb79a: Merge "Remove "forgot pattern" in pattern view" into lmp-dev 
* commit '3dadb79a7fe90a727568aa76744f0d0c5ea44782':
  Remove "forgot pattern" in pattern view
 2014-09-05 16:20:49 +00:00
Jorim Jaggi
1210912600 Merge "Remove "forgot pattern" in pattern view" into lmp-dev 2014-09-05 16:12:04 +00:00
Christoph Studer
61c4a11dc7 am d6036d35: Merge "SysUI: Sort status bar notification icons" into lmp-dev 
* commit 'd6036d35627f0ac3e03343b1e31108616b687eea':
  SysUI: Sort status bar notification icons
 2014-09-05 16:05:00 +00:00
Jim Miller
83aaad4c9b am 8007e4a6: Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev 
* commit '8007e4a65c2839de43b48199df9f8f3004e82c7f':
  Send USER_PRESENT broadcast after keyguard animation finishes
 2014-09-05 16:04:56 +00:00
Christoph Studer
8e2128ba4f Merge "SysUI: Sort status bar notification icons" into lmp-dev 2014-09-05 15:59:41 +00:00
Jim Miller
a8ecf45398 Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev 2014-09-05 15:57:16 +00:00
Jorim Jaggi
c39ba3ee0a am 6f52cfa8: Merge "Remove the scrimming of notifications" into lmp-dev 
* commit '6f52cfa8f52559fcc3c5c17348da18d18eed5655':
  Remove the scrimming of notifications
 2014-09-05 15:30:33 +00:00
Adrian Roos
cbf32fd75b am 8ab59227: Merge "Reorder brightness slider mirror in front of album art" into lmp-dev 
* commit '8ab5922758bf29d1b7de82214e9b7e6c3eb7c0ee':
  Reorder brightness slider mirror in front of album art
 2014-09-05 15:30:28 +00:00
Jorim Jaggi
aaabb0bc19 am 4ec48cb7: Merge "Hide notifications when occluded and disabled on keyguard" into lmp-dev 
* commit '4ec48cb7b428eef28e95ec4c6bf484d32196fa1a':
  Hide notifications when occluded and disabled on keyguard
 2014-09-05 15:30:17 +00:00
Selim Cinek
a433f61f9a am 1f49d9b3: Merge "Fixed a bug where the notifications could overlap when reset" into lmp-dev 
* commit '1f49d9b36609f9260bdf85ff3f5dc85f8af7229b':
  Fixed a bug where the notifications could overlap when reset
 2014-09-05 15:30:13 +00:00
Winson Chung
b209a05cdb am 927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 
* commit '927df1c290c65ae877b67e2383517494ee7afb68':
  Generalizing Recents widget category to Search box. (Bug 17334589)
 2014-09-05 15:30:03 +00:00
Adrian Roos
594da9adc5 am c5126d91: Merge changes Ibb63814e,I0322b1e6 into lmp-dev 
* commit 'c5126d91e9d772f3f1ed64404746f8fe7af580a7':
  Prevent full shade guesture from doing the wrong thing
  Add current user announce to MultiUserSwitch
 2014-09-05 15:29:53 +00:00
Christoph Studer
3cc1d40f40 am 8dd353c8: Merge "SysUI: Upsort PRIORITY_MAX system notifications" into lmp-dev 
* commit '8dd353c86c38f181032b5e0135bb91707ced9832':
  SysUI: Upsort PRIORITY_MAX system notifications
 2014-09-05 15:29:38 +00:00
Winson Chung
4de91d8325 am 893fd9fc: Merge "Ensure that there is enough space for the tablet search widget. (Bug 17190069)" into lmp-dev 
* commit '893fd9fc8320806a5bf14284775e2600c85f78d2':
  Ensure that there is enough space for the tablet search widget. (Bug 17190069)
 2014-09-05 15:29:34 +00:00
Tom O'Neill
d528930380 Suppress location tile in QS on lock screen 
- Work around bug in QS implementation

- Bug: 15916487

Change-Id: I623a4e31e8b4187d920c2724182c927328885b3b
 2014-09-05 08:22:47 -07:00
Jorim Jaggi
12a6782d61 Don't update notification layer when collapsing the panel 
This change makes sure that we don't update the hardware for the
notification layer when we collapse or expand the panel. It does so
by starting the fading when the panel is more collapsed.

Bug: 17287256
Change-Id: I35dc35494d71d816b7e6c5821b769847aaa183b0
 2014-09-05 16:01:00 +02:00
Christoph Studer
668c8970ff SysUI: Sort status bar notification icons 
Bug: 15761406
Change-Id: I64884319014d6fa3008c0db4060db7b9b066b6d7
 2014-09-05 16:00:09 +02:00
Jorim Jaggi
f2f0a071c2 Merge "Remove the scrimming of notifications" into lmp-dev 2014-09-05 13:58:33 +00:00
Adrian Roos
c2c661fccc Merge "Reorder brightness slider mirror in front of album art" into lmp-dev 2014-09-05 13:58:33 +00:00
Jorim Jaggi
f9fb30f54b Merge "Hide notifications when occluded and disabled on keyguard" into lmp-dev 2014-09-05 13:51:37 +00:00
Adrian Roos
cc74113ac6 Reorder brightness slider mirror in front of album art 
Fixes slider disappearing when album art is showing.

Bug: 17373958
Change-Id: Ifdb184a6a750f798bc94a9d1eeca9299b246a513
 2014-09-05 15:50:53 +02:00
Selim Cinek
4c866929d7 Merge "Fixed a bug where the notifications could overlap when reset" into lmp-dev 2014-09-05 13:49:23 +00:00
Winson Chung
acdc602f18 Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 2014-09-05 13:41:40 +00:00
Jorim Jaggi
68e6fa72f2 Remove "forgot pattern" in pattern view 
Bug: 17184958
Change-Id: I7ebb35a1b734286ded99352b3fa2b891386c581d
 2014-09-05 15:41:07 +02:00
Jorim Jaggi
06c19ea001 Remove the scrimming of notifications 
Not really needed anymore and adds a lot of overdraw. Let's get rid
of it.

Bug: 17287256
Bug: 17346296
Change-Id: I319596f7059b6ed0d3d7a578d3c786921001f4b5
 2014-09-05 15:37:12 +02:00
Jorim Jaggi
da30a03d96 Hide notifications when occluded and disabled on keyguard 
Bug: 17371021
Change-Id: I27769a2334285fe753a3ee5ce55986d4fd23b83c
 2014-09-05 15:13:39 +02:00
Adrian Roos
fdd04d42d2 Merge changes Ibb63814e,I0322b1e6 into lmp-dev 
* changes:
  Prevent full shade guesture from doing the wrong thing
  Add current user announce to MultiUserSwitch
 2014-09-05 12:57:55 +00:00
Selim Cinek
6e28a678c7 Fixed a bug where the notifications could overlap when reset 
This is because we did not receive a layout request even though
the notification was updated.

Bug: 17357688
Change-Id: Ie6295d07f4c00ec014b17671ad646261c4bb7e0f
 2014-09-05 14:43:28 +02:00
Christoph Studer
038839e947 Merge "SysUI: Upsort PRIORITY_MAX system notifications" into lmp-dev 2014-09-05 09:33:43 +00:00
Winson Chung
9a245b5de3 Merge "Ensure that there is enough space for the tablet search widget. (Bug 17190069)" into lmp-dev 2014-09-05 09:25:18 +00:00
Winson Chung
517c9ef165 Ensure that there is enough space for the tablet search widget. (Bug 17190069) 
Change-Id: I89694edac6f299e4a9cfca8a99a0d71dce1ae168
 2014-09-05 09:23:20 +00:00
Jim Miller
705004bebf Send USER_PRESENT broadcast after keyguard animation finishes 
This fixes a potential race between receiving USER_PRESENT
broadcast and testing if keyguard is finished
(KeyguardManager.isKeyguardLocked())

This also fixes an issue where USER_PRESENT isn't sent when
device encryption is enabled.

Fixes bug 17322844
Fixes bug 17301385

Change-Id: Icab3068c24032942ffdf6554d6d53cc656ae6666
 2014-09-04 17:11:17 -07:00