Commit Graph

27451 Commits

Author SHA1 Message Date
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
Alan Viverette
dca3c021e8 Merge "Remove -night qualified resources" into nyc-dev am: 3602edf am: c42a680
am: f8066f2

* commit 'f8066f23de1bb530e20770d2c0280d14c9750841':

Change-Id: Ia1fb1b0d4f8f0f5ad43a0244a22c50220fc3b0fc
2016-04-26 19:00:33 +00:00
TreeHugger Robot
f8066f23de Merge "Remove -night qualified resources" into nyc-dev am: 3602edf
am: c42a680

* commit 'c42a6808e8d5a06935f1a38045431ab99bf495a4':

Change-Id: I9b20eb73828fbf5584dcfef07b5c43aab9b1a067
2016-04-26 18:53:56 +00:00
Alan Viverette
ca93d6ba69 Merge "Remove -night qualified resources" into nyc-dev am: 3602edf am: 8802d69
am: 2e9b19f

* commit '2e9b19ff746f9f897f6340afc41d343fd572c0a4':
  Remove -night qualified resources

Change-Id: I1169a1fbf480d045ef356ec49457635523f6fd73
2016-04-26 18:50:48 +00:00
TreeHugger Robot
2e9b19ff74 Merge "Remove -night qualified resources" into nyc-dev am: 3602edf
am: 8802d69

* commit '8802d693c7af6bbf5afed3951b207cbfeb1a0365':
  Remove -night qualified resources

Change-Id: I0b02eeb578905c70288387aa3b7da4a7b34d7d13
2016-04-26 18:47:24 +00:00
Alan Viverette
c42a6808e8 Merge "Remove -night qualified resources" into nyc-dev
am: 3602edf

* commit '3602edf29ef83dfe348bb16a14a5dccd8c61368e':
  Remove -night qualified resources

Change-Id: I951817d2375f9e6e2180bc7e6e06d04b5ec54e99
2016-04-26 18:44:10 +00:00
Alan Viverette
8802d693c7 Merge "Remove -night qualified resources" into nyc-dev
am: 3602edf

* commit '3602edf29ef83dfe348bb16a14a5dccd8c61368e':
  Remove -night qualified resources

Change-Id: Ifee7850fa18d436a7323685c1d94029c13a8d77e
2016-04-26 18:44:05 +00:00
TreeHugger Robot
3602edf29e Merge "Remove -night qualified resources" into nyc-dev 2016-04-26 18:33:04 +00:00
Julia Reynolds
69c670a780 Merge "Don\'t crash on apps only installed for other users." into nyc-dev am: 1e5d0e7 am: 1c45384
am: f153626

* commit 'f15362643186a41d1b7aeb8c642dd76c19cc5a19':

Change-Id: I711fb71a71bc25fb668958864b5e7bba113ca638
2016-04-26 16:35:22 +00:00
Julia Reynolds
8ee6f5a580 Swap star tint. am: e39066c am: 39b1623
am: 3330f1b

* commit '3330f1bd22b343e57453ac7eb96cf4ff7cb4d8d5':

Change-Id: If2db405ca66adc4847ee1d45077bd5cf1bb2d26d
2016-04-26 16:35:21 +00: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
f153626431 Merge "Don\'t crash on apps only installed for other users." into nyc-dev am: 1e5d0e7
am: 1c45384

* commit '1c453847026eca1a0b51f2f8f98a1c33789af412':

Change-Id: Id58bdcd8091b86f24fa55eae18318eb1fb98ffab
2016-04-26 15:48:50 +00:00
Julia Reynolds
3330f1bd22 Swap star tint. am: e39066c
am: 39b1623

* commit '39b162388b0eaa44756cdee59c618c0e6d69c057':

Change-Id: Ife04d87207e67198b2f2e95dc967a7ac06c85eda
2016-04-26 15:48:50 +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
7c36c02069 Merge changes from topic \'qs-tiles\' into nyc-dev am: 321d450 am: 60b8a7b
am: e0679c4

* commit 'e0679c419f864acc063332d4ca7f9b13cc20405e':

Change-Id: I78740186c6f9b8cb506a9091e108c462084268c9
2016-04-25 19:45:46 +00: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
e0679c419f Merge changes from topic \'qs-tiles\' into nyc-dev am: 321d450
am: 60b8a7b

* commit '60b8a7bde8bde094822d07852f4d0eaab52f9c7f':

Change-Id: I67aa3451e8d31dff36ffa29bf146984b730212f2
2016-04-25 19:34:16 +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
Tony Mak
0f26f282a7 Merge "Update string for work challenge" into nyc-dev am: 6b9aa35 am: 185bfdf
am: 0871365

* commit '0871365dd18166e0ea4d2cb29bdc741ec438419e':

Change-Id: Ie3aebc98c027ef81384122d1379258e574db5d04
2016-04-25 17:27:09 +00:00
Tony Mak
0871365dd1 Merge "Update string for work challenge" into nyc-dev am: 6b9aa35
am: 185bfdf

* commit '185bfdf3a57beb1e22e734a1095dacfb8307bf94':

Change-Id: Ifa27ac999b9fe4b879e373716b9aede1c730f8c4
2016-04-25 17:21:40 +00:00
Tony Mak
3b7270286c Merge "Update string for work challenge" into nyc-dev am: 6b9aa35 am: f39379e
am: 403dcb0

* commit '403dcb01a97a81f8868cc307e9a8718bcfc433df':
  Update string for work challenge

Change-Id: I865ccce5d9e16f9256a3da28c99c36ff427f5649
2016-04-25 17:21:17 +00:00
Tony Mak
403dcb01a9 Merge "Update string for work challenge" into nyc-dev am: 6b9aa35
am: f39379e

* commit 'f39379e9edd9b2f50f9e3ff76dcf95025f47a48b':
  Update string for work challenge

Change-Id: Id477b96895a9fe20e299b480b6dfeeb1346d9e30
2016-04-25 17:15:28 +00:00
Alan Viverette
b935f2f67d Remove -night qualified resources
Bug: 28358465
Change-Id: I276076b35eb946e600b4540c184fc0605d73f7db
2016-04-25 12:55:40 -04:00
Tony Mak
185bfdf3a5 Merge "Update string for work challenge" into nyc-dev
am: 6b9aa35

* commit '6b9aa353e8fb773a8fddc58d8ed6c13a766d3752':
  Update string for work challenge

Change-Id: I18d307f4aea958fba7d95c630e15016ac6031814
2016-04-25 15:52:52 +00:00
Tony Mak
f39379e9ed Merge "Update string for work challenge" into nyc-dev
am: 6b9aa35

* commit '6b9aa353e8fb773a8fddc58d8ed6c13a766d3752':
  Update string for work challenge

Change-Id: Idf773961a3be23573c93fcd50186beaf6f6ce86c
2016-04-25 15:52:51 +00:00
Tony Mak
6b9aa353e8 Merge "Update string for work challenge" into nyc-dev 2016-04-25 15:36:03 +00:00
Ricky Wai
69ad329fba Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 0858ce1 am: a4cacbd
am: 388c54f

* commit '388c54fda1f12d59c2126dc0aeb994b2d59e3266':

Change-Id: I7325474f5c717e24c7b5fcc6b678805be6f0859d
2016-04-25 13:34:41 +00: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
388c54fda1 Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 0858ce1
am: a4cacbd

* commit 'a4cacbd7dca4a4bf8f7967b5365922dc5737cf93':

Change-Id: Icc784e1fe3236a2cbc9944861196f8479bddf1c9
2016-04-25 13:29:51 +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
Bill Yi
80b21da648 Import translations. DO NOT MERGE am: af3dce8 -s ours am: cfc670c -s ours
am: b427fe5  -s ours

* commit 'b427fe5baf0d2417349ea90c5388650875b654bf':

Change-Id: I77d9f341e2414c9288d648ec44bd599d285c26c0
2016-04-25 13:25:20 +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
Bill Yi
b427fe5baf Import translations. DO NOT MERGE am: af3dce8 -s ours
am: cfc670c  -s ours

* commit 'cfc670c45425852e053e54f6860fc4b4f91715d5':

Change-Id: I56ca768880986cc3e15752d280839d5abe730129
2016-04-25 13:20:19 +00:00
Bill Yi
e0c124e16e Import translations. DO NOT MERGE am: af3dce8 -s ours am: a66bc31 -s ours
am: aa65155  -s ours

* commit 'aa6515524fddb89412bc5c0c7fe1d1b8a574be27':
  Import translations. DO NOT MERGE

Change-Id: I5339994d67ce90cc57bb5b34f936d22e5ddf5aff
2016-04-25 13:20:03 +00:00