Fan Zhang
91a1c1cad0
Refresh state after loading conditions from xml.
...
am: a0ebd1a9f0
2016-07-25 23:08:14 +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
Fan Zhang
2dc574e59a
Merge "Revert "About Phone" summary back to Android version." into nyc-mr1-dev
2016-07-25 22:13:27 +00:00
Fan Zhang
58e217b180
Merge "Refresh state after loading conditions from xml." into nyc-mr1-dev
2016-07-25 22:13:17 +00:00
Fan Zhang
fd4f729e1f
Revert "About Phone" summary back to Android version.
...
Change-Id: Icc834b8fb1fd9235092cee720c904c8532b8e3fc
Fixes: 30355258
Bug: 28419411
2016-07-25 14:22:00 -07:00
Doris Ling
0d4b8a3b19
Fix crash when support item is clicked.
...
Check for existing activity to handle the support item intent before
adding it to support tile or trying to launch the activity.
Change-Id: I42a733c2d862b303773aeee1ba3b21b718e59066
Fixes: 29118295
2016-07-25 14:06:42 -07:00
Fan Zhang
a0ebd1a9f0
Refresh state after loading conditions from xml.
...
Fixes: 30330909
When start Settings, conditions is loaded from a xml with potentially
stale state. ConditionLoader needs to refresh states after reading xml
to make sure they are up to date.
Change-Id: Ice1b8bacb0486c5dd230b83670c1494710d1c061
2016-07-25 13:58:39 -07:00
Phil Weaver
8f3c8a56a2
Fix return when virtual keyboard setting changes. am: 3587914cef
...
am: fc3352e585
2016-07-25 20:36:36 +00:00
Phil Weaver
fc3352e585
Fix return when virtual keyboard setting changes.
...
am: 3587914cef
2016-07-25 20:34:41 +00:00
Phil Weaver
0bda6fb550
Merge "Fix return when virtual keyboard setting changes." into nyc-mr1-dev
2016-07-25 20:23:06 +00:00
Jason Monk
3ac2f08f97
Fix multiple bluetooth devices bug am: 6666f9cc37
...
am: 5129b26123
2016-07-25 19:22:51 +00:00
Jason Monk
5129b26123
Fix multiple bluetooth devices bug
...
am: 6666f9cc37
2016-07-25 19:19:19 +00:00
Svetoslav Ganov
0c9f05fe26
Merge "Add Bluetooth toggle prompts - settings"
2016-07-25 18:43:40 +00:00
Jason Monk
6666f9cc37
Fix multiple bluetooth devices bug
...
Was bug in some code trying to handle preference animations better.
Since those animations are all disabled now, just remove everything
again and re-add it.
Change-Id: If1ce07a8f2b4144d95a95cec6ebb1b423644825a
Fixes: 29314480
2016-07-25 10:37:39 -04:00
Robin Lee
e68d957777
Include wifi certificates in settings
...
Deleting wifi certificates isn't supported yet since cascading the
removal back into wifi configs will need some easy way of enumerating
wifi configs first.
Bug: 29208062
Change-Id: I2d9d1ea7e0974701009bfa6ea162b8bc80806639
2016-07-25 15:35:08 +01: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
788dbf7dd2
Add NightDisplaySettingsActivity am: eae3d9f932
...
am: 478dec45ce
2016-07-22 22:15:47 +00:00
Justin Klaassen
478dec45ce
Add NightDisplaySettingsActivity
...
am: eae3d9f932
2016-07-22 22:07:06 +00:00
Justin Klaassen
53e9f35239
Merge "Add NightDisplaySettingsActivity" into nyc-mr1-dev
2016-07-22 21:55:59 +00:00
Daniel Nishi
4a184d4360
Add a dropdown for changing the days of retained downloads.
...
Bug: 30304998
Change-Id: I3113d58313a4badff55f79988abd7612d3bb4da5
2016-07-22 14:02:52 -07:00
Fan Zhang
3f86f04796
Don\\'t allow changing data usage setting if uid is not app. am: 2a84bbcddb
...
am: 2bf9591d92
2016-07-22 20:13:43 +00:00
Fan Zhang
2bf9591d92
Don\'t allow changing data usage setting if uid is not app.
...
am: 2a84bbcddb
2016-07-22 20:11:11 +00:00
Yoshinori Hirano
2ce843b00e
Show summary of "Add user" item
...
The summary of "Add user" item is not displayed.
To show it, useAdminDisabledSummary should be false.
Bug: 30005296
Change-Id: Ia33cab4d671f42bd971acbf5523da1c4d21948e1
2016-07-22 20:09:28 +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
Fan Zhang
2a84bbcddb
Don't allow changing data usage setting if uid is not app.
...
Bug: 30262890
Changing non-app UID's (eg system, firewalld) data usage will just crash.
Change-Id: I1c3f2504aae75f514f962fd54f4dcf240b3bcd81
2016-07-22 10:07:12 -07:00
Doris Ling
4a6f8b967a
Check for null activity before getting dashboard categories. am: b7e650c6f7
...
am: 4ec4b64b9d
2016-07-22 01:47:12 +00:00
Fan Zhang
068ed43d0d
Fix crash when starting Settings -> Display -> Font size am: cafe6972a9
...
am: 2ef88c5c11
2016-07-22 01:47:11 +00:00
Doris Ling
4ec4b64b9d
Check for null activity before getting dashboard categories.
...
am: b7e650c6f7
2016-07-22 01:42:47 +00:00
Fan Zhang
2ef88c5c11
Fix crash when starting Settings -> Display -> Font size
...
am: cafe6972a9
2016-07-22 01:42:45 +00:00
Doris Ling
7b03ae69df
Merge "Check for null activity before getting dashboard categories." into nyc-mr1-dev
2016-07-21 20:58:22 +00:00
Fan Zhang
cafe6972a9
Fix crash when starting Settings -> Display -> Font size
...
Change-Id: I26f81d02e31b0b7c8120395231aa6b81be6be7be
Fixes: 30279736
2016-07-21 13:30:54 -07:00
Doris Ling
b7e650c6f7
Check for null activity before getting dashboard categories.
...
In DashboardSummary, when async task finishes running, ensure that the
fragment is still associated with the activity before getting the
dashboard categories from the activity.
Change-Id: If23cd27a0d3e3429d900ae41ef6f24ed03b9e8d6
Fixes: 30278854
2016-07-21 12:22:17 -07:00
Thierry Strudel
8f3c7dd719
Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
...
* changes:
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
Settings: add logpersist kernel only selection
Settings: add logpersist selection (actions)
2016-07-21 04:07:25 +00:00
Doris Ling
c74d8368e7
Merge \\"Get gestures animation preview image in async loader.\\" into nyc-mr1-dev am: fd922cabd9
...
am: 8668aa0a8f
2016-07-21 02:49:41 +00:00
Doris Ling
8668aa0a8f
Merge \"Get gestures animation preview image in async loader.\" into nyc-mr1-dev
...
am: fd922cabd9
2016-07-21 02:47:12 +00:00
Doris Ling
de991f457d
Get gestures animation preview image in async loader.
...
When user scrolls in Gestures Settings, the textureview used for the
animation video will be destroyed if the view is scrolled outside the
screen. When the view is scrolled back in, a slight flicker is seen as
the animation video is not instantly made available on the new surface
texture. We are now retrieving the preview image in an async loader
after the preference is created, so that it will not delay the original
loading of the gestures settings page, but the preview will be made
available while we initialize the animation video in the new surface
texture.
Bug: 29790087
Change-Id: I83f4a5bc4f24b7aab4c0cc851cb524c10e74f328
2016-07-20 18:13:55 -07:00
Tony Mak
563668bebd
Merge \\"Should not report unsuccessful attempt if pattern size < minimal size\\" into nyc-mr1-dev am: 9d83a9fbbb
...
am: 3a681a32a8
2016-07-20 19:51:26 +00:00
Doris Ling
eacb97e3d7
Merge \\"Combine setCategories() and setSuggestions() in DashboardAdapter.\\" into nyc-mr1-dev am: 7e70fd1166
...
am: b3055b083a
2016-07-20 19:51:24 +00:00
Daniel Nishi
2b2ffa2dd6
Merge \\"Add a help item for the Help & Feedback for the Storage Manager.\\" into nyc-mr1-dev am: dd1c51a3e4
...
am: c354537c37
2016-07-20 19:51:17 +00:00
Michael Wright
40b75a094c
Merge \\"Color transforms are now color modes.\\" into nyc-mr1-dev am: 111e1dc6b3
...
am: 87fca0df00
2016-07-20 19:49:18 +00:00
Tony Mak
3a681a32a8
Merge \"Should not report unsuccessful attempt if pattern size < minimal size\" into nyc-mr1-dev
...
am: 9d83a9fbbb
2016-07-20 19:26:54 +00:00
Tony Mak
9d83a9fbbb
Merge "Should not report unsuccessful attempt if pattern size < minimal size" into nyc-mr1-dev
2016-07-20 19:20:55 +00:00
Julia Reynolds
0bb60ada96
Display days of week in locale order.
...
Change-Id: Id5d5920089a5da1fbdc7802431ca2909f72d7e12
Fixes: 21304061
2016-07-20 15:15:16 -04:00
Abodunrinwa Toki
1fd447e778
Merge \"DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.\" into nyc-mr1-dev
...
am: 5af83786f7
2016-07-20 18:57:18 +00:00
Doris Ling
b3055b083a
Merge \"Combine setCategories() and setSuggestions() in DashboardAdapter.\" into nyc-mr1-dev
...
am: 7e70fd1166
2016-07-20 18:51:17 +00:00
Daniel Nishi
c354537c37
Merge \"Add a help item for the Help & Feedback for the Storage Manager.\" into nyc-mr1-dev
...
am: dd1c51a3e4
2016-07-20 18:51:14 +00:00
Abodunrinwa Toki
5af83786f7
Merge "DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation." into nyc-mr1-dev
2016-07-20 18:50:16 +00:00
Michael Wright
87fca0df00
Merge \"Color transforms are now color modes.\" into nyc-mr1-dev
...
am: 111e1dc6b3
2016-07-20 18:49:59 +00:00
Doris Ling
7e70fd1166
Merge "Combine setCategories() and setSuggestions() in DashboardAdapter." into nyc-mr1-dev
2016-07-20 18:02:43 +00:00
Chad Brubaker
c92ed2721b
Merge "Dont use FLAG_ENCRYPT for certificates"
2016-07-20 17:37:07 +00:00
