Commit Graph

11892 Commits

Author SHA1 Message Date
Felipe Leme
9d9f397f21 Merge "Fixed context reference." into nyc-dev am: d76c723 am: f989996
am: 6b780f9

* commit '6b780f93f8e164eee14e4588cb69e1e0ba63ee6f':
  Fixed context reference.

Change-Id: Iea7604f44ff5b038d10dcb1173d43bc935f6b977
2016-04-27 18:28:44 +00:00
TreeHugger Robot
6b780f93f8 Merge "Fixed context reference." into nyc-dev am: d76c723
am: f989996

* commit 'f989996d438d988f44a438a5104bdadf78adf218':
  Fixed context reference.

Change-Id: I7d0ff710dd60892ae92d433106c403676830a4ef
2016-04-27 15:06:27 +00:00
Felipe Leme
f989996d43 Merge "Fixed context reference." into nyc-dev
am: d76c723

* commit 'd76c723ebcf857661e65ac4aba9c1699f7e24163':
  Fixed context reference.

Change-Id: I3c3aad0b862c1347171c75883b664b586aacd5ef
2016-04-27 15:02:01 +00:00
TreeHugger Robot
d76c723ebc Merge "Fixed context reference." into nyc-dev 2016-04-27 14:53:08 +00:00
Maurice Lam
792cc438d4 Merge "GLIF theme for settings" into nyc-mr1-dev am: 203fbde
am: e9841ef

* commit 'e9841efb189ce4b12fb464b6b2f8d85dd6bc241c':
  GLIF theme for settings

Change-Id: I1169b9b2a8d3ed290720a7a97ed0efb3940a2bee
2016-04-27 03:08:09 +00:00
Maurice Lam
e9841efb18 Merge "GLIF theme for settings" into nyc-mr1-dev
am: 203fbde

* commit '203fbde10d652c10349052d645cf40a76b9d4198':
  GLIF theme for settings

Change-Id: If1330a47f96fba74225e4f8fec8283537c3d5f19
2016-04-27 01:20:18 +00:00
Maurice Lam
203fbde10d Merge "GLIF theme for settings" into nyc-mr1-dev 2016-04-27 01:10:44 +00:00
Maurice Lam
190ec1c14a GLIF theme for settings
Update fingerprint and screen lock setup to GLIF theme.

- Screen lock setup while in SUW
- Fingerprint setup, in and out of SUW

Bug: 26427729
Change-Id: I1063d3b54bbeea72de38bcc246cff368bc65945e
2016-04-26 17:20:31 -07:00
Julia Reynolds
6813a531a4 Merge "Don\'t crash on apps only installed for other users." into nyc-dev am: 1e5d0e7 am: 7bcafc9
am: 9bcb17e

* commit '9bcb17e5589b06147052249f6c57a30137c0c1ce':
  Don't crash on apps only installed for other users.

Change-Id: If11c3cf84b34402c193df12b685c8b3f1b127564
2016-04-26 16:35:21 +00:00
Julia Reynolds
8307ec538b Swap star tint. am: e39066c am: 31af251
am: 5771080

* commit '57710807d66ef79d32c35ffcee8f9a22fc0019c9':
  Swap star tint.

Change-Id: I320218b7b0039c83e3030301ef438a6e16eb7871
2016-04-26 16:35:20 +00:00
Julia Reynolds
9bcb17e558 Merge "Don\'t crash on apps only installed for other users." into nyc-dev am: 1e5d0e7
am: 7bcafc9

* commit '7bcafc914f72b468f075e7b32aacaf202693f606':
  Don't crash on apps only installed for other users.

Change-Id: I8810669770237ab9d26785298f4f31b7894d9550
2016-04-26 15:46:04 +00:00
Julia Reynolds
57710807d6 Swap star tint. am: e39066c
am: 31af251

* commit '31af251c79935fc9b071b6b2b66ed7e0ca38b66d':
  Swap star tint.

Change-Id: I36c408d0a5a93b1ba04c2edf19432cc6bc05d868
2016-04-26 15:46:03 +00:00
Julia Reynolds
1c45384702 Merge "Don\'t crash on apps only installed for other users." into nyc-dev
am: 1e5d0e7

* commit '1e5d0e731ededfb5ebf8e3d8073c292d26b17ce9':
  Don't crash on apps only installed for other users.

Change-Id: I36a8014e263edcdad6b930056b44b257be4c3365
2016-04-26 15:40:45 +00:00
Julia Reynolds
39b162388b Swap star tint.
am: e39066c

* commit 'e39066c30912bd027cd156c10ff4c9079144ea3d':
  Swap star tint.

Change-Id: I570450b5c7ac7a6544e4e7c3899151f28fcdb035
2016-04-26 15:40:45 +00:00
Julia Reynolds
7bcafc914f Merge "Don\'t crash on apps only installed for other users." into nyc-dev
am: 1e5d0e7

* commit '1e5d0e731ededfb5ebf8e3d8073c292d26b17ce9':
  Don't crash on apps only installed for other users.

Change-Id: I5579fc7966954fd63c95bff57aad12ef03cc997b
2016-04-26 15:40:38 +00:00
Julia Reynolds
31af251c79 Swap star tint.
am: e39066c

* commit 'e39066c30912bd027cd156c10ff4c9079144ea3d':
  Swap star tint.

Change-Id: If691ac08b89676b80eabdf8d0c845dd3f4d720e7
2016-04-26 15:40:38 +00:00
Julia Reynolds
1e5d0e731e Merge "Don't crash on apps only installed for other users." into nyc-dev 2016-04-26 15:28:20 +00:00
Julia Reynolds
e39066c309 Swap star tint.
Bug: 27558254
Change-Id: Iedcc61f326813047b50b1d68b4e82ac08ede5623
2016-04-26 09:17:47 -04:00
Julia Reynolds
175bba9ed9 Don't crash on apps only installed for other users.
Change-Id: I13d415441aa1c7d09df7adccd4e2d2f9bbd3dbfb
Fixes: 28151314
2016-04-25 16:45:49 -04:00
Dan Sandler
5cd8a8a283 Merge changes from topic \'qs-tiles\' into nyc-dev am: 321d450 am: 60a2e4d
am: 7c73946

* commit '7c739466bd9e995016873652c2654632af71e981':
  Developer QS tile: GPU Profiling.
  Developer QS tile: Show Layout.

Change-Id: Ibd82e52f604901d0fb174a23e89c4690306438fa
2016-04-25 19:45:46 +00:00
Daniel Sandler
7c739466bd Merge changes from topic \'qs-tiles\' into nyc-dev am: 321d450
am: 60a2e4d

* commit '60a2e4d0167300a2f0c06f10b5600386f488c482':
  Developer QS tile: GPU Profiling.
  Developer QS tile: Show Layout.

Change-Id: I40be4a1719f1644e2db1327c32962ff466710d9f
2016-04-25 19:33:38 +00:00
Dan Sandler
60a2e4d016 Merge changes from topic \'qs-tiles\' into nyc-dev
am: 321d450

* commit '321d45031bd93e05ffba4c8aedbac5dc41436bae':
  Developer QS tile: GPU Profiling.
  Developer QS tile: Show Layout.

Change-Id: I96b3eb012d3663d1c517aa53976a7ffd70d67c60
2016-04-25 19:28:22 +00:00
Dan Sandler
60b8a7bde8 Merge changes from topic \'qs-tiles\' into nyc-dev
am: 321d450

* commit '321d45031bd93e05ffba4c8aedbac5dc41436bae':
  Developer QS tile: GPU Profiling.
  Developer QS tile: Show Layout.

Change-Id: If324b5436e9ee90b53a3a918174abdd403dd669d
2016-04-25 19:28:22 +00:00
Daniel Sandler
321d45031b Merge changes from topic 'qs-tiles' into nyc-dev
* changes:
  Developer QS tile: GPU Profiling.
  Developer QS tile: Show Layout.
2016-04-25 19:21:24 +00:00
Felipe Leme
34c5d3aa86 Fixed context reference.
BUG: 27608886
Change-Id: I2d2e2393ce52f4461dce276231cbc90563897ffd
2016-04-25 09:27:40 -07:00
Ricky Wai
e5fed3056c Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 0858ce1 am: 3f29124
am: 1a8792d

* commit '1a8792d5f098431a6b37dfad61714cc35501088b':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: Ice29e8c61d21373ea85ba55c1f623236c784c4fa
2016-04-25 13:34:41 +00:00
Ricky Wai
1a8792d5f0 Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 0858ce1
am: 3f29124

* commit '3f291245a8dbb6a429646e8fcf36fa91fbbc3fd9':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: I87053df8f8f98803686a265c01bd7bf8f4f64337
2016-04-25 13:27:24 +00:00
Ricky Wai
a4cacbd7dc Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
am: 0858ce1

* commit '0858ce1488b7cd916b565956b7c0bcc8a699ab27':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: If1d5da67189a8eae98769c1f0c859c5d8e8d5290
2016-04-25 13:23:05 +00:00
Ricky Wai
3f291245a8 Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
am: 0858ce1

* commit '0858ce1488b7cd916b565956b7c0bcc8a699ab27':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: Idb75d79eacebbdced021c1b96d73357b0e54a281
2016-04-25 13:23:03 +00:00
Ricky Wai
0858ce1488 Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev 2016-04-25 13:11:45 +00:00
Dan Sandler
12c4ba4224 Developer QS tile: GPU Profiling.
Bug: 27872042
Change-Id: Ia57005df15572b1714af2a3a8cd5b9794fdfb165
2016-04-24 10:55:41 -04:00
Dan Sandler
3bd52ddf4c Developer QS tile: Show Layout.
Bug: 27872042
Change-Id: I0df2ffecbf7d2682d89c9b8343590bb04bcc305c
2016-04-24 10:53:52 -04:00
Svetoslav Ganov
1fcb80ed11 Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev am: c8d363e am: 5658e57
am: a2a0298

* commit 'a2a0298f235a851b28a3ec3abec5091874e8e11f':
  Cleanup of the PackageInstaller API - Settings

Change-Id: Ie4060a29803c96553fd6679398c212620e641fa3
2016-04-22 23:36:13 +00:00
Svetoslav Ganov
a2a0298f23 Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev am: c8d363e
am: 5658e57

* commit '5658e577f3ddb544745b5f73e53cb6e4f3a58200':
  Cleanup of the PackageInstaller API - Settings

Change-Id: I5a688a15ef742a6d7ec3300cc67d17be761ae426
2016-04-22 23:33:13 +00:00
Svetoslav Ganov
5658e577f3 Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev
am: c8d363e

* commit 'c8d363e24c4906f2a9d261d46503f16b4b63bccd':
  Cleanup of the PackageInstaller API - Settings

Change-Id: Ie4352dff2c554c760a78b8d071ffaf29b3720e2a
2016-04-22 23:30:39 +00:00
Svetoslav Ganov
4143228b47 Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev
am: c8d363e

* commit 'c8d363e24c4906f2a9d261d46503f16b4b63bccd':
  Cleanup of the PackageInstaller API - Settings

Change-Id: I67ea31a2464101d25b6d80b4b84dad596738e829
2016-04-22 23:30:38 +00:00
Svetoslav Ganov
c8d363e24c Merge "Cleanup of the PackageInstaller API - Settings" into nyc-dev 2016-04-22 22:18:28 +00:00
Felipe Leme
ff39a834ba Merge "Disable tethering when Data Saver mode is on." into nyc-dev am: 1d3f1e0 am: 06fb22d
am: 048e5a0

* commit '048e5a0b9957e59e26493989b8e6687c6e74af06':
  Disable tethering when Data Saver mode is on.

Change-Id: I542eb6cba7def76e76b5eeada1e3115d88eede7d
2016-04-22 22:05:44 +00:00
Philip P. Moltmann
dd642df8c0 Merge "Update print jobs appropriately in the print settings." into nyc-dev am: badb762 am: 04b28dd
am: d60d2c2

* commit 'd60d2c25d15c86b14af2399dc5328020b1eb5bef':
  Update print jobs appropriately in the print settings.

Change-Id: I82655f6f19e0bb68af726c8f38a9099ea6ccd23b
2016-04-22 22:05:42 +00:00
Felipe Leme
048e5a0b99 Merge "Disable tethering when Data Saver mode is on." into nyc-dev am: 1d3f1e0
am: 06fb22d

* commit '06fb22dd19017439849625a88f57e741dfd5ad46':
  Disable tethering when Data Saver mode is on.

Change-Id: Iadff2074da9d7f04b51292c7ed33c20d96ada623
2016-04-22 21:46:21 +00:00
Felipe Leme
06fb22dd19 Merge "Disable tethering when Data Saver mode is on." into nyc-dev
am: 1d3f1e0

* commit '1d3f1e0fde8538ba0edd54009931edd48c097fe0':
  Disable tethering when Data Saver mode is on.

Change-Id: I8d8f59aa6726c4e47f0b7ed26400645ce1e97d6c
2016-04-22 21:43:50 +00:00
Felipe Leme
cd57db78b0 Merge "Disable tethering when Data Saver mode is on." into nyc-dev
am: 1d3f1e0

* commit '1d3f1e0fde8538ba0edd54009931edd48c097fe0':
  Disable tethering when Data Saver mode is on.

Change-Id: I6de8bec1c969a1fe7a1d1b8bf5d8587d2c0fc6f1
2016-04-22 21:43:50 +00:00
Felipe Leme
1d3f1e0fde Merge "Disable tethering when Data Saver mode is on." into nyc-dev 2016-04-22 21:39:51 +00:00
Felipe Leme
5c09184e00 Disable tethering when Data Saver mode is on.
BUG: 28313291
Change-Id: Idbedd440a1baa41f1407b32e86f5ae0080e60798
2016-04-22 14:25:35 -07:00
Philip P. Moltmann
d60d2c25d1 Merge "Update print jobs appropriately in the print settings." into nyc-dev am: badb762
am: 04b28dd

* commit '04b28dde9bf983bc7c0b6ee3f878d6148ad54eee':
  Update print jobs appropriately in the print settings.

Change-Id: I70ec2fd543967a906e01fc34a0f93c909fb4a906
2016-04-22 18:49:01 +00:00
Philip P. Moltmann
04b28dde9b Merge "Update print jobs appropriately in the print settings." into nyc-dev
am: badb762

* commit 'badb762523ae7cebf6db98f5a590f403893a7d99':
  Update print jobs appropriately in the print settings.

Change-Id: Ib1eb53c336d63543333d83fc25cfd55fac1f6bfb
2016-04-22 18:41:29 +00:00
Philip P. Moltmann
558c541f05 Merge "Update print jobs appropriately in the print settings." into nyc-dev
am: badb762

* commit 'badb762523ae7cebf6db98f5a590f403893a7d99':
  Update print jobs appropriately in the print settings.

Change-Id: Ie353c3ed8956fe8587de16db4e30be6a318a016b
2016-04-22 18:41:12 +00:00
Daniel Nishi
cc00aba6bf Fix a whitespace issue in ManageApplications. am: 9412c5a6e2
am: 52ee1c76de

* commit '52ee1c76de5cdb992393962c2387d9a981487e8b':
  Fix a whitespace issue in ManageApplications.

Change-Id: I5d37fd3ff24c50b4235c0c1332df43523d31c1b5
2016-04-22 17:37:04 +00:00
Daniel Nishi
52ee1c76de Fix a whitespace issue in ManageApplications.
am: 9412c5a6e2

* commit '9412c5a6e24092ac5ae23e000bf1ae3c1455df11':
  Fix a whitespace issue in ManageApplications.

Change-Id: I585eaa6bde12eb70f3150c11fc0ffcee4f5909f2
2016-04-22 17:34:44 +00:00
Philip P. Moltmann
badb762523 Merge "Update print jobs appropriately in the print settings." into nyc-dev 2016-04-22 17:32:36 +00:00