Commit Graph

26048 Commits

Author SHA1 Message Date
Jeff Sharkey
6cd645a487 Merge "Mark UI components for tests to find." into nyc-dev
am: 9069181

* commit '9069181c847168896c6fac97e8869944c97f0f2e':
  Mark UI components for tests to find.

Change-Id: Ie822df10d4a0c64727f46a29fbb6e07e366de702
2016-04-03 04:09:00 +00:00
Jeff Sharkey
9069181c84 Merge "Mark UI components for tests to find." into nyc-dev 2016-04-03 03:59:21 +00:00
Jeff Sharkey
a77652fea9 Mark UI components for tests to find.
Bug: 26498834
Change-Id: Id8ade0b9230a946c7facf8ebaf9700c196b31ee3
2016-04-01 23:18:11 -06:00
Yohei Yukawa
fb43d8d100 Merge "Revert "Fix no keyboard on N builds"" into nyc-dev
am: 3ace856

* commit '3ace856ed788349f1e8e343fc6fb4e3bc2a26033':
  Revert "Fix no keyboard on N builds"

Change-Id: I622451e204e0277d9190c6c3ab72b6595b47f6c6
2016-04-02 02:42:59 +00:00
Yohei Yukawa
3ace856ed7 Merge "Revert "Fix no keyboard on N builds"" into nyc-dev 2016-04-02 02:35:14 +00:00
Yohei Yukawa
7bb0465687 Revert "Fix no keyboard on N builds"
This reverts the previous commit [1] since the keyboard shows up without
such a workaround.  Presumably someone might have fixed something in
somewhere.

 [1]: Ifd588bf7db76f9ea5d6a90854f8e92f86f4c2910
      250faf9243.

Bug: 25942488
Bug: 26190615
Change-Id: Ie0e0ead960473a3504fc88a4f7d4d18108ef0e18
2016-04-01 17:20:37 -07:00
Jim Miller
6bc01014a7 Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev
am: 4a92815

* commit '4a92815acd6aad8a22b74fd7d22a5c83feff3266':
  Fix crash in ConfirmDeviceCredentials

Change-Id: I4770a45e4888909cc54d9c2aa334bc13e5726483
2016-04-01 22:32:26 +00:00
Jim Miller
4a92815acd Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev 2016-04-01 22:14:45 +00:00
Wei Huang
ea4ca2e096 Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev
am: e652b7b

* commit 'e652b7b0cade699a396f55602f5d7a282466c705':
  MVNO value is not grayed out when MVNO type is none

Change-Id: I12079a64d44b8578d258ef0afd4391b53016c709
2016-04-01 19:13:19 +00:00
Amit Mahajan
e652b7b0ca Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev 2016-04-01 18:58:25 +00:00
Wei Huang
84fd69a783 MVNO value is not grayed out when MVNO type is none
MVNO type is judged as none by comparing key string to "None",
but this logic does not work when language setting is non English
because key is not "None" due to translation.

Bug: 27267663
Change-Id: Ic39a084cd77f661f833b13106dc28444926487d8
2016-04-01 18:57:22 +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
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
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
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
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
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
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
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
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
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
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
Victor Chang
1b8855b211 Show notification when failing to turn on always-on vpn
- Notification icon is Settings icon
- VpnName is obtained as the same way as AppPreference
- Post notification as the current user with PendingIntent to VpnSettings to parent user
- Auto-cancel when user taps on the notification
- This implementation posts notification only when the failure happens sychronously
  (Assume ConnectivityService only unset always-on package immediately after calling setAlwaysOnVpnPackageForUser)

Bug:27374485
Change-Id: I0aee38498c8cc300dd8eb9687adcae5f9dc4f8af
2016-03-31 16:40:22 +01:00
Jason Monk
69446e80ab Merge "Fix categeries being read out on settings dashboard" into nyc-dev 2016-03-31 14:36:45 +00:00
Jason Monk
9c868652ba Fix categeries being read out on settings dashboard
Change-Id: Ica0eec62a532fa40b57553e8e3d9fba1cba3bd4e
Fixes: 26125682
2016-03-31 10:35:03 -04:00
Jason Monk
04f10a5eb5 Merge "Fix cell data preference in single sim case" into nyc-dev 2016-03-31 13:56:51 +00:00
Jason Monk
b0bca3c3c1 Fix cell data preference in single sim case
Change-Id: Ic956d4a7a4935bcdbeaf868f978e23ba11919f9c
Fixes: 27653690
2016-03-31 09:55:25 -04:00
Jason Monk
50b9592e61 Merge changes from topic 'SettingsMetrics' into nyc-dev
* changes:
  Add metrics for suggestions
  Add metrics for settings conditionals
2016-03-31 13:47:32 +00:00
Bill Yi
645c198f3e Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-31 13:23:37 +00:00
Yohei Yukawa
b5164e04a3 Merge changes Ieea9a13a,Id2ae6151 into nyc-dev
am: 5ffbf2e

* commit '5ffbf2e39d8ce5bb4f1256564fe060534541c710':
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".

Change-Id: Ideeeb1062a62ed77a7d178c80469effa0c3ade7c
2016-03-31 06:21:39 +00:00
Yohei Yukawa
5ffbf2e39d Merge changes Ieea9a13a,Id2ae6151 into nyc-dev
* changes:
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".
2016-03-31 06:13:54 +00:00