OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge "Fix ApnSettings crash issue." into nyc-dev
yifan.bai [Thu, 21 Apr 2016 19:49:29 +0000 (19:49 +0000)]
Merge "Fix ApnSettings crash issue." into nyc-dev
am: afdcb6a78e

* commit 'afdcb6a78ebc1c5c685e0b24fbf6bb5c23434b95':
  Fix ApnSettings crash issue.

Change-Id: I00942a1d1cc6d1da14cfe31f32fd813796c20fa2

8 years agoMerge "Fix ApnSettings crash issue." into nyc-dev
Amit Mahajan [Thu, 21 Apr 2016 19:41:12 +0000 (19:41 +0000)]
Merge "Fix ApnSettings crash issue." into nyc-dev

8 years agoFix ApnSettings crash issue.
yifan.bai [Fri, 15 Apr 2016 07:25:03 +0000 (15:25 +0800)]
Fix ApnSettings crash issue.

Steps:
1. Add a new APN;
2. Click 'Reset to default';
3. During reset, click the new APN;
4. Crash happened.
Solution:
Disable menu items when reseting default APN.

Bug: 28314239
Change-Id: I8df439d066e58039e9f91a9be642127eb7298159

8 years agoMerge changes Ibac27ee1,I336aeefd into nyc-dev
Robin Lee [Thu, 21 Apr 2016 19:17:51 +0000 (19:17 +0000)]
Merge changes Ibac27ee1,I336aeefd into nyc-dev
am: e2ae135d3c

* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I5d447989c9a149314bf0fcde0e4f1f77b868f40e

8 years agoMerge changes Ibac27ee1,I336aeefd into nyc-dev
Robin Lee [Thu, 21 Apr 2016 19:13:48 +0000 (19:13 +0000)]
Merge changes Ibac27ee1,I336aeefd into nyc-dev

* changes:
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

8 years agoMerge "Fix summary loader lifecycle" into nyc-dev
Jason Monk [Thu, 21 Apr 2016 18:28:21 +0000 (18:28 +0000)]
Merge "Fix summary loader lifecycle" into nyc-dev
am: 1624f69ac9

* commit '1624f69ac92d1358a2401125033be5c83025a140':
  Fix summary loader lifecycle

Change-Id: Icb1deb9de59dbb7cc3cf6cea80fb8e11445c20a3

8 years agoMerge "Fix summary loader lifecycle" into nyc-dev
Jason Monk [Thu, 21 Apr 2016 18:20:08 +0000 (18:20 +0000)]
Merge "Fix summary loader lifecycle" into nyc-dev

8 years agoFix summary loader lifecycle
Jason Monk [Thu, 21 Apr 2016 18:15:13 +0000 (14:15 -0400)]
Fix summary loader lifecycle

Previous CL accidentally cleared the listening bit too early making
it never actually tell the SummaryProviders to stop listening.

Change-Id: I6af1acc861f6987b33641c40637354c75cf4d708
Fixes: 28306872

8 years agoMerge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev
Yohei Yukawa [Thu, 21 Apr 2016 17:18:20 +0000 (17:18 +0000)]
Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev
am: b156761ae8

* commit 'b156761ae88d63e982bdaae413fe102fc4042c3a':
  Support IMEs that have no subtype in PhysicalKeyboardFragment.

Change-Id: I99ee1f03a52d650186070c572641fa84091e21b5

8 years agoMerge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev
Yohei Yukawa [Thu, 21 Apr 2016 17:11:53 +0000 (17:11 +0000)]
Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev

8 years agoBe more aggressive caching Vpn preference attrs
Robin Lee [Thu, 21 Apr 2016 11:56:21 +0000 (12:56 +0100)]
Be more aggressive caching Vpn preference attrs

As any change to the preference title will cause it to lose focus,
best not to do this too often.

Change-Id: Ibac27ee1de42fd7ca05f3e3685b84f37dac39517
Fix: 28191965

8 years agoMerge "Screen saver string fixes" into nyc-dev
Jason Monk [Thu, 21 Apr 2016 15:58:01 +0000 (15:58 +0000)]
Merge "Screen saver string fixes" into nyc-dev
am: 990ef94b64

* commit '990ef94b646f6d38fa8a44ee26f211014969e08e':
  Screen saver string fixes

Change-Id: I4286c726e1faa245860cd038ae037c88a5efc72f

8 years agoMerge "Screen saver string fixes" into nyc-dev
Jason Monk [Thu, 21 Apr 2016 15:55:27 +0000 (15:55 +0000)]
Merge "Screen saver string fixes" into nyc-dev

8 years agoScreen saver string fixes
Jason Monk [Thu, 21 Apr 2016 15:50:58 +0000 (11:50 -0400)]
Screen saver string fixes

Change-Id: I609509787e5f7f9f03eb0e478ab358fe930b0678
Fixes: 28268243

8 years agoMerge "Include work app in battery optimization settings" into nyc-dev
Keith Cheung [Thu, 21 Apr 2016 15:38:02 +0000 (15:38 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev
am: 9b167a6878

* commit '9b167a6878d036ffb253687a4eb94e1e44e5fda4':
  Include work app in battery optimization settings

Change-Id: I9998aecbbd7acea6222aa65c6928864b5ea4cd5f

8 years agoMerge "Include work app in battery optimization settings" into nyc-dev
Keith Cheung [Thu, 21 Apr 2016 15:18:06 +0000 (15:18 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev

8 years agoMerge "Fix only one battery stat showing sometimes." into nyc-dev
Jason Monk [Thu, 21 Apr 2016 14:25:31 +0000 (14:25 +0000)]
Merge "Fix only one battery stat showing sometimes." into nyc-dev
am: 7bcc48f77d

* commit '7bcc48f77d1110a14e0cf984431da435ad1b47a5':
  Fix only one battery stat showing sometimes.

Change-Id: Ie7abb1569eee61ce2eb28a73728a60695e481f6e

8 years agoMerge "Fix only one battery stat showing sometimes." into nyc-dev
Jason Monk [Thu, 21 Apr 2016 14:21:40 +0000 (14:21 +0000)]
Merge "Fix only one battery stat showing sometimes." into nyc-dev

8 years agoFix only one battery stat showing sometimes.
Jason Monk [Thu, 21 Apr 2016 14:12:30 +0000 (10:12 -0400)]
Fix only one battery stat showing sometimes.

Take into account the prefs we are currently caching within the
group when counting how many prefs have been added.

Change-Id: I962acd41592c1a9366882711d3f4944bffb54d22
Fixes: 27931457

8 years agoMerge "Fix: Spell checker cannot be re-enabled." into nyc-dev
Keisuke Kuroyanagi [Thu, 21 Apr 2016 13:59:03 +0000 (13:59 +0000)]
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev
am: bf0e1338ec

* commit 'bf0e1338ec8ba44b9f03d6c832003ebfa5593d70':
  Fix: Spell checker cannot be re-enabled.

Change-Id: Idaa58d83e77dbcface0f44e8fd83105bae8653e3

8 years agoInclude work app in battery optimization settings
Keith Cheung [Mon, 18 Apr 2016 17:36:49 +0000 (18:36 +0100)]
Include work app in battery optimization settings

Fix: 23684151

Change-Id: If2d1a18838414122d8af57fda7138f87fd3f1e62

8 years agoMerge "Fix: Spell checker cannot be re-enabled." into nyc-dev
Keisuke Kuroyanagi [Thu, 21 Apr 2016 13:38:14 +0000 (13:38 +0000)]
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev

8 years agoMerge "Don\'t save a rule without a name." into nyc-dev
Julia Reynolds [Thu, 21 Apr 2016 12:46:17 +0000 (12:46 +0000)]
Merge "Don\'t save a rule without a name." into nyc-dev
am: 257355afde

* commit '257355afde546a408e4f47b59fff97df9d09cf9d':
  Don't save a rule without a name.

Change-Id: I1d05e1f66b8909a8153001b39aa98a625bc1ae75

8 years agoMerge "Don't save a rule without a name." into nyc-dev
Julia Reynolds [Thu, 21 Apr 2016 12:29:30 +0000 (12:29 +0000)]
Merge "Don't save a rule without a name." into nyc-dev

8 years agoOne updateSummary method called by all VPN prefs
Robin Lee [Tue, 19 Apr 2016 11:29:02 +0000 (12:29 +0100)]
One updateSummary method called by all VPN prefs

Having multiple methods means inevitably when new features are added to
the preferences, the right calls aren't made so information on the
screen lags between updates.

Bug: 28257641
Change-Id: I336aeefd5941ccf808dc9070427209a7d2530032
(cherry picked from commit 903843e6f9ead6f17d3685a551dc85083b147038)

8 years agoSupport IMEs that have no subtype in PhysicalKeyboardFragment.
Yohei Yukawa [Thu, 21 Apr 2016 00:20:26 +0000 (17:20 -0700)]
Support IMEs that have no subtype in PhysicalKeyboardFragment.

With a Framework-side change [1],
InputManager#{get, set}KeyboardLayoutForInputDevice() are now able to
deal with null InputMethodSubtype as a valid input.  With this CL, we no
longer filter out IMEs that do not support subtypes in
PhysicalKeyboardFragment.

 [1]: Ia013784a594ad3beaf30976d047f5ac0fa8185be

Bug: 28182650
Change-Id: I46b9c5b018f08e3eaa4614a0893db0be91652f3c

8 years agoMerge "Fix bug where fingerprint for wrong userId was attempted to be removed." into...
Jim Miller [Wed, 20 Apr 2016 21:42:23 +0000 (21:42 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
am: 25c0b7b

* commit '25c0b7bc4e12d6f0774695ca504118abba81ea88':
  Fix bug where fingerprint for wrong userId was attempted to be removed.

Change-Id: I1c7df2c60f898807a3e64fa714db4ff4675835fc

8 years agoMerge "Fixes a string for tablets/devices" into nyc-dev
Udam Saini [Wed, 20 Apr 2016 21:42:22 +0000 (21:42 +0000)]
Merge "Fixes a string for tablets/devices" into nyc-dev
am: e0892e1

* commit 'e0892e16adb55e3f0b368b9d461efae09bf38c5b':
  Fixes a string for tablets/devices

Change-Id: I63f0475602c2ca19053387ca7c08e6881828a22e

8 years agoMerge "Remove some of the unused assets" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 21:42:22 +0000 (21:42 +0000)]
Merge "Remove some of the unused assets" into nyc-dev
am: 8b8002b

* commit '8b8002b50831e8c93df0f04e2e6605719585b985':
  Remove some of the unused assets

Change-Id: Ibcbcd933131aa12feb5b226c76a943d947c77db0

8 years agoMerge "Add minimum date" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 21:42:21 +0000 (21:42 +0000)]
Merge "Add minimum date" into nyc-dev
am: 17b554c

* commit '17b554c8b7b05b6c31b1aba15ea2067c50d08153':
  Add minimum date

Change-Id: I537a109c7f7d2a3ff33f2cf9a9755060b2b6b640

8 years agoMerge "Add settings for altering VR display behavior." into nyc-dev
Ruben Brunk [Wed, 20 Apr 2016 21:42:20 +0000 (21:42 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev
am: 3a3d110

* commit '3a3d110a504bb0c1ea91ec6e98fcd158cbd8532e':
  Add settings for altering VR display behavior.

Change-Id: I63640eedc5729ff34a388f2914e9c60ce7c715df

8 years agoMerge "Fix summaries of some restricted switch preferences." into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 21:42:20 +0000 (21:42 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
am: c2dae39

* commit 'c2dae39ab4ab2531c9a8afff39fd99425e2a6bdd':
  Fix summaries of some restricted switch preferences.

Change-Id: If7fb847fb1a995d92519ec223492cee6711ec46a

8 years agoMerge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 21:42:19 +0000 (21:42 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
am: b2f161a

* commit 'b2f161ab389469c7029efe4915aef06e9671ffdb':
  Apply policy transparency to "Stay awake" in Development settings.

Change-Id: Ifa4602bf64c12d47030e71068c80733bf6d88bfa

8 years agoMerge "Daydream -> Screen saver" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 21:42:18 +0000 (21:42 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev
am: ea80ebc

* commit 'ea80ebcd92c94d99f22279101ee2bdc27499b55b':
  Daydream -> Screen saver

Change-Id: Ia6454ece816ef711261094fceab046563c723514

8 years agoMerge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
Felipe Leme [Wed, 20 Apr 2016 21:42:17 +0000 (21:42 +0000)]
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
am: 4f5568a

* commit '4f5568a8a0cd69968ae0a5278bb06ea8adc9414f':
  Listen to INetworkPolicyManager events and update UI accordingly.

Change-Id: I2aad2e45e53b910efb6b1c684708db0c44ace65a

8 years agoMerge "Fix sim status screen" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 21:42:16 +0000 (21:42 +0000)]
Merge "Fix sim status screen" into nyc-dev
am: e9dffcd

* commit 'e9dffcd34df3b1919f3843e0c0013fb793699e3f':
  Fix sim status screen

Change-Id: I56392c9e5319778d31942550497929618ad3338c

8 years agoMerge "Fix storage title clearing in multi-window" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 21:42:15 +0000 (21:42 +0000)]
Merge "Fix storage title clearing in multi-window" into nyc-dev
am: 0bea8a9

* commit '0bea8a9f48eabefbd41484ffa19ec21637150a2c':
  Fix storage title clearing in multi-window

Change-Id: Ief2ca68ee3b7563e77091db09eb455c387158b41

8 years agoMerge "Fix bug where fingerprint for wrong userId was attempted to be removed." into...
Jim Miller [Wed, 20 Apr 2016 21:33:13 +0000 (21:33 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev

8 years agoFix bug where fingerprint for wrong userId was attempted to be removed.
Jim Miller [Wed, 20 Apr 2016 21:06:00 +0000 (14:06 -0700)]
Fix bug where fingerprint for wrong userId was attempted to be removed.

- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.

Fixes bug 28268635

Change-Id: Ic8abfbf6fbf173db2d57a76ac2e38b2a71ffd19e

8 years agoMerge "Fixes a string for tablets/devices" into nyc-dev
Udam Saini [Wed, 20 Apr 2016 20:54:41 +0000 (20:54 +0000)]
Merge "Fixes a string for tablets/devices" into nyc-dev

8 years agoMerge "Remove some of the unused assets" into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 20:42:55 +0000 (20:42 +0000)]
Merge "Remove some of the unused assets" into nyc-dev

8 years agoMerge "Add minimum date" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 20:36:36 +0000 (20:36 +0000)]
Merge "Add minimum date" into nyc-dev

8 years agoDon't save a rule without a name.
Julia Reynolds [Wed, 20 Apr 2016 20:08:30 +0000 (16:08 -0400)]
Don't save a rule without a name.

Bug: 28282339
Change-Id: Ie0a66f980c920354d172be4f0b91584338efce69

8 years agoMerge "Add settings for altering VR display behavior." into nyc-dev
Ruben Brunk [Wed, 20 Apr 2016 19:51:49 +0000 (19:51 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev

8 years agoAdd settings for altering VR display behavior.
Ruben Brunk [Tue, 19 Apr 2016 01:08:34 +0000 (18:08 -0700)]
Add settings for altering VR display behavior.

Bug=28208992

Change-Id: I73e3154e7766f7379af558c66316c213fdd494d8

8 years agoAdd minimum date
Jason Monk [Wed, 20 Apr 2016 19:44:21 +0000 (15:44 -0400)]
Add minimum date

Change-Id: I928c99b7b2eb3dc35b2e25034dfe32a784355239
Fixes: 26346842

8 years agoRemove some of the unused assets
Jason Monk [Wed, 20 Apr 2016 19:10:08 +0000 (15:10 -0400)]
Remove some of the unused assets

Probably didn't get them all, but this is good enough for now.

Change-Id: I86637d7ae1e31ba9cd625589fa1e4ded32cca4b3
Fixes: 27816752

8 years agoFixes a string for tablets/devices
Udam Saini [Wed, 20 Apr 2016 18:27:02 +0000 (11:27 -0700)]
Fixes a string for tablets/devices

Had accidentally always set this to phone.

bug:28293197
Change-Id: I926e4c9681f2e7e660bdc2664256c8a7ea6e7951

8 years agoMerge "Fix summaries of some restricted switch preferences." into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 18:04:12 +0000 (18:04 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev

8 years agoMerge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 17:50:32 +0000 (17:50 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev

8 years agoMerge "Daydream -> Screen saver" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:49:02 +0000 (17:49 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev

8 years agoMerge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 17:44:54 +0000 (17:44 +0000)]
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev

8 years agoDaydream -> Screen saver
Jason Monk [Wed, 20 Apr 2016 17:39:18 +0000 (13:39 -0400)]
Daydream -> Screen saver

Change-Id: I7e283456f66750d61c920d92b53b107423b96e30
Fixes: 28268243

8 years agoMerge "Fix sim status screen" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:24:24 +0000 (17:24 +0000)]
Merge "Fix sim status screen" into nyc-dev

8 years agoFix sim status screen
Jason Monk [Wed, 20 Apr 2016 17:22:36 +0000 (13:22 -0400)]
Fix sim status screen

Change-Id: Id7a98b642b006beb8dc6999176184b5d90f6b22f
Fixes: 27963774

8 years agoMerge "Fix storage title clearing in multi-window" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:08:28 +0000 (17:08 +0000)]
Merge "Fix storage title clearing in multi-window" into nyc-dev

8 years agoFix storage title clearing in multi-window
Jason Monk [Wed, 20 Apr 2016 17:05:45 +0000 (13:05 -0400)]
Fix storage title clearing in multi-window

By accurately tracking detached state.

Change-Id: If9d60000f7737c834afde680d15a2af21f7e3165
Fixes: 27989238

8 years agoListen to INetworkPolicyManager events and update UI accordingly.
Felipe Leme [Tue, 19 Apr 2016 17:00:20 +0000 (10:00 -0700)]
Listen to INetworkPolicyManager events and update UI accordingly.

BUG: 27481520

Change-Id: I09c4c586188d754ddd3ac3dcb3903217842ea0a5

8 years agoMerge "Potential fix for receiver leak problem" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 13:59:42 +0000 (13:59 +0000)]
Merge "Potential fix for receiver leak problem" into nyc-dev
am: 623a289

* commit '623a289b9a6563afd4c54e1efdb505a5468731ea':
  Potential fix for receiver leak problem

Change-Id: I7cffbfd8a425af397dab9fa4900aab613520c4b5

8 years agoMerge "Potential fix for receiver leak problem" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 13:49:32 +0000 (13:49 +0000)]
Merge "Potential fix for receiver leak problem" into nyc-dev

8 years agoMerge "Fix Developer options appears after first boot, disappers on Settings Menu...
Clara Bayarri [Wed, 20 Apr 2016 13:30:46 +0000 (13:30 +0000)]
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
am: 81c03dc

* commit '81c03dc32f723f1489c48640eb27fb40c0b47f0c':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: I75dcdc1f242a99abdbeb96460dcbda5787f22b63

8 years agoMerge "Fix Developer options appears after first boot, disappers on Settings Menu...
Clara Bayarri [Wed, 20 Apr 2016 13:24:43 +0000 (13:24 +0000)]
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev

8 years agoFix Developer options appears after first boot, disappers on Settings Menu Reload
Clara Bayarri [Wed, 20 Apr 2016 10:29:04 +0000 (11:29 +0100)]
Fix Developer options appears after first boot, disappers on Settings Menu Reload

The Tiles are updated to disabled via PackageManager, which takes a few
seconds to kick in and hence the user sees the option appear and then
disappear. Making Developer Options disabled by default fixes the flash.

Note now the opposite happens, on eng builds where Developer Settings
are on by default they will not appear until the PackageManager update
has cleared.

Bug: 28121698
Change-Id: Ic7147e4430e2332d596ce37dbbce30e330dcf551

8 years agoApply policy transparency to "Stay awake" in Development settings.
Sudheer Shanka [Wed, 20 Apr 2016 05:48:26 +0000 (22:48 -0700)]
Apply policy transparency to "Stay awake" in Development settings.

Bug: 28271254
Change-Id: I203ce5c839e5f0201d287673ec3a48c8f835edc3

8 years agoFix summaries of some restricted switch preferences.
Sudheer Shanka [Wed, 20 Apr 2016 04:46:31 +0000 (21:46 -0700)]
Fix summaries of some restricted switch preferences.

Bug: 27659072
Change-Id: I2cfb270ba77b0cfe3c81097b59779f70062b9b65

8 years agoMerge "Add nullcheck to StorageSettings." into nyc-dev
Daichi Hirono [Wed, 20 Apr 2016 00:12:03 +0000 (00:12 +0000)]
Merge "Add nullcheck to StorageSettings." into nyc-dev
am: 0e048a11c7

* commit '0e048a11c7a9567cf77fbef481a564833359369f':
  Add nullcheck to StorageSettings.

Change-Id: I58982903534d2dce24bd453bc72617a607373684

8 years agoMerge "Add nullcheck to StorageSettings." into nyc-dev
Daichi Hirono [Wed, 20 Apr 2016 00:04:11 +0000 (00:04 +0000)]
Merge "Add nullcheck to StorageSettings." into nyc-dev

8 years agoresolve merge conflicts of 5213f71 to nyc-dev-plus-aosp
Amit Mahajan [Tue, 19 Apr 2016 23:15:56 +0000 (16:15 -0700)]
resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp

Change-Id: I6cf4ec06ee296fa13b51e36379a9bc77edaac1bc

8 years agoMerge "Fix APN cannot save after ApnEditor is paused."
yifan.bai [Tue, 19 Apr 2016 23:06:49 +0000 (23:06 +0000)]
Merge "Fix APN cannot save after ApnEditor is paused."
am: 052768a8b5

* commit '052768a8b57cc5dc8ec8ea7bebccbc3f0b1e9c09':
  Fix APN cannot save after ApnEditor is paused.

Change-Id: I2f7ac81f9955ca02ab8b37084bed68934a11f9e9

8 years agoMerge "Fix APN cannot save after ApnEditor is paused."
Amit Mahajan [Tue, 19 Apr 2016 22:58:18 +0000 (22:58 +0000)]
Merge "Fix APN cannot save after ApnEditor is paused."

8 years agoMerge "Fix back button on fragments without help uris" into nyc-dev
Johan Redestig [Tue, 19 Apr 2016 20:51:10 +0000 (20:51 +0000)]
Merge "Fix back button on fragments without help uris" into nyc-dev
am: ed74511

* commit 'ed74511cb170f499e3c776208471b9ff3fbc762b':
  Fix back button on fragments without help uris

Change-Id: Iea98f27e3784bb34fd4a272f2c450a5704e6555d

8 years agoMerge "Fix back button on fragments without help uris" into nyc-dev
Udam Saini [Tue, 19 Apr 2016 20:39:29 +0000 (20:39 +0000)]
Merge "Fix back button on fragments without help uris" into nyc-dev

8 years agoMerge "Fixed AccessPreference listener." into nyc-dev
Felipe Leme [Tue, 19 Apr 2016 18:59:26 +0000 (18:59 +0000)]
Merge "Fixed AccessPreference listener." into nyc-dev
am: 40c228d

* commit '40c228d989c19eb69f5efe258cf7d24cf86e93ba':
  Fixed AccessPreference listener.

Change-Id: I7f47a8a2ce57e3cb17aef915b9430c1be5b0da15

8 years agoMerge "Fixed AccessPreference listener." into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 18:41:06 +0000 (18:41 +0000)]
Merge "Fixed AccessPreference listener." into nyc-dev

8 years agoMerge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev
Victor Chang [Tue, 19 Apr 2016 18:39:19 +0000 (18:39 +0000)]
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev
am: 04a01b7

* commit '04a01b7cc79e14e062f8b50d84f3ee3b8251233e':
  Remove reference to @string/ssl_ca_cert_dialog_title

Change-Id: I4d4677536be0f30e0c46cd191fa6f9eea518960b

8 years agoMerge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev
Victor Chang [Tue, 19 Apr 2016 18:29:15 +0000 (18:29 +0000)]
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev

8 years agoMerge "Fix account screen in split screen" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 18:22:29 +0000 (18:22 +0000)]
Merge "Fix account screen in split screen" into nyc-dev
am: 43059b7

* commit '43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
  Fix account screen in split screen

Change-Id: Ic0bf62fedbeca0800fd807ee7c5839fa564fbd42

8 years agoMerge "Fix account screen in split screen" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 18:09:27 +0000 (18:09 +0000)]
Merge "Fix account screen in split screen" into nyc-dev

8 years agoMerge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545...
Noah Wang [Tue, 19 Apr 2016 18:07:20 +0000 (18:07 +0000)]
Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev
am: 4f63bb6

* commit '4f63bb69f5f63a19e0fdf03b1c240bd6d12d0ce1':
  Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996

Change-Id: Ie9845c3f043d9fcb0733fe7204696b5792d8e9d9

8 years agoFix account screen in split screen
Jason Monk [Tue, 19 Apr 2016 18:05:19 +0000 (14:05 -0400)]
Fix account screen in split screen

Don't remove all prefs in on pause, because why would you...

Change-Id: I9139dabf917b05860e738dc0b2aa19df8f983a7e
Fixes: 27987782

8 years agoMerge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545...
Noah Wang [Tue, 19 Apr 2016 17:56:49 +0000 (17:56 +0000)]
Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev

8 years agoFix back button on fragments without help uris
Johan Redestig [Tue, 19 Apr 2016 06:29:30 +0000 (08:29 +0200)]
Fix back button on fragments without help uris

This is a follow up to 0708d9e119. The setHasOptionsMenu has
to be set for the back button to work and this needs to happen
regardles if the fragment has an help uri or not.

Bug: 28237921
Change-Id: Icec7a94312bdab5470efa0893a339d753c995eb1

8 years agoFixed AccessPreference listener.
Felipe Leme [Tue, 19 Apr 2016 17:05:08 +0000 (10:05 -0700)]
Fixed AccessPreference listener.

When an app is blacklisted, its switch toggle is disabled, but previous
the onClick() method was still being called, which would launch the data
usage screen but also call setIsWhitelist().

BUG: 27481520
Change-Id: Id8df3d65eee286d1aecb4ae2a0417d6932d91441

8 years agoRemove reference to @string/ssl_ca_cert_dialog_title
Victor Chang [Tue, 19 Apr 2016 16:45:07 +0000 (17:45 +0100)]
Remove reference to @string/ssl_ca_cert_dialog_title

Bug: 28263186
Change-Id: I2e1c7d30d1fff49b2103acec90769edf4b61911b

8 years agoMerge "Guard against app info crash" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 13:45:31 +0000 (13:45 +0000)]
Merge "Guard against app info crash" into nyc-dev
am: c3ab03e

* commit 'c3ab03ecdb505114770cbb87b61457fabf75847f':
  Guard against app info crash

Change-Id: Id1cea6852ef79ddaafb79764c8c4c18cf077d0c5

8 years agoMerge "Guard against app info crash" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 13:38:38 +0000 (13:38 +0000)]
Merge "Guard against app info crash" into nyc-dev

8 years agoMerge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev
Zoltan Szatmary-Ban [Tue, 19 Apr 2016 13:32:20 +0000 (13:32 +0000)]
Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev
am: 295f106

* commit '295f1060e990299fec7e2aa375064f9f09246e8d':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: Ia7518fe9369e9f045ca120d1cb91ca81db0a5836

8 years agoMerge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev
Zoltan Szatmary-Ban [Tue, 19 Apr 2016 13:25:22 +0000 (13:25 +0000)]
Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev

8 years agoMerge "Input Settings: Change the \'add\' icon." into nyc-dev
Abodunrinwa Toki [Tue, 19 Apr 2016 11:03:17 +0000 (11:03 +0000)]
Merge "Input Settings: Change the \'add\' icon." into nyc-dev
am: 8aa7cf1

* commit '8aa7cf16310366b48489f3d3a7a4acd0fa47b8a1':
  Input Settings: Change the 'add' icon.

Change-Id: Ic7d0870e1862a2ff378832b1600075d3aec6f059

8 years agoMerge "Input Settings: Change the 'add' icon." into nyc-dev
Abodunrinwa Toki [Tue, 19 Apr 2016 10:56:34 +0000 (10:56 +0000)]
Merge "Input Settings: Change the 'add' icon." into nyc-dev

8 years agoAdd nullcheck to StorageSettings.
Daichi Hirono [Tue, 19 Apr 2016 10:39:42 +0000 (19:39 +0900)]
Add nullcheck to StorageSettings.

Change-Id: I6e3e00557c2086a265d399ea7d060d07befebdf7
Fixes: 28255655

8 years agoMerge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev
Keisuke Kuroyanagi [Tue, 19 Apr 2016 04:22:08 +0000 (04:22 +0000)]
Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev
am: 23f7dab

* commit '23f7dab2b6ec7c763dc873314da38bd918f4161e':
  Fix: SpellChecker subtype label cannot be updated.

Change-Id: I75798e2d7211c8161bda142223d4f1be0d2e005c

8 years agoMerge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev
Keisuke Kuroyanagi [Tue, 19 Apr 2016 04:17:02 +0000 (04:17 +0000)]
Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev

8 years agoHandle blacklisted apps on Data Saver whitelist.
Felipe Leme [Mon, 18 Apr 2016 22:38:41 +0000 (22:38 +0000)]
Handle blacklisted apps on Data Saver whitelist.
am: c2ef27f

* commit 'c2ef27faf4afca6c4f6634b5de975a1bdadf0752':
  Handle blacklisted apps on Data Saver whitelist.

Change-Id: Ia221750b24003af71c6dd106b1247d7178573cf4

8 years agoHandle blacklisted apps on Data Saver whitelist.
Felipe Leme [Fri, 15 Apr 2016 00:53:07 +0000 (17:53 -0700)]
Handle blacklisted apps on Data Saver whitelist.

When user blacklists an app for background data access, the
"Unrestricted data access" list should not display the whitelist toggle
option, but rather explain background access is turned off and offer the
option to open the app's data usage screen to turn it back on.

It still does not handle changed received by DataSaverBackend, so the UI
will be stale when the user removes a blacklist and navigates back to
the list.

BUG: 27481520

Change-Id: I9d0fa9f0180a69ce9bd1417921bf89ec3ba31f01

8 years agoFix preview screen crashing and glitches for
Noah Wang [Fri, 15 Apr 2016 20:49:12 +0000 (13:49 -0700)]
Fix preview screen crashing and glitches for
Display / Font size
Bug: 28223545
Bug: 28223533
Bug: 28210654
Bug: 28210242
Bug: 28208955
Bug: 27699996

Change-Id: I80339dabbd089db8a6c6a80645baabb9b4cad00e

8 years agoGuard against app info crash
Jason Monk [Mon, 18 Apr 2016 19:47:01 +0000 (15:47 -0400)]
Guard against app info crash

Change-Id: Ifb52ec61718723202e5ec7da5f9723a4764968ba
Fixes: 28171829

8 years agoPotential fix for receiver leak problem
Jason Monk [Mon, 18 Apr 2016 19:27:43 +0000 (15:27 -0400)]
Potential fix for receiver leak problem

The background thread is not stopping listening fast enough and is
resulting in first a receiver leak message followed by a crash when
trying to finally unregister the receiver.

Fix this by adding a registerReceiver to SummaryLoader that will
automatically unregister the receiver on the main thread to ensure
it happens in time.

Change-Id: I0104e929d5505eb53993f6765e4c90120df35cf6
Fixes: 28211606

8 years agoMerge "Use IME service logo or icon if exists." into nyc-dev
Yohei Yukawa [Mon, 18 Apr 2016 19:19:02 +0000 (19:19 +0000)]
Merge "Use IME service logo or icon if exists." into nyc-dev
am: bd06816

* commit 'bd068163e36ed470a34655025cd01324540ab6e2':
  Use IME service logo or icon if exists.

Change-Id: Idf451086fba5e3cf8d31fe5904564340c482711a

8 years agoMerge "Use IME service logo or icon if exists." into nyc-dev
Yohei Yukawa [Mon, 18 Apr 2016 19:01:27 +0000 (19:01 +0000)]
Merge "Use IME service logo or icon if exists." into nyc-dev