Commit Graph

26465 Commits

Author SHA1 Message Date
Clara Bayarri
99e5285425 Merge "Remove Secure Startup option from Security Settings" into nyc-dev
am: 35bf932eb0

* commit '35bf932eb0daf8038cc917508839784953c45c72':
  Remove Secure Startup option from Security Settings

Change-Id: Ife90c8effce61106a438ccd9158a001792810ede
2016-04-29 17:39:05 +00:00
Clara Bayarri
35bf932eb0 Merge "Remove Secure Startup option from Security Settings" into nyc-dev 2016-04-29 17:28:42 +00:00
Fan Zhang
ce0c6dd680 Disable stable id in support adapter.
Bug: 28141203
Change-Id: I8785b804e15e58b4885645bc72d68c2a3cacc692
2016-04-29 10:23:21 -07:00
Clara Bayarri
55fc7dd52b Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
am: d2549ce663

* commit 'd2549ce6635943144bde17582b825113c07aa868':
  Storage Settings shows hamburger instead of back arrow

Change-Id: Icc2014157f5160968563fdbaab175cbd90a76d58
2016-04-29 16:46:28 +00:00
Clara Bayarri
d2549ce663 Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev 2016-04-29 16:38:12 +00:00
Clara Bayarri
f534a66afd Storage Settings shows hamburger instead of back arrow
When there is only internal storage, StorageSettings forwards
automatically to this sub settings page, causing the navigation
icon to be the back arrow. Fixed to make it a hamburger in this
case.

Bug: 28197210
Change-Id: Ief3f7daa3973332a800faa652261e2cfdec36e85
2016-04-29 16:58:09 +01:00
Fan Zhang
050d94151f Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev 2016-04-29 15:49:30 +00:00
Julia Reynolds
9f6de156ca Merge "Fix NPE in user settings." into nyc-dev
am: e69d754865

* commit 'e69d754865572edf40a59c0edbf657a0d7948865':
  Fix NPE in user settings.

Change-Id: I9eb1d38fb2b60a6c4937a99d58e91e4970454933
2016-04-29 14:34:28 +00:00
Julia Reynolds
e69d754865 Merge "Fix NPE in user settings." into nyc-dev 2016-04-29 14:29:18 +00:00
shwetachahar
5d8a18ce2a Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
am: 19c01f0351

* commit '19c01f03511610541ab80b8f565381da31d21926':
  Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java

Change-Id: If4a777002972d217fbd770c0b2f481a9934bfd41
2016-04-29 13:34:19 +00:00
Shweta Chahar
19c01f0351 Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev 2016-04-29 13:29:10 +00:00
Julia Reynolds
8bda21a9d4 Fix NPE in user settings.
Bug: 28337026
Change-Id: I437874e8dd605b9a19318aafecf292303ee3ad58
2016-04-29 08:42:01 -04:00
Philip P. Moltmann
4d2714fd10 Handling of issues while migrating primary storage
am: 1ec941db0c

* commit '1ec941db0ce37a864b5aa1a92111e5c52953c33e':
  Handling of issues while migrating primary storage

Change-Id: I95283e6b84be28c026867b47ce84a1425e8b3859
2016-04-28 23:21:48 +00:00
Philip P. Moltmann
1ec941db0c Handling of issues while migrating primary storage
Bug: 28177789
Change-Id: Icfbd048ddf0a1d55df1e7273d49727357b98a452
2016-04-28 14:44:53 -07:00
Fan Zhang
a6c862caf6 Prompt sign-in when there is no account for support options
Bug: 28141203
Bug: 28316343
Change-Id: Ie7f86955519504e5eed4af4c8406a353a3847995
2016-04-28 14:40:07 -07:00
Julia Reynolds
8acb204098 Expand BT screen.
am: 05c6a2c007

* commit '05c6a2c007675fede50245519571879f749c8e66':
  Expand BT screen.

Change-Id: Ied5dfb76787680a4b48f62dedd657fb065f744fd
2016-04-28 19:24:51 +00:00
Julia Reynolds
05c6a2c007 Expand BT screen.
Bug: 27106877
Change-Id: I31100598f27d45b6a50351f14bd0d20cc6e27d9d
2016-04-28 14:27:02 -04:00
shwetachahar
7c0bc8ed76 Set the max for pitch seekbar in xml in sync with the max for pitch
seekbar in TextToSpeechSettings.java

Bug: 28257828
Change-Id: I8a114cf31d72eedf1ba03093364074bec7e7cdee
2016-04-28 16:09:18 +01:00
Jason Monk
c39a0fa7ce Merge "Fix summary lifecycle" into nyc-dev
am: 6e51591

* commit '6e5159185388ed97c5b1a8648c1c6f2396d124a2':
  Fix summary lifecycle

Change-Id: If5eb2ce64f152d37fc5b60c74ea2e2f28bd50a4f
2016-04-28 14:58:11 +00:00
Jason Monk
6e51591853 Merge "Fix summary lifecycle" into nyc-dev 2016-04-28 14:51:59 +00:00
Jason Monk
8d8de14905 Fix summary lifecycle
Once more and probably not for all

Don't let multiple listening state changes get queued, this can cause
rapid changes like listening->not listening->listening.  Also store
listening state on the worker thread now that we drop some state
messages and only notify summaries when there is a state change.

Change-Id: I93a5f364e9b35929f9088e044ebefd9be69740e6
Fixes: 28319383
2016-04-28 10:42:10 -04:00
Jason Monk
31c0cfe2f2 Merge "Fix search after upgrade" into nyc-dev
am: f96b594

* commit 'f96b5947f9122e471d7cc72847f707bc4dcc30a4':
  Fix search after upgrade

Change-Id: Iba0908e1a338fc4feea5ce6c7fbbe5847cd16dcb
2016-04-28 14:17:28 +00:00
Jason Monk
f96b5947f9 Merge "Fix search after upgrade" into nyc-dev 2016-04-28 14:13:44 +00:00
Jason Monk
18fbdd023b Fix search after upgrade
Settings was dropping the search tables after upgrade but not
clearing the bit that says a full index has completed.

Change-Id: If49960b8cc07e72127bac211ae4d6c1f25b71c81
Fixes: 28414461
2016-04-28 10:08:29 -04:00
Jason Monk
474cd3c062 Merge "Default payment settings to disabled" into nyc-dev
am: 6b421dd

* commit '6b421dd4f6250bceba673d6f86dcb48026517b01':
  Default payment settings to disabled

Change-Id: Ibff8616f8b6313843c28903ee2e38dce3462f076
2016-04-28 12:59:34 +00:00
Jason Monk
6b421dd4f6 Merge "Default payment settings to disabled" into nyc-dev 2016-04-28 12:56:46 +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
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
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
TreeHugger Robot
a21ac18b05 Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev 2016-04-27 21:15: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
Jason Monk
6b75f94b13 Default payment settings to disabled
Since it requires some hardware to be enabled.

Change-Id: I6d2a244211cb4c1fa7aadb76e5c2e4ff7459bcc4
Fixes: 28326451
2016-04-27 16:33:39 -04: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
Bill Yi
eeee5312a2 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: eb50d20  -s ours

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

Change-Id: Ia29296e9801f45c2cfb70ac151d257078bc90253
2016-04-27 19:56:17 +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
Felipe Leme
616ff3e6a4 Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.
BUG: 26820898
Change-Id: I83613ce54e13470dafd6420eec0af252e5e39429
2016-04-27 12:33:57 -07: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
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
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
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