Commit Graph

11647 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Daniel Nishi
9412c5a6e2 Fix a whitespace issue in ManageApplications.
Change-Id: I730d9737f801dfb29172e71fc5f32a310b8e0cc4
(cherry picked from commit cce1a3189a)
2016-04-22 17:10:51 +00:00
Robin Lee
3754be20a5 Merge "Change VPN failure notification to dialog" into nyc-dev am: dc1e59a314
am: c9bc607505

* commit 'c9bc6075055e99f09c4b8d638ccf00ee279ed5a3':
  Change VPN failure notification to dialog

Change-Id: I88ab3523a9f98e44e7c356e60ef989e432efa88e
2016-04-22 16:11:07 +00:00
Jason Monk
9e10f10a4f Merge "Attempt to fix receiver registering problems" into nyc-dev am: 8dbc166353
am: 5fddbcd846

* commit '5fddbcd846aefdd875b6dd7709d3724591cba06d':
  Attempt to fix receiver registering problems

Change-Id: Ib861c6aef14a2235008d40509cb95b2410f1b069
2016-04-22 16:11:06 +00:00
Jason Monk
5cc3730815 Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev am: af6236d06f
am: 7014023f5d

* commit '7014023f5d291b6bebc0601dd221934c89143716':
  Don't link to MobileNetworkSettings unless admin user

Change-Id: I874d3910be0b1c808ab63f6fa9e9dda1a0731a47
2016-04-22 16:11:05 +00:00
Robin Lee
c9bc607505 Merge "Change VPN failure notification to dialog" into nyc-dev
am: dc1e59a314

* commit 'dc1e59a3147dfef7c582f2881e25d504025baa6a':
  Change VPN failure notification to dialog

Change-Id: I9209c010bd1bf3d0d7b18bef32c05b302354494f
2016-04-22 16:08:56 +00:00
Jason Monk
5fddbcd846 Merge "Attempt to fix receiver registering problems" into nyc-dev
am: 8dbc166353

* commit '8dbc16635341e7c52454d3faf806dc228502f265':
  Attempt to fix receiver registering problems

Change-Id: I36fd2eba3c451a3c509ea0e5da9611a91af239e6
2016-04-22 16:08:55 +00:00
Jason Monk
7014023f5d Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev
am: af6236d06f

* commit 'af6236d06f1be85bc52e04e9cad8478035a677ab':
  Don't link to MobileNetworkSettings unless admin user

Change-Id: I627072a521c4633abe6f2493ff641aea78ad5b86
2016-04-22 16:08:55 +00:00
Robin Lee
2bffd33441 Merge "Change VPN failure notification to dialog" into nyc-dev
am: dc1e59a314

* commit 'dc1e59a3147dfef7c582f2881e25d504025baa6a':
  Change VPN failure notification to dialog

Change-Id: I15d01551a3f941a6061c371bde6210ee8df89428
2016-04-22 16:08:54 +00:00
Jason Monk
762f0e137c Merge "Attempt to fix receiver registering problems" into nyc-dev
am: 8dbc166353

* commit '8dbc16635341e7c52454d3faf806dc228502f265':
  Attempt to fix receiver registering problems

Change-Id: Ief3d38f0a8ad3ebe6df95efd380e737f48af2a87
2016-04-22 16:08:53 +00:00
Jason Monk
700da14d84 Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev
am: af6236d06f

* commit 'af6236d06f1be85bc52e04e9cad8478035a677ab':
  Don't link to MobileNetworkSettings unless admin user

Change-Id: I1f2f8772015145bf418472f6389ea2d8f8533601
2016-04-22 16:08:52 +00:00
Robin Lee
dc1e59a314 Merge "Change VPN failure notification to dialog" into nyc-dev 2016-04-22 16:00:15 +00:00
Jason Monk
8dbc166353 Merge "Attempt to fix receiver registering problems" into nyc-dev 2016-04-22 15:47:44 +00:00
Jason Monk
af6236d06f Merge "Don't link to MobileNetworkSettings unless admin user" into nyc-dev 2016-04-22 15:47:39 +00:00
Jason Monk
8b986f5f73 Attempt to fix receiver registering problems
When in doubt, post to main thread.

Also clean up the listening state just in case there were any
doubts about it.

Change-Id: I9ab85781f38b0f694dc46ed5a953506ef10c5778
Fixes: 28319383 (Fingers crossed)
2016-04-22 11:40:13 -04:00
Mihai Niță
c972e7bdc1 Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am: 65515931e9
am: 691899e029

* commit '691899e029736f26d26d0209b9ea4fd0390b64f2':
  Add accessibility actions to the drag-and-drop locale list

Change-Id: Icf01017bdc56d3aa8249af3efa84340fc815d7c8
2016-04-22 14:52:15 +00:00
Mihai Nita
691899e029 Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev
am: 65515931e9

* commit '65515931e98341e17cf6207b363dbe3f4399fcfd':
  Add accessibility actions to the drag-and-drop locale list

Change-Id: I8726a6ce617f2c3347b00bc7ac857fd1ba8f7b47
2016-04-22 14:49:55 +00:00
Mihai Nita
6081857cea Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev
am: 65515931e9

* commit '65515931e98341e17cf6207b363dbe3f4399fcfd':
  Add accessibility actions to the drag-and-drop locale list

Change-Id: Ie9fae7049d30f7812dfde400b65800e2f36e8e9b
2016-04-22 14:49:53 +00:00