Commit Graph

12340 Commits

Author SHA1 Message Date
Wei Wang
920cf0a7b3 Merge "Add an entry in developer options for location tools." into nyc-dev 2016-04-28 05:57:30 +00:00
TreeHugger Robot
e75063b87b Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev am: aee8d8c
am: 54994aa

* commit '54994aaf4cb24ce59d13418bca0b4d9ce5747596':
  Fix crash when recreating SecuritySubSettings

Change-Id: I4a4cb36ac2a1b7aafecbdaa3ae447c5f9382db49
2016-04-28 00:01:08 +00:00
Adrian Roos
54994aaf4c Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev
am: aee8d8c

* commit 'aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
  Fix crash when recreating SecuritySubSettings

Change-Id: I09565a64acedc59c0e83b63d5d0974ba133ede87
2016-04-27 23:45:11 +00:00
Adrian Roos
9103fbb837 Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev
am: aee8d8c

* commit 'aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
  Fix crash when recreating SecuritySubSettings

Change-Id: I677d0025a9dfbb6afe7ad340d1a6e57daab5ab98
2016-04-27 22:52:56 +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
TreeHugger Robot
aee8d8c7e1 Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev 2016-04-27 22:40:05 +00:00
TreeHugger Robot
dbaaa26bf3 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18
am: e9f4fe7

* commit 'e9f4fe7c4db589a022a886fe1c24c5098e9071e1':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: I749e4b3c113dcc706112da6fee07decb443a5c6a
2016-04-27 21:38:13 +00:00
Felipe Leme
e9f4fe7c4d Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev
am: a21ac18

* commit 'a21ac18b05c95b413dfc8b279e9c3841b412b24c':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: If77ecd7bc909fcd7af17a02aaa99061e4f242cad
2016-04-27 21:31:53 +00:00
Felipe Leme
040b2ed9b2 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev
am: a21ac18

* commit 'a21ac18b05c95b413dfc8b279e9c3841b412b24c':
  Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.

Change-Id: I5a8bce52f789a274ca1fc7cff1fb130072f9e0c4
2016-04-27 21:31:51 +00:00
TreeHugger Robot
a21ac18b05 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev 2016-04-27 21:15:59 +00: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
Daniel Nishi
35eb879739 Merge "Fix a Deletion Helper crash when it fails to get an app list." into nyc-mr1-dev
am: 883c214

* commit '883c2141eb4e03992a11f3a447c97845ab34048c':
  Fix a Deletion Helper crash when it fails to get an app list.

Change-Id: I7728f81d30bebf447624c0305f772d4be1e97588
2016-04-27 21:00:59 +00:00
Adrian Roos
3686ef5e03 Fix crash when recreating SecuritySubSettings
Restoring instance state requires the items to be
there after onCreate.

Change-Id: Icef92bcbb168a0b4029a86b2b74235e344e2055e
Fixes: 27013071
2016-04-27 13:58:23 -07:00
Fan Zhang
cd89d12642 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev 2016-04-27 20:42:38 +00:00
Daniel Nishi
883c2141eb Merge "Fix a Deletion Helper crash when it fails to get an app list." into nyc-mr1-dev 2016-04-27 20:31:58 +00:00
Daniel Nishi
c73fb891bc Fix a Deletion Helper crash when it fails to get an app list.
Bug 28424827
Change-Id: I5c3c426d557fb1647a3909bf88fbb7d24329dc57
2016-04-27 20:29:07 +00:00
Felipe Leme
616ff3e6a4 Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.
BUG: 26820898
Change-Id: I83613ce54e13470dafd6420eec0af252e5e39429
2016-04-27 12:33:57 -07: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
Julia Reynolds
7cf677975c Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev am: ae35c38
am: 8f2fd11

* commit '8f2fd1106c48588e9138714ce83da1d4f3656b26':
  Show 'on the lockscreen' setting in more contexts.

Change-Id: If4f1b16655504bfd407af415bdd27fec4d36ac6f
2016-04-27 18:42:02 +00:00
Julia Reynolds
481a277eb6 Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev
am: ae35c38

* commit 'ae35c38fe7ee475a1c4c5a0386184ef7d682359b':
  Show 'on the lockscreen' setting in more contexts.

Change-Id: I12e4212fc2a7df04be34a1c7baa81303b93ab06e
2016-04-27 18:37:52 +00:00
Julia Reynolds
8f2fd1106c Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev
am: ae35c38

* commit 'ae35c38fe7ee475a1c4c5a0386184ef7d682359b':
  Show 'on the lockscreen' setting in more contexts.

Change-Id: If68301e5aea27bb82d5c1fa5ebae0833bcdeab02
2016-04-27 18:37:44 +00:00
Julia Reynolds
ae35c38fe7 Merge "Show 'on the lockscreen' setting in more contexts." into nyc-dev 2016-04-27 18:27:04 +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
Julia Reynolds
21fd269ea3 Show 'on the lockscreen' setting in more contexts.
- For managed profile apps
- When 'auto' importance is on.

Bug: 28405255
Change-Id: Ia4c0bc6010f157cac18a828069bbcf54087fc663
2016-04-27 12:46:43 -04: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
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
Felipe Leme
c491501a82 Merge "Fixed context reference." into nyc-dev
am: d76c723

* commit 'd76c723ebcf857661e65ac4aba9c1699f7e24163':
  Fixed context reference.

Change-Id: Ida3995915b81347ee200468efeb35c67fc9e3f48
2016-04-27 15:02:00 +00:00
TreeHugger Robot
d76c723ebc Merge "Fixed context reference." into nyc-dev 2016-04-27 14:53:08 +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
Mihai Nita
2c2e435ff2 Fix: accessibility actions move languages but don't update
Also added a comment in onItemMove explaining why that method
does not call doTheUpdate().

Bug: 28173358
Change-Id: Ifdc00e70346149aeb09bd95ec21c7df2ccbaa996
2016-04-26 09:02:11 -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
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
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