Commit Graph

27607 Commits

Author SHA1 Message Date
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
622140a825 Merge "Fixed context reference." into nyc-dev am: d76c723
am: c491501

* commit 'c491501a82d5eb9a09e5be666a397559372319b9':

Change-Id: I1ca04332a1ae87c6fd02f544557b75d91df1985e
2016-04-27 15:10:32 +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
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
Android Build Merger (Role)
ed1a8fe9bd Merge "Merge "Make Settings dashboard items focusable." into nyc-dev am: f7cd5bb am: 74887c8" into nyc-mr1-dev-plus-aosp 2016-04-27 13:51:05 +00:00
Android Build Merger (Role)
6216894f9e Merge "Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev am: e5103fe am: 0bc3442" into nyc-mr1-dev-plus-aosp 2016-04-27 13:51:01 +00:00
Abodunrinwa Toki
0f3e586070 Merge "Make Settings dashboard items focusable." into nyc-dev am: f7cd5bb
am: 74887c8

* commit '74887c883f483dabd32d74136bbfc13694524ea2':
  Make Settings dashboard items focusable.

Change-Id: Id13075d0a49b32c3d5ac40822d68510daaf0b411
2016-04-27 13:50:46 +00:00
Clara Bayarri
ae1080e13e Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev am: e5103fe
am: 0bc3442

* commit '0bc3442d1fa51d15fe354a070818f46e9b301673':

Change-Id: I8a89f1a342915aeeab6000f1c37b61ae18f08050
2016-04-27 13:50:45 +00: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
Clara Bayarri
c3f838e83a Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev am: e5103fe
am: 95efca5

* commit '95efca59700824194d32d51ca6fe00ad3ca8e6a6':
  Fix SIM cards option displayed in RYU & N9 WiFi Settings

Change-Id: Ia7c75ec3f76f16212ca9b92234e0587e19f739b1
2016-04-27 13:46:37 +00:00
Clara Bayarri
0bc3442d1f Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev
am: e5103fe

* commit 'e5103fe70400f2e4e93eddb7f6a70ba11e70c19d':
  Fix SIM cards option displayed in RYU & N9 WiFi Settings

Change-Id: I60eb53abf8fe6657717272f3ffd26f279298aac0
2016-04-27 13:41:48 +00:00
Clara Bayarri
95efca5970 Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev
am: e5103fe

* commit 'e5103fe70400f2e4e93eddb7f6a70ba11e70c19d':
  Fix SIM cards option displayed in RYU & N9 WiFi Settings

Change-Id: I85379faeb5a701a0859bb7485774ff89f1ad4fca
2016-04-27 13:41:48 +00:00
Abodunrinwa Toki
f7cd5bb4da Merge "Make Settings dashboard items focusable." into nyc-dev 2016-04-27 13:41:01 +00:00
Clara Bayarri
e5103fe704 Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev 2016-04-27 13:34:15 +00:00
Clara Bayarri
e64f89c23c Fix SIM cards option displayed in RYU & N9 WiFi Settings
Same as previously with Developer Settings, the Settings main
activity uses PackageManager to disable options that shouldn't
show up. Since this has a delay, these options show up initially
and disappear after a refresh. Disabling them by default makes
them not show up at all for devices that won't have them, but in
exchange makes them not be visible until the first refresh for
devices that do have them.

A more complete fix would involve having a way to initially
not depend on PackageManager for option visibilities.

Bug: 28308433
Change-Id: I6f5c2151a45878fb6c69a9f9971c29ebe65d9d8a
2016-04-27 12:33:56 +01: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
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
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
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
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
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
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