Commit Graph

9626 Commits

Author SHA1 Message Date
Wei Wang
2745712539 Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a am: aee68e0
am: d780b1b

* commit 'd780b1b4e13c68d6fe762dad24a980a733be552a':
  Add an entry in developer options for location tools.

Change-Id: I687415fa5383dc1965b1e4b0d3a0948a6e554714
2016-04-28 06:09:11 +00:00
Wei Wang
d780b1b4e1 Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a
am: aee68e0

* commit 'aee68e029a37e7a18d8086e27ae1bf1bc6c33da1':
  Add an entry in developer options for location tools.

Change-Id: I97963a037f35ca3dd0db22ed5d6ff086acb5f912
2016-04-28 06:06:14 +00:00
Wei Wang
ec8b526fd0 Merge "Add an entry in developer options for location tools." into nyc-dev
am: 920cf0a

* commit '920cf0a7b3ae75c6844bcb7994fd36d3e7968506':
  Add an entry in developer options for location tools.

Change-Id: I5af67764994e4cfed9f8ef4243954260d48ae163
2016-04-28 06:03:17 +00:00
Wei Wang
aee68e029a Merge "Add an entry in developer options for location tools." into nyc-dev
am: 920cf0a

* commit '920cf0a7b3ae75c6844bcb7994fd36d3e7968506':
  Add an entry in developer options for location tools.

Change-Id: Ie48ad7a27367353e50d0dc021c2f36eebf04af77
2016-04-28 06:03:16 +00:00
Wei Wang
920cf0a7b3 Merge "Add an entry in developer options for location tools." into nyc-dev 2016-04-28 05:57:30 +00:00
Fan Zhang
1f8aea56f0 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev am: cd89d12
am: 8d52417

* commit '8d52417257160443c2d52afa9d74c8406f0c7515':
  Monitor connectivity change and display offline promo.

Change-Id: Ib8b034b739f7048e788fa4b292ec291143ffe629
2016-04-27 23:43:31 +00:00
Wei Wang
e1c1a13cba Add an entry in developer options for location tools.
This is a temporary place holder for location dogfood tools, which will
be removed before ship.

Bug:28383982
Change-Id: I814c9a71044c2f73a6346bdd46ecd40375c984b8
2016-04-27 15:51:19 -07:00
Fan Zhang
8d52417257 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev
am: cd89d12

* commit 'cd89d1264227fccd9fe72acc78d959ff17196f69':
  Monitor connectivity change and display offline promo.

Change-Id: I72ce587dba5ffb9e821658e10415a5d5ffad7e5d
2016-04-27 21:01:00 +00:00
Fan Zhang
cd89d12642 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev 2016-04-27 20:42:38 +00:00
Bill Yi
88e71ef151 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-04-27 19:44:32 +00:00
Bill Yi
eb50d20504 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-27 19:44:13 +00:00
TreeHugger Robot
b806599ece Merge "Import translations. DO NOT MERGE" 2016-04-27 19:43:09 +00:00
Clara Bayarri
a0ad1b5cf2 Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 am: 03fb024
am: c8ab34c

* commit 'c8ab34c5e44608ecab00da342916933b50d47eb7':
  Fix Settings Condition expand button a11y label

Change-Id: Idf60d662db506c3c7089a413fff7ea29b7c0685c
2016-04-27 19:36:11 +00:00
Jason Monk
c8ab34c5e4 Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05
am: 03fb024

* commit '03fb0244d58d1d932570c1eacdce498d8146e68f':
  Fix Settings Condition expand button a11y label

Change-Id: Ia0d8bb962071b75f5d78912a07e64d012caff9ce
2016-04-27 19:31:26 +00:00
Clara Bayarri
03fb0244d5 Merge "Fix Settings Condition expand button a11y label" into nyc-dev
am: 51b1e05

* commit '51b1e0515d64adf3e330437960546465c0f4c7d3':
  Fix Settings Condition expand button a11y label

Change-Id: I3ce32065454d5b5e0bf58954e03ff88b8e205a1a
2016-04-27 19:26:54 +00:00
Clara Bayarri
3cb641e25d Merge "Fix Settings Condition expand button a11y label" into nyc-dev
am: 51b1e05

* commit '51b1e0515d64adf3e330437960546465c0f4c7d3':
  Fix Settings Condition expand button a11y label

Change-Id: I5891f817f4f484c79968c9ea8300596b5c1652d1
2016-04-27 19:26:52 +00:00
Fan Zhang
2ddde4a928 Monitor connectivity change and display offline promo.
Bug: 28141203
Change-Id: I2af7cc3071d835092fba961ff59189f1fb295063
2016-04-27 12:21:46 -07:00
Jason Monk
51b1e0515d Merge "Fix Settings Condition expand button a11y label" into nyc-dev 2016-04-27 19:15:59 +00:00
Fan Zhang
da8413b678 Merge "Add c2c and chat support when there is eligible account." into nyc-mr1-dev am: 562f632
am: 5fee9ad

* commit '5fee9ade4609d620139be2f304b8de3db3a878ad':
  Add c2c and chat support when there is eligible account.

Change-Id: I9f7871bbdc263bfb6bbbcdbc0cb61e04e3f5b497
2016-04-27 18:28:45 +00:00
Abodunrinwa Toki
be285edf20 Merge "Make Settings dashboard items focusable." into nyc-dev am: f7cd5bb am: 478988a
am: b8c0f8a

* commit 'b8c0f8a789f531a4d9452b46afbacbd727dc7871':
  Make Settings dashboard items focusable.

Change-Id: Id9909888a322e925a586140a22b036e4628838f4
2016-04-27 18:28:43 +00:00
Fan Zhang
5fee9ade46 Merge "Add c2c and chat support when there is eligible account." into nyc-mr1-dev
am: 562f632

* commit '562f6322e596b0e31cc295abd9ae75ce1a065082':
  Add c2c and chat support when there is eligible account.

Change-Id: Ieb84c45e92a52f2352e069adcac70d0b5344c2f8
2016-04-27 17:11:13 +00:00
Fan Zhang
562f6322e5 Merge "Add c2c and chat support when there is eligible account." into nyc-mr1-dev 2016-04-27 16:52:39 +00:00
Fan Zhang
a9fa0059b2 Add c2c and chat support when there is eligible account.
Bug: 28141203
Bug: 28316618
Bug: 28316343

- Replaced hardcoded fragment layout with a RecyclerView. The old layout
  was essentially building a list manually.
- Tweaked layout to look better.
- Hide escalation cards when there is no account. Show cards when
  there is at least 1 account.
- Request an intent to start specified support type when card is
  clicked.
- Monitor account changes so we can hide/show escalation cards when
  add/remove account.

Change-Id: Ie48158b85ade1363a41817cc88b1193e0aef87ae
2016-04-27 09:06:17 -07:00
Clara Bayarri
58440b2801 Fix Settings Condition expand button a11y label
Bug: 27276008
Change-Id: Ie62ed8a73b300948f053b5d35f344bce3b63869a
2016-04-27 16:54:22 +01:00
Abodunrinwa Toki
b8c0f8a789 Merge "Make Settings dashboard items focusable." into nyc-dev am: f7cd5bb
am: 478988a

* commit '478988a7316c42dc76f8bf4f64674ce303b6ba26':
  Make Settings dashboard items focusable.

Change-Id: I8d0d4fb1fd6871f46e59e1d49cac8937b97a645f
2016-04-27 13:50:43 +00:00
Abodunrinwa Toki
478988a731 Merge "Make Settings dashboard items focusable." into nyc-dev
am: f7cd5bb

* commit 'f7cd5bb4da10363b1a839d617caa666d24f101c4':
  Make Settings dashboard items focusable.

Change-Id: If3e074c38ac0763daaef83e6b0846e10a3f38739
2016-04-27 13:46:38 +00:00
Abodunrinwa Toki
74887c883f Merge "Make Settings dashboard items focusable." into nyc-dev
am: f7cd5bb

* commit 'f7cd5bb4da10363b1a839d617caa666d24f101c4':
  Make Settings dashboard items focusable.

Change-Id: Ibecb9723c480e34c353f12779ba2f4c581dcfdc6
2016-04-27 13:46:37 +00:00
Abodunrinwa Toki
f7cd5bb4da Merge "Make Settings dashboard items focusable." into nyc-dev 2016-04-27 13:41:01 +00:00
Bill Yi
df4bc602bd Import translations. DO NOT MERGE
Change-Id: I7b54da2b860a462c273ca1e6975e4942012c7525
Auto-generated-cl: translation import
2016-04-26 22:46:01 -07:00
Bill Yi
2cb624ded0 Import translations. DO NOT MERGE
Change-Id: I4312c197fd1f3dbb02c0a68de07470924fb93369
Auto-generated-cl: translation import
2016-04-26 22:34:25 -07:00
Bill Yi
a2592981c8 Import translations. DO NOT MERGE
Change-Id: I641fc5ca86c8c3da2018d50836057a7baf4f86d8
Auto-generated-cl: translation import
2016-04-26 21:37:22 -07: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
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
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
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
Abodunrinwa Toki
23bd5be378 Make Settings dashboard items focusable.
Bug: 27038246
Change-Id: Ied76fc546cacf1dafa4744dfc6e229f249a209d3
2016-04-25 17:21:03 +01: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