Sunny Goyal
4dae8c2769
Merge \"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\" into nyc-mr1-dev
...
am: fef6234ebc
Change-Id: I602f81cfeea807b3c63799eb7b9985e0053ed583
2016-06-14 17:00:56 +00:00
Sunny Goyal
fef6234ebc
Merge "Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config." into nyc-mr1-dev
2016-06-14 16:51:09 +00:00
Sunny Goyal
0bf6f94c58
Changing the WallpaperSuggestionActivity to redirect to the actual
...
wallpaper picker component defined in the config.
Bug: 28554244
Change-Id: Iebd38b8fee13608e060acb2b52332014c5c3d87e
2016-06-14 09:44:10 -07:00
Doris Ling
71e6b9a4d9
Merge \"Added new setting for gestures.\" into nyc-mr1-dev
...
am: 8b8a012913
Change-Id: I3bec17fcf1130c4948abeef256a169105d7ad464
2016-06-13 22:29:14 +00:00
Doris Ling
9136523a43
Added new setting for gestures.
...
Added a new entry to the top level Settings' Device section to
enable/disable gestures.
Bug: 28565958
Change-Id: Icf642b6a3058c692fb2be9914579996598f03b7d
2016-06-13 13:13:21 -07:00
Jason Monk
aaaa236cec
resolve merge conflicts of 7f7092c to nyc-mr1-dev
...
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
2016-06-08 16:19:35 -04:00
Jason Monk
84f544a2ae
resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp
...
Change-Id: Ida721b92e461811fdca7bc556de0f56cb348fcbc
2016-06-08 15:28:48 -04:00
Jason Monk
743ceecbe8
Merge \\"Fix disabling of tiles that are not relevant\\" into nyc-dev am: 9c5d3164f5
...
am: 4db5484a9d
Change-Id: I1fc083fbb9057a610acc52f5453fd9a3e7c2607f
2016-06-08 19:26:17 +00:00
Jason Monk
167f6cc87c
Merge \"Remove PreferenceActivity\" into nyc-dev
...
am: 7f7092c705
Change-Id: I1d7431bd7bf4654f2fbfe8c43344e22d28b5b2f7
2016-06-08 19:15:42 +00:00
Jason Monk
4db5484a9d
Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
...
am: 9c5d3164f5
Change-Id: I778f8f766ace689b1bd4174000daaafb13253516
2016-06-08 19:15:41 +00:00
Jason Monk
7f7092c705
Merge "Remove PreferenceActivity" into nyc-dev
2016-06-08 19:13:05 +00:00
Jason Monk
b7e4380cd2
Remove PreferenceActivity
...
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.
Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941
2016-06-08 09:48:58 -04:00
Jason Monk
5862c1ef02
Fix disabling of tiles that are not relevant
...
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209
2016-06-07 14:02:33 -04:00
Andrew Sapperstein
66fb65b867
Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev
...
am: 6c52398695
* commit '6c52398695164aeba6c3ad8ebc8047ffe98805df':
Add safety & regulatory info to "about device".
Change-Id: I7feb228f842a1697c2e3c56bfb6c1dcb0694c9b5
2016-06-03 23:29:53 +00:00
Andrew Sapperstein
1fad9af3c7
Add safety & regulatory info to "about device".
...
Renamed "Regulatory information" to "Regulatory labels"
and added a new option called "Safety & regulatory information".
The new option only shows if an activity exists that can
accept android.settings.SHOW_SAFETY_AND_REGULATORY_INFO intents.
BUG: 27876015
Change-Id: Iaf9588658eb7919b330ac8b3d673b8e81a4f76dc
2016-06-02 14:12:19 -07:00
Jason Monk
7dc8293963
Merge "Fix some top-level settings not updating with language" into nyc-dev am: ed70356506
...
am: 4f63855b5a
* commit '4f63855b5a8274622b6390467fdaf73d491bb2e7':
Fix some top-level settings not updating with language
Change-Id: I37449c716a0944f91818ee68fae663fce8d4dabe
2016-06-01 17:42:36 +00:00
Jason Monk
7e1b47347a
Merge "Fix some top-level settings not updating with language" into nyc-dev
...
am: ed70356506
* commit 'ed703565063107350970959d82ac63eb76b51d26':
Fix some top-level settings not updating with language
Change-Id: I4f2f0295a73e115fdcc8eb76cc40854cc98e493c
2016-06-01 17:39:13 +00:00
Jason Monk
4f63855b5a
Merge "Fix some top-level settings not updating with language" into nyc-dev
...
am: ed70356506
* commit 'ed703565063107350970959d82ac63eb76b51d26':
Fix some top-level settings not updating with language
Change-Id: I8f1e9c469f5e732d9f04a9b0060a30c5ffb55218
2016-06-01 17:37:13 +00:00
Jason Monk
a4bc49e55e
Fix some top-level settings not updating with language
...
They need to be resources so they can load correctly on locale
change.
Change-Id: Iea167b8df411528185987d37704717d9c0b9f254
Fixes: 28861758
2016-05-31 14:49:03 -04:00
Daniel Nishi
f878423e3d
Merge "Add an automatic storage management job service." into nyc-mr1-dev
...
am: d7efefa503
* commit 'd7efefa503ae408072e45dc6520a4236b8ef40cb':
Add an automatic storage management job service.
Change-Id: Idd479e72efbe2d62225493c0dfdb7d55ee4f8b20
2016-05-31 18:31:32 +00:00
Daniel Nishi
d7efefa503
Merge "Add an automatic storage management job service." into nyc-mr1-dev
2016-05-31 18:25:18 +00:00
Daniel Nishi
80c204420b
Add an automatic storage management job service.
...
This service runs once a day when plugged in when the device has
under 15% free space remaining. If the FeatureFactory has a
storage management job, it runs the job to begin to free up space
on the device.
This is a temporary landing place and will be refactored very
quickly out of Settings.
Bug: 28600825
Change-Id: Id2ebb42a333b3b4e3daef4e50cf985fe055b85c7
2016-05-31 16:50:48 +00:00
Maurice Lam
6b24f367f8
Merge "Add activity label to encryption interstitial" into nyc-dev
...
am: 19c0046422
* commit '19c0046422e0cf5586e37323157a27331db45572':
Add activity label to encryption interstitial
Change-Id: I9bcda822435a42c9bf7d5486b7497fb6a8f30cf4
2016-05-27 04:05:45 +00:00
Maurice Lam
934bb00ac3
Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422
...
am: 2ddf85b94b
* commit '2ddf85b94b696730189dfda4e680d25a47874eb8':
Add activity label to encryption interstitial
Change-Id: I3922ed6182b5b3b34e0a031af872c5e1a7069143
2016-05-27 00:30:00 +00:00
Maurice Lam
2ddf85b94b
Merge "Add activity label to encryption interstitial" into nyc-dev
...
am: 19c0046422
* commit '19c0046422e0cf5586e37323157a27331db45572':
Add activity label to encryption interstitial
Change-Id: I6aef221cd49b0bab4ae7da332f388865effb4e20
2016-05-26 23:58:26 +00:00
Sunny Goyal
a635c735ea
Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev
...
am: 60a4dc652d
* commit '60a4dc652db643d23417fb2f037369b15177b7e2':
Add an option allowing to skip wallpaper apps selection.
Change-Id: I79a0ab340470a4a9e0489ddb86d217f7495284c1
2016-05-25 23:18:33 +00:00
Sunny Goyal
21ef89fd6b
Add an option allowing to skip wallpaper apps selection.
...
This commit adds an option to the Settings application, making it
possible to launch a different activity for wallpaper selection
Also removing te intent constant android.settings.WALLPAPER_SETTINGS
The target for this action can't be easily overriden when the
wallpaper target is overriden, which would provide an inconsistant
experience.
Bug: 28554244
Bug: 26688904
Change-Id: I25367fbb4505615351fbad9e1aa1ca88df0cd034
2016-05-25 12:46:43 -07:00
Maurice Lam
46a194bf3b
Add activity label to encryption interstitial
...
So that TalkBack refers to the screen by this more specific name.
Bug: 28868846
Change-Id: I93139959dcdbd156d57f01699283e01b178305b8
2016-05-24 20:03:08 -07:00
Daniel Nishi
e592a41727
Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev
...
am: 03f26d3997
* commit '03f26d39972d4d063096ccbc00ebec53365ce455':
Add an Activity to handle Intents to invoke the Deletion Helper.
Change-Id: I7322ce796fe4910d9904e37d0bf142bbc90b5f47
2016-05-14 01:23:28 +00:00
Daniel Nishi
287d91181f
Add an Activity to handle Intents to invoke the Deletion Helper.
...
This will allow apps to launch the deletion helper when they need to
have space freed up.
To launch the activity using an intent, you can set it as follows:
Intent intent = new Intent(Settings.ACTION_DELETION_HELPER_SETTINGS);
startActivity(intent);
This intent should bring up the Deletion Helper.
Bug: 28675265
Change-Id: I781615ccad4ca1fcae97817ecb823e5dcad67b5b
2016-05-13 17:03:30 -07:00
Gustav Sennton
c75f6c127d
Merge "Disable WebViewSetting for non-admin users." into nyc-dev am: f76993a9da
...
am: 04af74dae0
* commit '04af74dae09735e8852214772f48bcd5445c3211':
Disable WebViewSetting for non-admin users.
Change-Id: Icd15a907afa9c1afdf38e6f5640b6fb584fb82d3
2016-05-12 13:31:39 +00:00
Gustav Sennton
04af74dae0
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
...
am: f76993a9da
* commit 'f76993a9da046ac762ef6cd39b7eb0baa81e8871':
Disable WebViewSetting for non-admin users.
Change-Id: Icc42bdd0c0737be358301a6697db05df079a3941
2016-05-12 13:29:11 +00:00
Gustav Sennton
6e9836845f
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
...
am: f76993a9da
* commit 'f76993a9da046ac762ef6cd39b7eb0baa81e8871':
Disable WebViewSetting for non-admin users.
Change-Id: I08f5f7888ee22844aed287d27458149875b0320f
2016-05-12 13:29:11 +00:00
Gustav Sennton
66313bb11d
Disable WebViewSetting for non-admin users.
...
For an app to be able to know whether the WebViewSetting is enabled for
a user we disable the setting at boot for non-admin users. In this way
an app can call intent.resolveActivity[Info] for the WebViewSetting
intent to check whether the WebViewSetting is enabled before linking to
it.
Bug: 28034166
Change-Id: I33b3fa10a38f2a2600cddd0891ef746126abdd61
2016-05-12 11:13:26 +01:00
Jason Monk
637729e246
Merge "Expose dialog for current webview setting." into nyc-dev am: f9e62e8d34
...
am: b98fd15589
* commit 'b98fd15589ef0d95108104b0b5dea66e3dca4578':
Expose dialog for current webview setting.
Change-Id: If4c1e7f93bdae4c0ed284dff2365cd614c671fcd
2016-05-11 15:35:00 +00:00
Jason Monk
8b4fad811a
Merge "Expose dialog for current webview setting." into nyc-dev
...
am: f9e62e8d34
* commit 'f9e62e8d3497ea4b738bf6c9a0c72a023eb5b217':
Expose dialog for current webview setting.
Change-Id: I6c80311b6c8b3e552d6a479d20e0e5d4748e67a6
2016-05-11 15:33:31 +00:00
Jason Monk
b98fd15589
Merge "Expose dialog for current webview setting." into nyc-dev
...
am: f9e62e8d34
* commit 'f9e62e8d3497ea4b738bf6c9a0c72a023eb5b217':
Expose dialog for current webview setting.
Change-Id: Icc624a2ad85a3e119fa5a9893fa89d02e3773b51
2016-05-11 15:32:47 +00:00
Jason Monk
7519954286
Expose dialog for current webview setting.
...
Change-Id: I91c796b2c75c0ac8047ba0c2555a1036e8c6c616
Fixes: 28554048
2016-05-11 11:20:55 -04:00
Jason Monk
5aa4861f2b
Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd
...
am: c6d5902
* commit 'c6d59023709b7e86db3b07b5e8b99c34b25f3c29':
Default payment settings to disabled
Change-Id: I075e3be940e4cfec1582c1d4a928a269327f2431
2016-04-28 13:02:51 +00:00
Jason Monk
c6d5902370
Merge "Default payment settings to disabled" into nyc-dev
...
am: 6b421dd
* commit '6b421dd4f6250bceba673d6f86dcb48026517b01':
Default payment settings to disabled
Change-Id: Id7db30f04e32d212fa1edc719ad0363e468bec67
2016-04-28 12:59:34 +00: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
TreeHugger Robot
dbaaa26bf3
Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev am: a21ac18
...
am: e9f4fe7
* commit 'e9f4fe7c4db589a022a886fe1c24c5098e9071e1':
Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.
Change-Id: I749e4b3c113dcc706112da6fee07decb443a5c6a
2016-04-27 21:38:13 +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
Felipe Leme
040b2ed9b2
Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev
...
am: a21ac18
* commit 'a21ac18b05c95b413dfc8b279e9c3841b412b24c':
Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.
Change-Id: I5a8bce52f789a274ca1fc7cff1fb130072f9e0c4
2016-04-27 21:31:51 +00:00
TreeHugger Robot
a21ac18b05
Merge "Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS." into nyc-dev
2016-04-27 21:15:59 +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
Felipe Leme
616ff3e6a4
Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS.
...
BUG: 26820898
Change-Id: I83613ce54e13470dafd6420eec0af252e5e39429
2016-04-27 12:33:57 -07: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
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