Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip P. Moltmann
7ca655ea0a Merge "Correct height of add printer list separator" into nyc-dev 
am: 80c18bcc3a

* commit '80c18bcc3a52dee62eec4b95de1ebfbf3c7d397f':
  Correct height of add printer list separator

Change-Id: I3cfdf14bc4e72b727f6469f99f950794e667ce33
 2016-05-23 18:38:36 +00:00
Philip P. Moltmann
4a3b323d3c Merge "Correct height of add printer list separator" into nyc-dev 
am: 80c18bcc3a

* commit '80c18bcc3a52dee62eec4b95de1ebfbf3c7d397f':
  Correct height of add printer list separator

Change-Id: Ib3b93ec7f2bd12b077353b3ac3f671a68bf97d34
 2016-05-23 18:37:47 +00:00
Android Build Merger (Role)
c7a7aa1f17 Merge "Removing extra haptic feedback. am: 7660bca509 am: 60c32b1f15" into nyc-mr1-dev-plus-aosp 2016-05-23 18:36:21 +00:00
Kenny Guy
af6ef8f6f9 Set accessibility string for suspended widgets. 
Update the content description to mention the
widget is suspended.
Mark the remote views as not significant for
accessibility.

Bug: 28909714
Change-Id: I8804d41e520e2b4af7ade0fa8820ee7b2488bde5
 2016-05-23 19:35:59 +01:00
Winson
3c8a233cc2 Removing extra haptic feedback. am: 7660bca509 
am: 60c32b1f15

* commit '60c32b1f15648930301ec289d79263a60ee9c985':
  Removing extra haptic feedback.

Change-Id: Iac885071d8978e11389a5f5c3d625fcb7ab8a887
 2016-05-23 18:35:53 +00:00
Winson
4b592938c8 Removing extra haptic feedback. am: 7660bca509 
am: db7ef9378a

* commit 'db7ef9378aee89c5840a70d83ad964f0f727932f':
  Removing extra haptic feedback.

Change-Id: Ib31641e25bd88a5c5e60dbb6058179743303a639
 2016-05-23 18:35:44 +00:00
Joe Onorato
c23befa183 Add data from /proc/pagetypeinfo to procstats. 
This data tells us the number of pages of each type that
are available by page size.  It is collected each time
the procstats snapshot is taken, and printed in the
checkin and verbose (dumpsys procstats -a) modes.

Change-Id: I14562eac15833617391c560638a9e7d239ef8db6
 2016-05-23 11:33:11 -07:00
Winson
db7ef9378a Removing extra haptic feedback. 
am: 7660bca509

* commit '7660bca5099b1a568e025345f1ba0aa68793e15a':
  Removing extra haptic feedback.

Change-Id: If87dfc0227eee3246eb145c566851057912b4588
 2016-05-23 18:30:54 +00:00
Winson
60c32b1f15 Removing extra haptic feedback. 
am: 7660bca509

* commit '7660bca5099b1a568e025345f1ba0aa68793e15a':
  Removing extra haptic feedback.

Change-Id: I91237da897bfeeb89405e4e44828e1c312eee951
 2016-05-23 18:30:34 +00:00
Philip P. Moltmann
80c18bcc3a Merge "Correct height of add printer list separator" into nyc-dev 2016-05-23 18:27:14 +00:00
Winson
7660bca509 Removing extra haptic feedback. 
- ag/923796 changed the logic to always return true, so these extra 
  calls are no longer needed.

Bug: 28867314
Change-Id: I07a4f6ac772a1444bba1950b2f27aa4be58a8419
 2016-05-23 18:24:49 +00:00
Wale Ogunwale
5dc33bdd7b Merge "Merge "Fixed flicker when docking task from recents." into nyc-dev am: bc0a5cb2f8 am: 342065cc95" into nyc-mr1-dev-plus-aosp 
am: 9ab9573a22

* commit '9ab9573a2235bc231988c62155040517bbd0b6e8':

Change-Id: I27081d889dd02fcb1a0c13cc781ca5ab2613bbe9
 2016-05-23 18:23:39 +00:00
Wale Ogunwale
935b9b0b79 Merge "Fixed flicker when docking task from recents." into nyc-dev am: bc0a5cb2f8 am: 3f8b2621a4 
am: a6611e989b

* commit 'a6611e989b404ed93cfc20b060f4cb80a37e1cc4':
  Fixed flicker when docking task from recents.

Change-Id: Ie7e49704c08e3ba0630f3bf0f52b34fec5d6451d
 2016-05-23 18:23:33 +00:00
Android Build Merger (Role)
9ab9573a22 Merge "Merge "Fixed flicker when docking task from recents." into nyc-dev am: bc0a5cb2f8 am: 342065cc95" into nyc-mr1-dev-plus-aosp 2016-05-23 18:18:53 +00:00
Suprabh Shukla
1f43e3560f Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev am: 653e7bedb4 am: f598369c15 
am: 99d041def3

* commit '99d041def30f2a7438280896116b2500e4344c84':

Change-Id: I87e1ae48a5793d39a7efd87e5e15fd1c61d4f0fa
 2016-05-23 18:18:24 +00:00
Wale Ogunwale
bba2bb74ce Merge "Fixed flicker when docking task from recents." into nyc-dev am: bc0a5cb2f8 
am: 342065cc95

* commit '342065cc95ec6bfea2d1cd8c0fe7ac5d10afe304':
  Fixed flicker when docking task from recents.

Change-Id: Ib1c38958d87e70a7700f11521732774f4d4b21ff
 2016-05-23 18:18:12 +00:00
Wale Ogunwale
a6611e989b Merge "Fixed flicker when docking task from recents." into nyc-dev am: bc0a5cb2f8 
am: 3f8b2621a4

* commit '3f8b2621a4f545927de6a07d0db23a85689071c4':
  Fixed flicker when docking task from recents.

Change-Id: I5b7b0159a8b15f5ace07b886d83993afe09e1855
 2016-05-23 18:16:58 +00:00
Wale Ogunwale
3f8b2621a4 Merge "Fixed flicker when docking task from recents." into nyc-dev 
am: bc0a5cb2f8

* commit 'bc0a5cb2f8b5cac550196b535d91e07bb586f647':
  Fixed flicker when docking task from recents.

Change-Id: I6b1715f666f0085dc9b43f557493d16655bf0297
 2016-05-23 18:13:13 +00:00
Suprabh Shukla
e249271365 Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev am: 653e7bedb4 am: 1c49c33f3e 
am: c168f27c05

* commit 'c168f27c05b9e6f1972ce2cf5f817346963dfe84':
  Fixing isOpRestricted in AppOpsService

Change-Id: I6504a1893f470dc8b083acad9157f6fe6bd490a0
 2016-05-23 18:12:48 +00:00
Wale Ogunwale
342065cc95 Merge "Fixed flicker when docking task from recents." into nyc-dev 
am: bc0a5cb2f8

* commit 'bc0a5cb2f8b5cac550196b535d91e07bb586f647':
  Fixed flicker when docking task from recents.

Change-Id: I706798a9561613033af637473bf98b8fb72a8ca4
 2016-05-23 18:12:38 +00:00
Suprabh Shukla
99d041def3 Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev am: 653e7bedb4 
am: f598369c15

* commit 'f598369c1544442ff606dd092717cbba973c9333':

Change-Id: Iccb92b801420ef852dda2a9f8bf5416baba0700f
 2016-05-23 18:12:22 +00:00
Suprabh Shukla
c168f27c05 Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev am: 653e7bedb4 
am: 1c49c33f3e

* commit '1c49c33f3e71a283beeeb6c4496bb99270052c79':
  Fixing isOpRestricted in AppOpsService

Change-Id: I30bfb72ba0f90228d3e82ea88ad0e85e0ad0ace1
 2016-05-23 18:07:29 +00:00
Suprabh Shukla
f598369c15 Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev 
am: 653e7bedb4

* commit '653e7bedb4ea95f69c109d54ddd0b7a49e6530c6':
  Fixing isOpRestricted in AppOpsService

Change-Id: Id2088da325739336bfc628da2ddd4850d0d2e6fb
 2016-05-23 18:03:35 +00:00
Chris Wren
f3a7437ed7 Merge "Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 am: 66bd6bca16" into nyc-mr1-dev-plus-aosp 
am: a3bfb0e086

* commit 'a3bfb0e086f8e169f1737ec452665ce7568d61dc':

Change-Id: Iafe43c857c0943a982f3b866d3b71b47e87171f8
 2016-05-23 18:03:35 +00:00
Suprabh Shukla
1c49c33f3e Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev 
am: 653e7bedb4

* commit '653e7bedb4ea95f69c109d54ddd0b7a49e6530c6':
  Fixing isOpRestricted in AppOpsService

Change-Id: Ic73cd0e420b5ed3efec3e8f34df1e350cf227944
 2016-05-23 18:03:32 +00:00
TreeHugger Robot
08ca89d236 Merge "Expand test coverage of TetherInterfaceSM" 2016-05-23 18:01:31 +00:00
TreeHugger Robot
bc0a5cb2f8 Merge "Fixed flicker when docking task from recents." into nyc-dev 2016-05-23 18:01:13 +00:00
Chris Wren
601b4eef88 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 am: 688ebc6f75 
am: f9f6d64ed8

* commit 'f9f6d64ed8406dc6417cc88c9e49d68d45c3773a':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I25e158bfe98d4bca60a7e460b6c6bd6784caade0
 2016-05-23 17:58:04 +00:00
TreeHugger Robot
653e7bedb4 Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev 2016-05-23 17:57:50 +00:00
Selim Cinek
53c4d3d23e Fixed a crash with the autocancelling 
Change-Id: If9cb9cc89bafbc9e7e053b4758382239bac97adc
Fixes: 28878632
Fixes: 28898623
 2016-05-23 10:56:34 -07:00
Wale Ogunwale
cac5c322da Only resuming starting dontWaitForPause activity once 
For a starting activity that doesn't wait for pause, we can resume it
when ensuring visible activities when pausing back stacks. If this
happens, there is no need to try to resume it again.

Bug: 28853615
Change-Id: Iee40b80eb13ab3fd65fdce0c100c4051e64f229f
 2016-05-23 10:56:33 -07:00
Android Build Merger (Role)
a3bfb0e086 Merge "Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 am: 66bd6bca16" into nyc-mr1-dev-plus-aosp 2016-05-23 17:53:56 +00:00
Chris Wren
7ba3fda459 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 
am: 66bd6bca16

* commit '66bd6bca16560eebf1968dd4ae59f405a7604484':
  Never fetch notification badges for USER_SYSTEM

Change-Id: Ie47a291ef3b7211dbf422b9866468588f4b9e939
 2016-05-23 17:53:28 +00:00
Chris Wren
f9f6d64ed8 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 
am: 688ebc6f75

* commit '688ebc6f753ad574e1e2ca3f67acf592abe53d5c':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I8492b9148b66b9aef69362b10de10ef8f991ecc7
 2016-05-23 17:53:25 +00:00
Chris Wren
688ebc6f75 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 
am: 0a9ccf2619

* commit '0a9ccf26192bc5a6fd74afb7afd4834b08230299':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I0e4bd4aaf4c6513c289ca948f63c5bc5c3c7ed02
 2016-05-23 17:47:29 +00:00
Chris Wren
66bd6bca16 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 
am: 0a9ccf2619

* commit '0a9ccf26192bc5a6fd74afb7afd4834b08230299':
  Never fetch notification badges for USER_SYSTEM

Change-Id: Ic6530a6b92c26d68a25ab15d24779b5f3f10f35a
 2016-05-23 17:47:29 +00:00
Chris Wren
0a9ccf2619 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 2016-05-23 17:44:16 +00:00
Philip P. Moltmann
a26b775dc1 Add Samsung print recommendation plugin. 
The code follows the same pattern as the HP and Mopria plugins. As this code is contributed by a 3rd I'd rather submit this as is and let the original submitter clean it up once it appears in AOSP.

The code should not affect anything outside of the package it is in. In the package the code is strongly isolated so that one plugin cannot cause issues with another plugin.

The code was minimally tested on a Samsung SCX-3406FW .

Bug: 28908572
Change-Id: I33c2673d06711902dbd0f1d82563cf5d3fbfe86a
(cherry picked from commit 83defde085)
 2016-05-23 17:41:40 +00:00
Tony Mak
f11979250f Merge "Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5 am: 741e0b14cf" into nyc-mr1-dev-plus-aosp 
am: a418a9f11a

* commit 'a418a9f11a41da00175d2fb34edd1df522a20a68':

Change-Id: I292b57137abc2716ab93afc7d80ed9875b8264d3
 2016-05-23 17:41:20 +00:00
Tony Mak
c606893101 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5 am: 23642330a7 
am: 6bd271c7d4

* commit '6bd271c7d441032d12299585be0681a2ac787020':
  Remove PROPERTY_WORK_CALL

Change-Id: Icbd3f7ec68fe4a88081b6c54abab85f6857ca4e6
 2016-05-23 17:41:12 +00:00
Winson
cd935f8c41 Catching all exceptions when docking. am: f60a4af047 am: 7fea69c3b6 
am: 3b272e6282

* commit '3b272e6282bc014931feaf67f8e5e495b882a919':

Change-Id: Ic893ff9afc0ec01fe26c27e9338ac467b0dd0b62
 2016-05-23 17:41:04 +00:00
Sid Soundararajan
4332dda9a7 Add a check to adjust thumbnail scaling for full screen shots on TV 
This should let us get away with taking smaller bitmaps for TV.

BUG: 28371792
Change-Id: Ia5d43dd48c57c4dd519b46f0c0d0ec94df5f42a9
 2016-05-23 10:39:00 -07:00
Philip P. Moltmann
825098bfc6 Merge "Add Samsung print recommendation plugin." 2016-05-23 17:35:50 +00:00
Philip P. Moltmann
83defde085 Add Samsung print recommendation plugin. 
Change-Id: I33c2673d06711902dbd0f1d82563cf5d3fbfe86a
 2016-05-23 10:34:10 -07:00
Android Build Merger (Role)
a418a9f11a Merge "Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5 am: 741e0b14cf" into nyc-mr1-dev-plus-aosp 2016-05-23 17:33:19 +00:00
Winson
04cbc7efc7 Catching all exceptions when docking. am: f60a4af047 am: 5e04aeb328 
am: 155ac5d024

* commit '155ac5d024d9c0d70173f57f5327a84c8fa2794e':
  Catching all exceptions when docking.

Change-Id: Ib31b4d549f1f7724a5cc6d73b7fa7ff6b3958c51
 2016-05-23 17:32:52 +00:00
Tony Mak
4c402e1805 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5 
am: 741e0b14cf

* commit '741e0b14cfa568689906a4ac4d66dc6ebf5191e2':
  Remove PROPERTY_WORK_CALL

Change-Id: Iece279703ee8b1ec8f192ff69bdca44afa524c19
 2016-05-23 17:32:50 +00:00
Tony Mak
6bd271c7d4 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5 
am: 23642330a7

* commit '23642330a7e0732976a0c25ca7d54f59055a92d9':
  Remove PROPERTY_WORK_CALL

Change-Id: If68d597574abb14d0ee06503fe3cd2e351914d52
 2016-05-23 17:32:23 +00:00
Winson
3b272e6282 Catching all exceptions when docking. am: f60a4af047 
am: 7fea69c3b6

* commit '7fea69c3b6e5c2fbfa960d84a05a62390752ec30':

Change-Id: I523fa5b407673bc46ab0202841b8a0fbdea79e65
 2016-05-23 17:32:19 +00:00
Winson
155ac5d024 Catching all exceptions when docking. am: f60a4af047 
am: 5e04aeb328

* commit '5e04aeb328c941e8a06d21281068031bc59d1822':
  Catching all exceptions when docking.

Change-Id: Ib30bff6adda9728243ae1f63398101ec67b0d432
 2016-05-23 17:28:20 +00:00