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
Selim Cinek
bdfa6d9fcf Merge "Fixed a flashing when the affordances were launched" into nyc-dev 
am: a56e732c01

* commit 'a56e732c01f10ebd27185a66ee4330f50c8cd57b':
  Fixed a flashing when the affordances were launched

Change-Id: I0a03111befb2e5136aac2d07f1b07af4131aaf6c
 2016-05-23 19:34:16 +00:00
Selim Cinek
8a87d24e96 Merge "Fixed a flashing when the affordances were launched" into nyc-dev 
am: a56e732c01

* commit 'a56e732c01f10ebd27185a66ee4330f50c8cd57b':
  Fixed a flashing when the affordances were launched

Change-Id: I142fde45dd14de96f58289a8aed1113d3bf8578a
 2016-05-23 19:34:12 +00:00
Selim Cinek
71d7ca4e92 Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev 
am: 7fc88ac214

* commit '7fc88ac2144a05f04a941d969f86f959a89916d8':
  Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I82af9d5a47a63fff0bed8adaedc7a96647a54f19
 2016-05-23 19:34:12 +00:00
Selim Cinek
c91da73326 Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev 
am: 7fc88ac214

* commit '7fc88ac2144a05f04a941d969f86f959a89916d8':
  Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I630704c54dbe15652172d7d723e211568e021082
 2016-05-23 19:34:08 +00:00
Android Build Merger (Role)
2bb3e37630 Merge "Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8 am: d4962867bd" into nyc-mr1-dev-plus-aosp 2016-05-23 19:30:38 +00:00
Selim Cinek
f6456abdba Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8 
am: d4962867bd

* commit 'd4962867bd0a01e102315720d0d0cce41af98202':
  Fixed a crash with the autocancelling

Change-Id: I031b0c3ca48f93a4705d8dfd58c7b263e1e1953d
 2016-05-23 19:30:11 +00:00
Selim Cinek
eca834dd8c Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8 
am: 45df222972

* commit '45df22297219fe2d3d685e5046b39d76127ec45b':
  Fixed a crash with the autocancelling

Change-Id: Ia1d1f6fac5e056878037b706122d99a491f5b5c1
 2016-05-23 19:29:34 +00:00
Selim Cinek
a56e732c01 Merge "Fixed a flashing when the affordances were launched" into nyc-dev 2016-05-23 19:26:23 +00:00
Selim Cinek
45df222972 Merge "Fixed a crash with the autocancelling" into nyc-dev 
am: 4a4b76f6e8

* commit '4a4b76f6e842a4578dffedb2800d2b8eca813769':
  Fixed a crash with the autocancelling

Change-Id: I89e6a7e66166f81bc44ce8c6e5cf3c21e06693cc
 2016-05-23 19:26:01 +00:00
Selim Cinek
7fc88ac214 Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev 2016-05-23 19:25:56 +00:00
Selim Cinek
d4962867bd Merge "Fixed a crash with the autocancelling" into nyc-dev 
am: 4a4b76f6e8

* commit '4a4b76f6e842a4578dffedb2800d2b8eca813769':
  Fixed a crash with the autocancelling

Change-Id: I09e52b5ac392edaae7f42c7cb1903f60421b03bc
 2016-05-23 19:25:51 +00:00
TreeHugger Robot
4a4b76f6e8 Merge "Fixed a crash with the autocancelling" into nyc-dev 2016-05-23 19:21:57 +00:00
Chong Zhang
b8c566052d Merge "Merge "Don\'t include removed window when counting interesting windows" into nyc-dev am: 18ef543102 am: 9eef46b66f" into nyc-mr1-dev-plus-aosp 
am: a11bd4cdca

* commit 'a11bd4cdcaa60a7ad648b2eb17be0bc2071b687a':

Change-Id: I04a8149097d573bf62d28bd94e8cd9198135bfc2
 2016-05-23 19:18:57 +00:00
Chong Zhang
43d8369dfc Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 am: 9ab291e20e 
am: c7436a657d

* commit 'c7436a657d7f3879ac6ed78eb7f2353305b6c4ad':
  Don't include removed window when counting interesting windows

Change-Id: I22176db892d527f7af75cf4a6691cdca142d1272
 2016-05-23 19:18:45 +00:00
Android Build Merger (Role)
a11bd4cdca Merge "Merge "Don\'t include removed window when counting interesting windows" into nyc-dev am: 18ef543102 am: 9eef46b66f" into nyc-mr1-dev-plus-aosp 2016-05-23 19:12:11 +00:00
Chong Zhang
6a27a95f51 Merge "Don\'t include removed window when counting interesting windows" into nyc-dev am: 18ef543102 
am: 9eef46b66f

* commit '9eef46b66f0265ce7d851216c6662fcbbca8783a':
  Don't include removed window when counting interesting windows

Change-Id: Ie8b8dec30cd6aa9e51d1e11d4b80293bc27340e6
 2016-05-23 19:11:45 +00:00
Chris Wren
a6c51dc964 Merge "Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 am: 4da0296e23" into nyc-mr1-dev-plus-aosp 
am: f95106e926

* commit 'f95106e926e668511205137ba4d93cf018196993':

Change-Id: I49e655a09e5e5b1e96bf870e96bb8a3013d03fd3
 2016-05-23 19:11:20 +00:00
Chris Wren
d44f936791 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 am: ec2e36a485 
am: 99eed4b5d6

* commit '99eed4b5d6291fe8714ed55dbf4598db6fe29711':
  Don't throw RemoteException from new NLS APIs

Change-Id: If12e8f4b7194afbe4ec7f7d246d79ec1bb465cb2
 2016-05-23 19:11:13 +00:00
Chris Wren
c7436a657d Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 
am: 9ab291e20e

* commit '9ab291e20eb8979f58dcd086cfa659252767b25f':
  Don't include removed window when counting interesting windows

Change-Id: I4a45f4068b6ad5328d34ede02fd5bc078dff27d7
 2016-05-23 19:10:57 +00:00
Android Build Merger (Role)
f95106e926 Merge "Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 am: 4da0296e23" into nyc-mr1-dev-plus-aosp 2016-05-23 19:08:06 +00:00
Chong Zhang
9eef46b66f Merge "Don\'t include removed window when counting interesting windows" into nyc-dev 
am: 18ef543102

* commit '18ef5431026365dd3b53a505fc57f538cf8dd48e':
  Don't include removed window when counting interesting windows

Change-Id: Iea9bc7a6c2ae5043aaea6b9d48fbb1dfd49d5fc7
 2016-05-23 19:08:04 +00:00
Chong Zhang
9ab291e20e Merge "Don\'t include removed window when counting interesting windows" into nyc-dev 
am: 18ef543102

* commit '18ef5431026365dd3b53a505fc57f538cf8dd48e':
  Don't include removed window when counting interesting windows

Change-Id: I3c2202e3928720161dbce8d1b4cfa0f16f83179f
 2016-05-23 19:08:00 +00:00
Chris Wren
247d9e8956 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 
am: 4da0296e23

* commit '4da0296e236047aef095473ffe4105b41df0c6c0':
  Don't throw RemoteException from new NLS APIs

Change-Id: Ie0e38bfa1447ca4a5767274d23a3a82dfffef1e5
 2016-05-23 19:07:33 +00:00
Chris Wren
99eed4b5d6 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 
am: ec2e36a485

* commit 'ec2e36a4851780219e342c545467fb433ef16fd6':
  Don't throw RemoteException from new NLS APIs

Change-Id: If4175e64a71b2b02306f9eb579f9755492ea6dfd
 2016-05-23 19:07:27 +00:00
Chris Wren
ec2e36a485 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev 
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
  Don't throw RemoteException from new NLS APIs

Change-Id: I8a89c5e4b800baf8c810eb24b0b5435fa63b1378
 2016-05-23 19:01:27 +00:00
Chris Wren
4da0296e23 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev 
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
  Don't throw RemoteException from new NLS APIs

Change-Id: Ibafc3d9adeb046b2b43593285b6f605693b8682e
 2016-05-23 19:01:21 +00:00
Chong Zhang
18ef543102 Merge "Don't include removed window when counting interesting windows" into nyc-dev 2016-05-23 18:59:04 +00:00
Victor Chang
1a551d7577 Merge "Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev am: 7c527bf76d am: a3e767a73d" into nyc-mr1-dev-plus-aosp 
am: 212a933238

* commit '212a9332388975fbc2869b19f6e4cea3967d55c8':

Change-Id: I1f1f866c91ea730a40f855b131dfda7d6c85a0a5
 2016-05-23 18:58:29 +00:00
Victor Chang
f0b0c8cfaa Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev am: 7c527bf76d am: b3e08e0363 
am: 77a15ccfa9

* commit '77a15ccfa9e96a4f88a05f6f20d88f938eea1350':
  Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: Id2ea95bce8c8bfa1af8489e8b7b0b2a8e55906eb
 2016-05-23 18:58:18 +00:00
Android Build Merger (Role)
212a933238 Merge "Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev am: 7c527bf76d am: a3e767a73d" into nyc-mr1-dev-plus-aosp 2016-05-23 18:54:23 +00:00
TreeHugger Robot
28d9ef8112 Merge "Don't throw RemoteException from new NLS APIs" into nyc-dev 2016-05-23 18:54:20 +00:00
Philip P. Moltmann
ec186ae12c Merge "Correct height of add printer list separator" into nyc-dev am: 80c18bcc3a am: 7ca655ea0a 
am: 7767ace5a2

* commit '7767ace5a28f8b907245e3f326914796629a36d9':

Change-Id: I42c66a3109cffb300701f7689bffd35a601c08d8
 2016-05-23 18:54:11 +00:00
Victor Chang
33baa93b0b Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev am: 7c527bf76d 
am: a3e767a73d

* commit 'a3e767a73db5e09d6d178aeb058cebf62fa89142':
  Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: I04f8efec1519104066f4e49811c24983f5e995c1
 2016-05-23 18:53:52 +00:00
Victor Chang
77a15ccfa9 Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev am: 7c527bf76d 
am: b3e08e0363

* commit 'b3e08e03636cc18b2ec54ba095437fa444735586':
  Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: Iaa6fdd448d930151bcae7fdf50cc993a10885cb0
 2016-05-23 18:53:44 +00:00
Philip P. Moltmann
54245c9253 Merge "Correct height of add printer list separator" into nyc-dev am: 80c18bcc3a am: 4a3b323d3c 
am: 8b62832ae9

* commit '8b62832ae9ada61579f2393b904c063990fc272a':
  Correct height of add printer list separator

Change-Id: Icb292b06025564d464ed5a8a8e996e78dbc08cb5
 2016-05-23 18:49:46 +00:00
Winson
7844bb63ab Merge "Removing extra haptic feedback. am: 7660bca509 am: 60c32b1f15" into nyc-mr1-dev-plus-aosp 
am: c7a7aa1f17

* commit 'c7a7aa1f17553dfa6ef30934d40215600710ea87':

Change-Id: I42e28b60ef1d01ce39961ef10c49fd9af6c1a0cd
 2016-05-23 18:49:40 +00:00
Victor Chang
b3e08e0363 Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev 
am: 7c527bf76d

* commit '7c527bf76dcdcda414f10ed829999310f46161e7':
  Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: I49885b9bffb4c16f52f7ed471b1019dfb7fe85f4
 2016-05-23 18:49:23 +00:00
Victor Chang
a3e767a73d Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev 
am: 7c527bf76d

* commit '7c527bf76dcdcda414f10ed829999310f46161e7':
  Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: If3e915aa66d29f70c217b3231937730c63f7e9eb
 2016-05-23 18:49:16 +00:00
Muyuan Li
7241628901 sysui: disable clock when device is not provisioned. 
Bug: 28557685
Change-Id: I60512206795de18c912fb6a1575e6f57aac56767
(cherry picked from commit 271f3d8f528354de03d6da615ac3a0fe5ee1a8bd)
 2016-05-23 18:47:06 +00:00
Chong Zhang
e292eb3d4d Don't include removed window when counting interesting windows 
Also do not give input focus to window that's already marked for removal.
The input channel is already disposed and input manager will treat these
as null focus.

bug: 28797800

Change-Id: I3cb2d514a7286847f1ad6af3f629d04c303d3cbd
 2016-05-23 11:46:04 -07:00
Philip P. Moltmann
7767ace5a2 Merge "Correct height of add printer list separator" into nyc-dev am: 80c18bcc3a 
am: 7ca655ea0a

* commit '7ca655ea0a6c076ea28bb42fd8ea141e67e54fd7':

Change-Id: I90564fc9ea83140aeb3ad9eb56f8e8a9ac176b0a
 2016-05-23 18:45:20 +00:00
TreeHugger Robot
bc27f8fa57 Merge "Remove dead code from TetherInterfaceSM" 2016-05-23 18:44:24 +00:00
Philip P. Moltmann
8b62832ae9 Merge "Correct height of add printer list separator" into nyc-dev am: 80c18bcc3a 
am: 4a3b323d3c

* commit '4a3b323d3ca55ce93176dfc1c258dee5fb29d04b':
  Correct height of add printer list separator

Change-Id: I52c568fcb16c1e06e8d371224b539ba524b3e1b8
 2016-05-23 18:42:24 +00:00
Jason Monk
b8d6fcb552 Make battery labels translatable. 
Bug: 28829629
Change-Id: Id32587a4ad22aa79f7ec01f748466d6ff2394bcc
 2016-05-23 14:42:23 -04:00
Victor Chang
7c527bf76d Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev 2016-05-23 18:42:09 +00:00
Android Build Merger (Role)
1ae03df83b Merge "Removing extra haptic feedback. am: 7660bca509 am: db7ef9378a am: 4b592938c8" 2016-05-23 18:42:02 +00:00
Alan Viverette
aab22cf455 Default system theme should be DeviceDefault 
Bug: 28796004
Change-Id: I33f9c064dd30d7fd96f06a8872765ddccf8a16a4
 2016-05-23 14:41:58 -04:00
TreeHugger Robot
2a67e72f02 Merge "Remove transient StartingState from TetherInterfaceSM" 2016-05-23 18:41:40 +00:00
Winson
4a29c5e87f Removing extra haptic feedback. am: 7660bca509 am: db7ef9378a 
am: 4b592938c8

* commit '4b592938c84888e546757727a64fa10cdf0034c8':
  Removing extra haptic feedback.

Change-Id: Ic2062ade25f7c83736cb3c504c3e5bb387738417
 2016-05-23 18:41:28 +00:00
Jason Monk
c33f328a74 QS: Don't cause click noise when opening from QQS 
Bug: 28770315
Change-Id: I972ae81b07db38699c4d88dbf1c556ea17258782
 2016-05-23 14:40:27 -04:00