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

266270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan Nordqvist
0701952aaa FlowService turned into separate process. 
Introduced new much improved remediation handler.
Current incomplete code check-in.
Changing package name to osu.
Much improved and separated flow process.
Adding in-process web-view.

Change-Id: I08e6a19cad88b37f9a01571ea69de23214d97db1
 2016-06-07 16:46:26 -07:00
TreeHugger Robot
91b43d50fd Merge "sysui: refactor for extensibility." 2016-06-02 20:49:08 +00:00
Jorim Jaggi
c67062523a Merge "Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb am: 93ef31f1ca" into nyc-mr1-dev-plus-aosp 
am: 036f8ac188

* commit '036f8ac188249586b265c08f31f8d22bb6449e3f':

Change-Id: I2b63c7228247ee76b7832005771fc4bc853f08e1
 2016-06-02 19:58:55 +00:00
Jorim Jaggi
199fec8a34 Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb am: 8524697351 
am: 6379e87d06

* commit '6379e87d06ccf741b0328bed57b67b1b52fa66cc':
  Also update setMinLines

Change-Id: Ibe15ee4c83b5e51a71e49179d4428f28e2e89725
 2016-06-02 19:58:51 +00:00
Julia Reynolds
67d5aa99a5 Merge "Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb am: db3744969e" into nyc-mr1-dev-plus-aosp 
am: 754ac1b4dd

* commit '754ac1b4ddd224fc66f0feaf0c711eb7f7e5b83b':

Change-Id: I76be44aee6148c7e0dd50524df3a4a7ea38f3b24
 2016-06-02 19:53:08 +00:00
Android Build Merger (Role)
036f8ac188 Merge "Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb am: 93ef31f1ca" into nyc-mr1-dev-plus-aosp 2016-06-02 19:53:07 +00:00
Julia Reynolds
7b728243ff Merge "Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 am: 48347048ba" into nyc-mr1-dev-plus-aosp 
am: cd188b6a6f

* commit 'cd188b6a6f9c94881b2de131f1a28143a83baaae':

Change-Id: I867d069877dbda3f022c2575adbfb7624ffbebdf
 2016-06-02 19:52:59 +00:00
Julia Reynolds
72735de3db Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb am: f584b1d96d 
am: 98d4456187

* commit '98d44561879bdc0c92ea03ce71a358217e43e377':
  Fix leak on density change.

Change-Id: Ic727a3c28d6e965bb0a79e667a6487f40aafc28f
 2016-06-02 19:52:43 +00:00
Jorim Jaggi
b874a7e4b7 Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb 
am: 93ef31f1ca

* commit '93ef31f1ca85cea95457af3eb6b9dc0bdbb0f9fd':
  Also update setMinLines

Change-Id: Ib75ddd419cbbbd2eebfbd434e294b474fde3e76c
 2016-06-02 19:52:28 +00:00
Julia Reynolds
555069f5ef Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 am: 9548013287 
am: 30721fb490

* commit '30721fb4905a5743896134274ee83766c2dcc363':
  Hide alarm condition if there's no alarm.

Change-Id: Ib5584c9bdc2648ea69917511b7cdc4b9e455f7da
 2016-06-02 19:52:23 +00:00
Jorim Jaggi
6379e87d06 Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb 
am: 8524697351

* commit '8524697351bb034c56bce99b6503225ca121fc71':
  Also update setMinLines

Change-Id: I0dff24ca60c040bc003ccae9b0111a1e437ce255
 2016-06-02 19:52:09 +00:00
Jorim Jaggi
93ef31f1ca Merge "Also update setMinLines" into nyc-dev 
am: 79c0b2bcbb

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: Iae144dc953cc9e67225ebad2b2e7be777808d1eb
 2016-06-02 19:45:17 +00:00
Jorim Jaggi
8524697351 Merge "Also update setMinLines" into nyc-dev 
am: 79c0b2bcbb

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: I34792f349b421e20849ad1db2a28d2751c994189
 2016-06-02 19:45:09 +00:00
Jason Monk
7de67877cd Merge "QS: Only put visible tiles in listening state" 2016-06-02 19:44:18 +00:00
Android Build Merger (Role)
754ac1b4dd Merge "Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb am: db3744969e" into nyc-mr1-dev-plus-aosp 2016-06-02 19:40:49 +00:00
Android Build Merger (Role)
cd188b6a6f Merge "Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 am: 48347048ba" into nyc-mr1-dev-plus-aosp 2016-06-02 19:40:34 +00:00
Julia Reynolds
f46fcae32a Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb 
am: db3744969e

* commit 'db3744969e241276ff02c58f9fefc8efb85c2c7d':
  Fix leak on density change.

Change-Id: I0c2cdc6d46a14c4788405cb3f9f7af09eeed85ea
 2016-06-02 19:39:56 +00:00
Julia Reynolds
061fb40231 Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 
am: 48347048ba

* commit '48347048bade66799525391ca3bcfb42f95243a7':
  Hide alarm condition if there's no alarm.

Change-Id: I5613d6377b97aa35c6427730da8df643780017f5
 2016-06-02 19:39:30 +00:00
Julia Reynolds
98d4456187 Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb 
am: f584b1d96d

* commit 'f584b1d96d2d114d57f5c87e9c517b7929854d53':
  Fix leak on density change.

Change-Id: I268a0c2d4096ad7d28c31964c560da88be43b44a
 2016-06-02 19:39:14 +00:00
Julia Reynolds
30721fb490 Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 
am: 9548013287

* commit '9548013287f8345177e106cb79bc8c6d621457bd':
  Hide alarm condition if there's no alarm.

Change-Id: Ied3c40add25a0ffa8e766a820e64498e189a7df5
 2016-06-02 19:38:59 +00:00
Jorim Jaggi
79c0b2bcbb Merge "Also update setMinLines" into nyc-dev 2016-06-02 19:34:57 +00:00
Julia Reynolds
f584b1d96d Merge "Fix leak on density change." into nyc-dev 
am: a31ac7ddfb

* commit 'a31ac7ddfbccdb602aebb05686fcdb582ba74752':
  Fix leak on density change.

Change-Id: I8c474e29100543668a2348baca5f34b868cf8893
 2016-06-02 19:31:11 +00:00
Julia Reynolds
db3744969e Merge "Fix leak on density change." into nyc-dev 
am: a31ac7ddfb

* commit 'a31ac7ddfbccdb602aebb05686fcdb582ba74752':
  Fix leak on density change.

Change-Id: I4158711144354eb7059d6b421ed35d6673b63a5b
 2016-06-02 19:30:58 +00:00
Julia Reynolds
9548013287 Merge "Hide alarm condition if there\'s no alarm." into nyc-dev 
am: 62716a9197

* commit '62716a9197ba77b349d74770e6cd3b114e5f5de7':
  Hide alarm condition if there's no alarm.

Change-Id: Ib6c339aa3d00639fcad3bc15791787a52010a84f
 2016-06-02 19:30:52 +00:00
Julia Reynolds
48347048ba Merge "Hide alarm condition if there\'s no alarm." into nyc-dev 
am: 62716a9197

* commit '62716a9197ba77b349d74770e6cd3b114e5f5de7':
  Hide alarm condition if there's no alarm.

Change-Id: I16ff49b128224db3972335fd1f4b0aee9a06fcb8
 2016-06-02 19:30:50 +00:00
TreeHugger Robot
a31ac7ddfb Merge "Fix leak on density change." into nyc-dev 2016-06-02 19:24:16 +00:00
Julia Reynolds
62716a9197 Merge "Hide alarm condition if there's no alarm." into nyc-dev 2016-06-02 19:22:37 +00:00
Muyuan Li
84b4561f1c sysui: refactor for extensibility. 
Refactor the test whether touch point is inside
QsContainer into a separate method.
Make mScrollingEnabled protected.

Bug: 28942125
Change-Id: I21a620bbad12c25fedfa5a1139221bd4cb2e95fe
(cherry picked from commit cc10182c291d3e559382ddd181b69c1e89e5ec8e)
 2016-06-02 19:12:44 +00:00
Dianne Hackborn
f83ba73011 Merge "Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: 340f22fcc6" into nyc-mr1-dev-plus-aosp 
am: b508d38074

* commit 'b508d380748c085858132ceda017fa946638fee2':

Change-Id: I64c67b04f75de07b5574330ce631de3e1f2567d9
 2016-06-02 19:04:02 +00:00
Dianne Hackborn
db8dee7f9e Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: c9aaec43a6 
am: 1d185fbad7

* commit '1d185fbad7bbd1139039283b642655b150884108':
  Work on issue #29042642: Watchdog going off

Change-Id: I659acd8ca9d2b1ddd7992d1c079dd968e60befad
 2016-06-02 19:03:55 +00:00
Android Build Merger (Role)
b508d38074 Merge "Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: 340f22fcc6" into nyc-mr1-dev-plus-aosp 2016-06-02 18:55:55 +00:00
Suprabh Shukla
1c6c666288 Merge "Changing user switching messages for demo mode" into nyc-mr1-dev am: 5ac8499b25 
am: ef3a63ce74

* commit 'ef3a63ce74bea3f1bd4a033e34070954aa905135':
  Changing user switching messages for demo mode

Change-Id: Ic8c41f7790d40198f20ef088cf37a11a0f153a4c
 2016-06-02 18:55:33 +00:00
Dianne Hackborn
91e1243b72 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a 
am: 340f22fcc6

* commit '340f22fcc60f0e5d54cd9740b3995170d0c70c62':
  Work on issue #29042642: Watchdog going off

Change-Id: Iea9d7b29a9a7bc0b0d87387088f001d61ada83e7
 2016-06-02 18:55:23 +00:00
Dianne Hackborn
1d185fbad7 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a 
am: c9aaec43a6

* commit 'c9aaec43a6ff487ff19e5fdb1871efb268b0592b':
  Work on issue #29042642: Watchdog going off

Change-Id: I1ddb808137c527967358e8b12fc93063dd153bfd
 2016-06-02 18:55:13 +00:00
Suprabh Shukla
ef3a63ce74 Merge "Changing user switching messages for demo mode" into nyc-mr1-dev 
am: 5ac8499b25

* commit '5ac8499b25b1533c7e605f8b2cf3861e7cd7970c':
  Changing user switching messages for demo mode

Change-Id: I822aed2c9762f680e3697c18e759168c2a72b1f2
 2016-06-02 18:50:51 +00:00
Dianne Hackborn
340f22fcc6 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev 
am: 5a6cf3ac9a

* commit '5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
  Work on issue #29042642: Watchdog going off

Change-Id: I2a3b120648aef7401bb6d4c2460f868cdc16c1a0
 2016-06-02 18:50:24 +00:00
Dianne Hackborn
c9aaec43a6 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev 
am: 5a6cf3ac9a

* commit '5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
  Work on issue #29042642: Watchdog going off

Change-Id: Ic0c08c2ab1c0e7b1cc195928492ab4c0eaef782f
 2016-06-02 18:49:29 +00:00
TreeHugger Robot
078c5e0043 Merge "Merge "Prioritize delete jobs by adding them to a separate thread pool." into nyc-andromeda-dev" 2016-06-02 18:40:34 +00:00
TreeHugger Robot
5ac8499b25 Merge "Changing user switching messages for demo mode" into nyc-mr1-dev 2016-06-02 18:36:09 +00:00
Dianne Hackborn
5a6cf3ac9a Merge "Work on issue #29042642: Watchdog going off" into nyc-dev 2016-06-02 18:31:16 +00:00
Roozbeh Pournader
61b54967e5 Merge "Use bidi heuristics correctly in BoringLayout#isBoring()" 2016-06-02 18:19:42 +00:00
Amith Yamasani
0e29599ffc Merge "Setup user restrictions for demo user" into nyc-mr1-dev am: a28576cb72 
am: 64fc84e9c7

* commit '64fc84e9c78e143e79a0e5b2dddf97f02d1f40d9':
  Setup user restrictions for demo user

Change-Id: I414145f63da75daa63f25879dc2ef8ee167cef10
 2016-06-02 18:07:13 +00:00
Julia Reynolds
c3960f66be Hide alarm condition if there's no alarm. 
Change-Id: Iba8c9eb2bd3033683c25c5cf145fc52f9ac0f0d2
Fixes: 27698976
 2016-06-02 18:06:01 +00:00
Amith Yamasani
64fc84e9c7 Merge "Setup user restrictions for demo user" into nyc-mr1-dev 
am: a28576cb72

* commit 'a28576cb7201b468908346b4807892706870df92':
  Setup user restrictions for demo user

Change-Id: I4121f9745f8d582c0c85240a35b6ed442e8f2850
 2016-06-02 18:00:40 +00:00
Jason Monk
1bec6af01a QS: Only put visible tiles in listening state 
- Make it so the QSPanel doesn't listen until expansion starts
 - Push listening state through the TileLayout
 - Make PagedTileLayout only listen for visible pages
 - Push setListening onto background thread

Change-Id: Id7c008c9447f9a5dac69469fef72bc580f423b0c
Fixes: 28962155
 2016-06-02 13:59:07 -04:00
Amith Yamasani
a28576cb72 Merge "Setup user restrictions for demo user" into nyc-mr1-dev 2016-06-02 17:51:53 +00:00
Garfield Tan
cd9780abff Merge "Prioritize delete jobs by adding them to a separate thread pool." into nyc-andromeda-dev 
Conflicts:
	packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java

Change-Id: I1eb4f265891542f8db59349ce158b192f1b14315
 2016-06-02 10:17:59 -07:00
David Brazdil
9d5c0b1c8e Merge "Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032 am: 7397e80504" into nyc-mr1-dev-plus-aosp 
am: 6094a6053b

* commit '6094a6053be563a77329fa3b411e99ab1244e90e':

Change-Id: I75cbd30e87905abbdab3826a89abb4de9358e89c
 2016-06-02 17:09:09 +00:00
Mady Mellor
0165c546ab Merge "Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 am: ece7cd7120" into nyc-mr1-dev-plus-aosp 
am: a6d5dabde2

* commit 'a6d5dabde2485a9285e09389c23c51498db80aaa':

Change-Id: I57ad86e98f00b19e2580f03873a19a83d35e965d
 2016-06-02 17:01:01 +00:00
Zoltan Szatmary-Ban
ba526c47bb Merge "Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am: 2002061f34 am: 6b9371ceef" into nyc-mr1-dev-plus-aosp 
am: 2d74e17bb0

* commit '2d74e17bb0fe0bf9b52332f2664460a8a54549ec':

Change-Id: I6da0fd5a265c4ccec729f1b583e5ebd6e96f164c
 2016-06-02 17:00:57 +00:00