Commit Graph

912 Commits

Author SHA1 Message Date
Matthew Fritze
626a21b0bf Add Robolectric makefile and modify Settings Manifest for testing.
Bug: 30918570
Change-Id: I4ae998676757b4985833fac5ba05d7685e29a8a8
2016-08-17 23:28:38 +00:00
Svetoslav Ganov
871078e91b Add WiFi toggle prompts - settings
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I10d1231ea0c47eec5993dbe367cc0c245cba9385
2016-08-09 01:55:26 +00:00
Maurice Lam
43366f12d9 Add label to redaction interstitial activity
Bug: 30262038
Change-Id: Ic5f4f8b003acbe4f8735ec8da112f069b9d48e5a
2016-08-05 16:57:59 -07:00
Jeff Sharkey
fa35b19603 Offer trampoline to help articles. am: 4f425c890b
am: aaaf41d982

Change-Id: Ib10ccc2348f1fa9d5687941c38ca7f28fcb0465e
2016-07-26 22:16:03 +00:00
Jeff Sharkey
aaaf41d982 Offer trampoline to help articles.
am: 4f425c890b

Change-Id: I142124d64548bbd5c4dda19fab59e9a337c90226
2016-07-26 22:10:44 +00:00
Jeff Sharkey
4f425c890b Offer trampoline to help articles.
This allows other parts of the system internals to re-use common
logic for building help links, and it allows all help links to live
in a single common overlay.

Adds a help link slot for "Android is upgrading" notification.

Bug: 30033319, 30122837
Change-Id: I7dec3e63cfb8c7a8ee9a562cc61cb70f3f99fdae
2016-07-25 16:45:15 -06:00
Svetoslav Ganov
b06766f129 Add Bluetooth toggle prompts - settings
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
2016-07-22 20:08:44 -07:00
Justin Klaassen
478dec45ce Add NightDisplaySettingsActivity
am: eae3d9f932

Change-Id: Ia7cbd7dd7d65d5d04beba607a1ada82aed81d31a
2016-07-22 22:07:06 +00:00
Justin Klaassen
eae3d9f932 Add NightDisplaySettingsActivity
- The Settings#ACTION_NIGHT_DISPLAY_SETTINGS action can be used by apps
  to launch Night display settings directly.

Bug: 30291948
Change-Id: I5545bb7f0a467116454e5c44e207cbe91ddf9d43
2016-07-22 19:40:17 +00:00
Michael Wright
87fca0df00 Merge \"Color transforms are now color modes.\" into nyc-mr1-dev
am: 111e1dc6b3

Change-Id: I6536baf47e102331fa87112d4f0b9d15ec432d2a
2016-07-20 18:49:59 +00:00
TreeHugger Robot
111e1dc6b3 Merge "Color transforms are now color modes." into nyc-mr1-dev 2016-07-20 17:21:36 +00:00
Andrew Sapperstein
25e2e0338f Merge \"Fix a bunch of straggler themes.\" into nyc-mr1-dev
am: 85902750a5

Change-Id: I975563cc36cd9d4011db01c227ef5f32d80e7fd7
2016-07-19 21:52:38 +00:00
Andrew Sapperstein
85902750a5 Merge "Fix a bunch of straggler themes." into nyc-mr1-dev 2016-07-19 21:42:27 +00:00
Maurice Lam
0680b8c471 Merge \"Lock the orientation for FallbackHome\" into nyc-mr1-dev
am: 78626fadb4

Change-Id: Ic15676a02afb4c4acf1eacc3975415108ef2b99c
2016-07-19 01:47:34 +00:00
Andrew Sapperstein
7e15743275 Fix a bunch of straggler themes.
They were all stock material themes and are now all using
their DeviceDefault equivalents.

Change-Id: I0013847499c592c801101638168edd7ebf0d721a
Fixes: 30140567
2016-07-18 10:03:52 -07:00
Maurice Lam
6e79c0235f Lock the orientation for FallbackHome
Set FallbackHome's orientation to nosensor in the manifest, so it
will always be shown in the natural device orientation.

Bug: 30040032
Change-Id: I875fa6d112db23273026dbc39b5d32748d7e99f1
2016-07-16 01:21:39 +00:00
Michael Wright
aacf55ab3f Color transforms are now color modes.
We've also standardized on a specific, enumerated set of modes, which
simplifies the code a bit.

Bug: 29044347
Change-Id: I621352954d42ad25f9969b7a88d53defe84dd3b4
2016-07-13 22:12:33 -07:00
Daniel Nishi
a2f07b0475 Merge \"Update summary and title strings for Settings Suggestions\" into nyc-mr1-dev
am: 5d8b432137

Change-Id: I0852939447039fdaefa14a151bba0f60aa4b6f43
2016-07-13 21:12:53 +00:00
TreeHugger Robot
a4e3c14848 Update summary and title strings for Settings Suggestions
Setting Suggestion messages have new strings for NDR.

Change-Id: I5e76e669fac91b61a2207bb2937c107c952768c0
Fixes: 30067406
2016-07-12 18:39:19 -07:00
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