Commit Graph

893 Commits

Author SHA1 Message Date
Doris Ling
1de7559bdc Merge \"Disable Gestures Settings by default.\" into nyc-mr1-dev
am: 709aa539c8

Change-Id: I164c244613a9d58b7e2f5ec37d144385d577ccdd
2016-07-11 22:28:52 +00:00
Doris Ling
5edb27501e Disable Gestures Settings by default.
Add a config boolean to determine if the gesture settings is enabled or
not.

Bug: 30022840
Change-Id: Ie7ae8bedbfc128b64999d33a3d626d4e311e5e3e
2016-07-11 12:10:58 -07:00
Doris Ling
4dd0373203 Merge \"Add summary for Settings->Gestures.\" into nyc-mr1-dev
am: f46dabcf0f

Change-Id: I1754736fb69495e5601b2e13038e30df1482b792
2016-07-08 23:03:44 +00:00
Doris Ling
6ae44a03e0 Add summary for Settings->Gestures.
Add summary text for gesture settings.

Bug: 30034888
Change-Id: I15128b6e533b279ca5da98bf4f0e042dd93a0d02
2016-07-08 14:14:35 -07:00
Fan Zhang
4a1d2c793d resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp
Change-Id: Ic9a3884cc8bd08eea22d7d83660419ac84555e83
2016-07-06 13:28:19 -07:00
Fan Zhang
47e2b976a0 Show 'up arrow' in About phone->Status menu.
Bug: 27970152

Status should be a Submenu to have up arrow. Also cleaned up
AndroidManifest for this fragment as it doesn't need to run in a
separate process.

Change-Id: I0610314b3baa3d5f1f70d255b4657c805c534373
2016-07-01 16:51:49 -07:00
Doris Ling
0fbf0fd198 Merge \"Update Backup & reset settings to launch the configured activity.\" into nyc-mr1-dev
am: f230f4f9ad

Change-Id: I24c3976e863e1a9db02dbf1fee07358e52b72269
2016-07-01 20:33:11 +00:00
Doris Ling
26bf003df9 Update Backup & reset settings to launch the configured activity.
Check for configured backup settings activity to be used for
Settings->Backup & reset.

Bug: 28942163
Change-Id: I8b937fde5b400afdb81463c9c278b3e3ad42688b
2016-07-01 11:49:03 -07:00
Andrew Sapperstein
987c5d07ba Merge \"Fix some bluetooth theming issues.\" into nyc-mr1-dev
am: 6e1336bff1

Change-Id: I8d786d231ab86e18103b4df457ab7a1801df9a28
2016-06-30 17:32:29 +00:00
Andrew Sapperstein
294469e09a Fix some bluetooth theming issues.
The ic_lockscreen_ime wasn't being appropriately colored due to
the (now deleted) override of the assets defined in SettingsLib
that were hardcoded teal. By deleting these, the vector drawable
that's tinted with the accent color is used.

Also fixes the pairing dialog to use DeviceDefault themes.

Fixes: 29837825

Change-Id: I66cd57c00f1eec00346d7d10a86cd9be79d6cf5c
2016-06-30 10:01:59 -07:00
Daniel Nishi
4938a9a470 Merge \"Remove the Deletion Helper and Automatic Storage Management jobs.\" into nyc-mr1-dev
am: de17410d37

Change-Id: I8b7cc9e6b3f6579f0ea0ebca827967a39a562697
2016-06-22 23:59:02 +00:00
Daniel Nishi
aad643caf2 Remove the Deletion Helper and Automatic Storage Management jobs.
The automatic storage management settings have been left in place
and updated to use the intent to get into the deletion helper.

Bug: 28965462
Change-Id: I736c8e741b519eceb89075b74d42b38c3aa5d0f4
2016-06-21 10:00:52 -07:00
Sunny Goyal
6f38bd7620 Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev
am: 139fbb78b5

Change-Id: I0dbe76be67dfe27f7e0a28d6a2eeb7da97cec19a
2016-06-21 16:48:12 +00:00
Sunny Goyal
5f179fcef1 Adding custom manifest shortcuts in Settings app
Bug:28298258
Change-Id: Ie7fd86a999fa2abe2522adfb29573b86f36db3a5
2016-06-20 16:44:17 -07:00
Maurice Lam
47e38646ed Merge \"Use GLIF theme for Settings > Security > Screen lock\" into nyc-mr1-dev
am: 223d45ea0e

Change-Id: Idc5b5b2e59f7753e226878a2d3838fd8f61a19cd
2016-06-16 22:10:10 +00:00
Maurice Lam
d189ac52a4 Use GLIF theme for Settings > Security > Screen lock
Bug: 24405946
Change-Id: I1fed96cbc228b6bb367637f83f9cd3bac2761417
2016-06-16 12:13:11 -07:00
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