Commit Graph

26422 Commits

Author SHA1 Message Date
Fan Zhang
e5287f10ce Merge "Add an empty status fragment for status and suggestions." 2016-04-01 16:08:48 +00:00
Fan Zhang
3feafd22ed Add an empty status fragment for status and suggestions.
Bug: 27927402

Also add a TabLayout to show title for these fragments, inspired by
http://goo.gl/aOt51Q

Change-Id: I40bab3075480670558ac9a896337109f10e8c90c
2016-04-01 09:07:31 -07:00
Tyler Gunn
746aa34f5a Merge "Adding "wifi only" option for wifi calling." into nyc-dev am: 00c334c
am: d5eb67f

* commit 'd5eb67f5662c615e92a9c78e2691a01c58166b6e':
  Adding "wifi only" option for wifi calling.

Change-Id: I7e9fa3ec4adf01ac8d237edfd904f05ef1ae9306
2016-04-01 16:03:27 +00:00
Tyler Gunn
d5eb67f566 Merge "Adding "wifi only" option for wifi calling." into nyc-dev
am: 00c334c

* commit '00c334ccba341761af448805ddfc842394f3dfbb':
  Adding "wifi only" option for wifi calling.

Change-Id: I7766c8b09b3713fa75c72838f7136bd8dc32b332
2016-04-01 15:58:41 +00:00
Tyler Gunn
00c334ccba Merge "Adding "wifi only" option for wifi calling." into nyc-dev 2016-04-01 15:43:08 +00:00
Tyler Gunn
2013ba8ed1 Adding "wifi only" option for wifi calling.
- Added "wifi-only" option to the list of wifi calling modes.
- Added code in settings initialization to check whether the carrier
supports including the wifi-only option.  If it does not, changes the
entries/values to a ser which does not include the wifi-only option.

Bug: 27858149
Change-Id: Ib02a97afcf6f2722c28b7a4d9c241774944c52d0
2016-04-01 08:41:18 -07:00
Fan Zhang
70e30bb57b Merge "Move actionbar menu from DashboardSummary to container." 2016-04-01 15:21:42 +00:00
Julia Reynolds
e606fd8a5e Add null checks on filters. am: e89bebe
am: e723b0f

* commit 'e723b0f0f77e02503a99895def4634508bf852a6':
  Add null checks on filters.

Change-Id: I0fcc68f270b51680452dc8041111a1d6225d8a8d
2016-04-01 14:06:48 +00:00
Julia Reynolds
e723b0f0f7 Add null checks on filters.
am: e89bebe

* commit 'e89bebe96f547fc7e6badf3e2bc80eebdda7793c':
  Add null checks on filters.

Change-Id: I728a29989c9fa3afaac853dbba6d362160e44667
2016-04-01 14:02:30 +00:00
Julia Reynolds
e89bebe96f Add null checks on filters.
Bug: 27496323
Change-Id: If8883279af11218042f420509c3a8e7b168c815f
2016-04-01 09:47:32 -04:00
Clara Bayarri
8505258c31 Merge "Change Work Challenge background image" into nyc-dev am: 63096e9
am: dfae146

* commit 'dfae1467ea6304da96f8505c683e9cc205c1e7dd':
  Change Work Challenge background image

Change-Id: Ibef0bc4a8164b0f496ee1e2b77b1307d23931701
2016-04-01 11:31:23 +00:00
Clara Bayarri
dfae1467ea Merge "Change Work Challenge background image" into nyc-dev
am: 63096e9

* commit '63096e965c1ff95b8b7eed53388aa00014500381':
  Change Work Challenge background image

Change-Id: Ib2b87c666fe73da24de6f375c74505f4b3498e21
2016-04-01 11:27:42 +00:00
Clara Bayarri
63096e965c Merge "Change Work Challenge background image" into nyc-dev 2016-04-01 11:18:24 +00:00
Yohei Yukawa
80e38e45e1 Fix jank when dismissing InputMethodAndSubtypeEnabler. am: 6452b84
am: 7be3dd3

* commit '7be3dd3ee3000a1db15ff163bc208f718358629b':
  Fix jank when dismissing InputMethodAndSubtypeEnabler.

Change-Id: I708b4a7f9274488c07db26145f364dcbe7e64524
2016-04-01 08:05:31 +00:00
Yohei Yukawa
7be3dd3ee3 Fix jank when dismissing InputMethodAndSubtypeEnabler.
am: 6452b84

* commit '6452b84763f864139a3744bd3406f72a0014301a':
  Fix jank when dismissing InputMethodAndSubtypeEnabler.

Change-Id: I36ddc96a4551d0afee1b4334b6b01cb5f6305724
2016-04-01 08:01:23 +00:00
Yohei Yukawa
6452b84763 Fix jank when dismissing InputMethodAndSubtypeEnabler.
InputMethodAndSubtypeUtil#saveInputMethodSubtypeList() has a bug that
it saves implicitly enabled subtypes when "Use system languages" is
checked.  Implicitly enabled subtypes are transient data and the system
should have only a null data (0) in the persistent strage.  The root
cause of this bug is that the method in question has not checked whether
the preference item is in enabled (not grayed-out).   If it is
grayed-out, its checked state does not mean that the user manually
checked that subtype but it is just an indicator for the user.

The strange UI jank when dismissing InputMethodAndSubtypeEnabler is one
of the victim of the above bug because we have worked around it by
actually changing checked state before calling the method in question.

With this CL we no longer need to update preference items in
InputMethodAndSubtypeEnabler#onPause().

Bug: 27867966
Change-Id: Ifc291d77ea41a988438765b9ba16bc5d18a15e1b
2016-03-31 22:58:33 -07:00
Fan Zhang
d9d21d6cb1 Move actionbar menu from DashboardSummary to container.
Bug: 27751187
Change-Id: I7730f104805abcbb6d243fccac94e39fad26ddd2
2016-03-31 15:33:45 -07:00
Udam Saini
627b3b39fa Merge "Fixes graybar as status bar and unshifts header view." into nyc-dev am: a2dda41
am: 44193d5

* commit '44193d50361e945982189928005cb517dd73531f':
  Fixes graybar as status bar and unshifts header view.

Change-Id: Iefc222d7a63738a71d50502ce8b8d03a9aee919e
2016-03-31 20:48:52 +00:00
Udam Saini
44193d5036 Merge "Fixes graybar as status bar and unshifts header view." into nyc-dev
am: a2dda41

* commit 'a2dda4122bb73f49fcd118a712c1aa61a303c11b':
  Fixes graybar as status bar and unshifts header view.

Change-Id: I29cc18ed77ea763385a9a96281da302d4d6c0185
2016-03-31 20:42:06 +00:00
Udam Saini
a2dda4122b Merge "Fixes graybar as status bar and unshifts header view." into nyc-dev 2016-03-31 20:30:28 +00:00
Udam Saini
6251501ef3 Merge "Prevents users from being added if device is not provisioned" into nyc-dev am: e20deea
am: 9f7d237

* commit '9f7d2375806bcfc7dc873e51b228e69e57e093b8':
  Prevents users from being added if device is not provisioned

Change-Id: I255f6f284aafc68f66d3a8956c5f9a8ba85525a3
2016-03-31 20:26:42 +00:00
Udam Saini
9f7d237580 Merge "Prevents users from being added if device is not provisioned" into nyc-dev
am: e20deea

* commit 'e20deea7112a17ac4799f6924cddc27b4678f791':
  Prevents users from being added if device is not provisioned

Change-Id: Ieb663a2741bce75cd9cebed08f36801a36958e83
2016-03-31 20:23:24 +00:00
Udam Saini
e20deea711 Merge "Prevents users from being added if device is not provisioned" into nyc-dev 2016-03-31 20:13:40 +00:00
Christopher Tate
a8fe48881e Merge "Track in-progress wallpaper API changes" into nyc-dev am: cb77df2
am: e714194

* commit 'e7141949edd4c5aeb4366e8e773cc6f16ade2950':
  Track in-progress wallpaper API changes

Change-Id: I6ad24595aee24d5ce3be7e8e230295e9cca6fa2e
2016-03-31 19:42:42 +00:00
Christopher Tate
e7141949ed Merge "Track in-progress wallpaper API changes" into nyc-dev
am: cb77df2

* commit 'cb77df22609179aacf985818fd512719f7ea98f7':
  Track in-progress wallpaper API changes

Change-Id: Ia1df1b0dbf5880a94c6c2b6f6d5c3208a951ef40
2016-03-31 19:35:57 +00:00
Chris Tate
cb77df2260 Merge "Track in-progress wallpaper API changes" into nyc-dev 2016-03-31 19:24:41 +00:00
Robin Lee
a8bf579e34 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev am: 4d29ab3
am: e79fed2

* commit 'e79fed2839bbb70c1df111947208e00833057154':
  DISALLOW_CONFIG_CREDENTIALS blocks user credentials

Change-Id: I53a5b108a62f679e731164a8ac21f121ad21cabf
2016-03-31 18:59:00 +00:00
Robin Lee
e79fed2839 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev
am: 4d29ab3

* commit '4d29ab31455ae7c7eef91871230e34b3ecc452e1':
  DISALLOW_CONFIG_CREDENTIALS blocks user credentials

Change-Id: I20a82efa39f5116ba3919198418873e794fa5240
2016-03-31 18:55:32 +00:00
Robin Lee
4d29ab3145 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev 2016-03-31 18:44:21 +00:00
Ying Wang
686adfc32f Remove obsolete LOCAL_DX_FLAGS
Bug: 27400061
Change-Id: Ia65d8ebdbb96d34fe12badc0015716d5d9fde0ca
2016-03-31 11:16:55 -07:00
Jason Monk
a37aca16ea Merge "Fix missing summaries" into nyc-dev am: 8143d2a
am: f3a5f79

* commit 'f3a5f7986d41f126d6589296b207285247fb4f8e':
  Fix missing summaries

Change-Id: I6dc00e18687f801a23e12204b7627935bbc90e74
2016-03-31 18:10:30 +00:00
Jason Monk
f3a5f7986d Merge "Fix missing summaries" into nyc-dev
am: 8143d2a

* commit '8143d2adb345aefafdaa38ed12ab86b1a5fb0574':
  Fix missing summaries

Change-Id: Ibaaf35f6a429220a8e34621dcf16c4396044c5c5
2016-03-31 18:04:19 +00:00
Jason Monk
8143d2adb3 Merge "Fix missing summaries" into nyc-dev 2016-03-31 18:00:55 +00:00
Jason Monk
c064573265 Fix missing summaries
Handle non-cached tiles by doing lookup from component name.

Change-Id: I979e2df2eed4a065f290c5c0e66276d08b4fb0af
Fixes: 27942733
2016-03-31 13:59:46 -04:00
mariagpuyol
e22810e71a Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev am: 6d6ea3f
am: d0ba082

* commit 'd0ba082ca732b0effe15067d93b22e292a96237c':
  Use same task for Settings>Users and EmergencyInfo

Change-Id: Idbb6fc5505039055825f8118cad1277966c29ae3
2016-03-31 17:46:39 +00:00
Victor Chang
fc20972456 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev am: b1d7142
am: 5cffb81

* commit '5cffb81f567009e589e2bbc8ccd3dcae15147f13':
  Show notification when failing to turn on always-on vpn

Change-Id: I2446bb50b8981800e400faf4a04f291b416afd58
2016-03-31 17:46:38 +00:00
Robin Lee
c421db78f0 DISALLOW_CONFIG_CREDENTIALS blocks user credentials
All settings preferences related to credentials of any kind should be
stopped by this user restriction.

Bug: 26879958
Change-Id: I983c6e58081bd4022bb006942499cba4b74954e7
2016-03-31 18:45:43 +01:00
mariagpuyol
d0ba082ca7 Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev
am: 6d6ea3f

* commit '6d6ea3fe0a9aae6159b3eda197cd1d660135c413':
  Use same task for Settings>Users and EmergencyInfo

Change-Id: Ifc596101c4392bb76f2d6038c364560ebc42fefa
2016-03-31 17:44:34 +00:00
Victor Chang
5cffb81f56 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev
am: b1d7142

* commit 'b1d7142cb21de23ec9c1dddb824405bf252bffed':
  Show notification when failing to turn on always-on vpn

Change-Id: I76c5ad7c545294edfeb533148ba85cdcdc41dc58
2016-03-31 17:44:34 +00:00
Maria Garcia Puyol
6d6ea3fe0a Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev 2016-03-31 17:38:56 +00:00
Victor Chang
b1d7142cb2 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev 2016-03-31 17:04:53 +00:00
Christopher Tate
25e59e9767 Track in-progress wallpaper API changes
FLAG_*, not FLAG_SET_*

Bug 27365822

Change-Id: I5cb4dbfd251519a80997a86d3010f19240b9ff23
2016-03-31 09:56:37 -07:00
Jason Monk
ae130a27c5 Merge "Fix categeries being read out on settings dashboard" into nyc-dev am: 69446e8
am: d09508b

* commit 'd09508b8fc2c6fd917ab2f69e1014fa96edf2e1d':
  Fix categeries being read out on settings dashboard

Change-Id: I3ffd285de257ed9171a5b0d9f11f61305f22f4bf
2016-03-31 15:50:46 +00:00
Jason Monk
38587c61fb Merge "Fix cell data preference in single sim case" into nyc-dev am: 04f10a5
am: e0ec32c

* commit 'e0ec32c26e580b5dca8c1968f20949021d37211f':
  Fix cell data preference in single sim case

Change-Id: I317173dde03aac9d5b5ac0ec9805347a069a6086
2016-03-31 15:50:46 +00:00
Jason Monk
6de2d0a5a3 Merge changes from topic \'SettingsMetrics\' into nyc-dev am: 50b9592
am: 5c4e4bc

* commit '5c4e4bcb63bcf01907a0b871b4793a029ddb1968':
  Add metrics for suggestions
  Add metrics for settings conditionals

Change-Id: Ic33116cf8ef78094a026ef61514019769e44e674
2016-03-31 15:50:44 +00:00
Bill Yi
6a2cf0a28e Merge "Import translations. DO NOT MERGE" into nyc-dev am: 645c198 -s ours
am: 987b621  -s ours

* commit '987b6211574463a3ed139373dd3e1b241dae64d5':
  Import translations. DO NOT MERGE

Change-Id: I6353e86f3630d5c063eb02adaf1dde58b744603b
2016-03-31 15:50:43 +00:00
Jason Monk
d09508b8fc Merge "Fix categeries being read out on settings dashboard" into nyc-dev
am: 69446e8

* commit '69446e80ab95f7d01b7612a02ae35e75d9b5c609':
  Fix categeries being read out on settings dashboard

Change-Id: Ifd3c3ad560969b58557acd86a98eb299d65a4385
2016-03-31 15:43:28 +00:00
Jason Monk
e0ec32c26e Merge "Fix cell data preference in single sim case" into nyc-dev
am: 04f10a5

* commit '04f10a5eb53bb1ed3d70574102b94b17e075132d':
  Fix cell data preference in single sim case

Change-Id: I08d74e06819a2d0487149af5bfa40a6124b3100c
2016-03-31 15:43:28 +00:00
Jason Monk
5c4e4bcb63 Merge changes from topic \'SettingsMetrics\' into nyc-dev
am: 50b9592

* commit '50b9592e6116f8a6eca5df2753491a7e26ffde6a':
  Add metrics for suggestions
  Add metrics for settings conditionals

Change-Id: I40b107005c6a29a010658de643eb94db769ebcb1
2016-03-31 15:43:27 +00:00
Bill Yi
987b621157 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 645c198  -s ours

* commit '645c198f3e65427017b53957c025b0b3a94ebe52':
  Import translations. DO NOT MERGE

Change-Id: I5fd25e9853c625ce669b5ea54e2509351eed24b9
2016-03-31 15:43:27 +00:00