Commit Graph

1409 Commits

Author SHA1 Message Date
Doris Ling
a0ded7042d Merge \"Change launch method for preference Display->Ambient Display.\" into nyc-mr1-dev
am: ea7e1b5d97

Change-Id: Idd7fd7cc03b1a52d713312def40f11b6974f1cdb
2016-07-13 21:18:08 +00:00
Doris Ling
a8046161be Change launch method for preference Display->Ambient Display.
Change to launch using intent to maintain the activity title when
launching Moves from Display->Ambient Display.

Bug: 30034039
Change-Id: I7e8df04a5c6722320b342e09ea1977b5ba7a8ded
2016-07-13 11:51:36 -07:00
Doris Ling
cd82ff3092 Merge \"Update preference ordering in Gestures settings.\" into nyc-mr1-dev
am: 22176641b2

Change-Id: Id3f021e78d5fe1d3e4522ae6c56e4a94e429903c
2016-07-12 23:44:14 +00:00
Doris Ling
1093b24c1b Update preference ordering in Gestures settings.
Swapped the fingerprint swipe and ambient display preference in
Settings->Gestures, and updated the summary text in Display->Ambient
display

Bug: 30073941
Change-Id: Ifc386b4ab9b0e7317f1ee0e477f9670e8a49b0f9
2016-07-12 11:25:47 -07:00
Maurice Lam
d776f53ecd Merge \"Update button styles for fingerprint\" into nyc-mr1-dev
am: 68d65abaaa

Change-Id: I718eb92c675f186b1450c378ce1c6589a862862b
2016-07-12 02:01:46 +00:00
Maurice Lam
68d65abaaa Merge "Update button styles for fingerprint" into nyc-mr1-dev 2016-07-12 01:51:11 +00:00
Makoto Onuki
5922902ab3 Merge \"Restore \"reset ShortcutManager rate limiting\" dev option\" into nyc-mr1-dev
am: ed9aed1878

Change-Id: If095c72ed03bbae493259479c6b23a862e71db4c
2016-07-11 18:09:18 +00:00
Makoto Onuki
ed9aed1878 Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev 2016-07-11 17:54:27 +00:00
Doris Ling
67d4b38cc1 Merge \"Change gesture settings for Ambient Display from nudge to double tap.\" into nyc-mr1-dev
am: 8ba6e6a792

Change-Id: Ib76c7172feddc578c4f276098e58c050cd4c6f8e
2016-07-08 23:23:35 +00:00
Doris Ling
8ba6e6a792 Merge "Change gesture settings for Ambient Display from nudge to double tap." into nyc-mr1-dev 2016-07-08 23:16:36 +00:00
Doris Ling
6607d49202 Change gesture settings for Ambient Display from nudge to double tap.
Change the description text and animation video to double tap the device
instead of nudge movement. Also update the summary text in
Display->Ambient Display to match the gesture description.

Bug: 30034987
Change-Id: If95e7a417b472dd677174a8187a83594e06e0eee
2016-07-08 14:24:42 -07:00
Justin Klaassen
67b3a94b81 Merge \"Add Night display settings\" into nyc-mr1-dev
am: e577ed1b91

Change-Id: I2d3aa5fdd00ccf0fe5dbb55468504b59cc8c8bbb
2016-07-08 21:15:39 +00:00
Justin Klaassen
c7cd2982cd Add Night display settings
Bug: 28615069
Change-Id: I2e8a374a00c06c06d419a6ff46cd3b5d544c1d3e
2016-07-08 11:48:02 -07:00
Makoto Onuki
0651701930 Restore "reset ShortcutManager rate limiting" dev option
Bug 30031093

Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72
2016-07-08 09:37:48 -07:00
Doris Ling
e4b305a0f0 Merge \"Fix layout transition from Display->Ambient Display to Gestures\" into nyc-mr1-dev
am: 3633058181

Change-Id: I75ed59bcdb3cf2382b8bc6fb9eb99f280fc1df72
2016-07-06 22:20:07 +00:00
Doris Ling
3633058181 Merge "Fix layout transition from Display->Ambient Display to Gestures" into nyc-mr1-dev 2016-07-06 22:08:08 +00: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
Doris Ling
9a3cf7725b Fix layout transition from Display->Ambient Display to Gestures
1. Add handling in Gestures settings to scroll to the corresponding
preference when launching from Display->Ambient Display
2. Remove the bitmap creation for the video preview image
3. Use a custom aspect ration framee layout to hold the animation
instead to avoid resizing of the animation view.

Bug: 29795707
Change-Id: I67209ba2508a93da4fc46ff20986309dbe5a83d5
2016-07-06 13:21:08 -07:00
Maurice Lam
584a11ec4a Update button styles for fingerprint
Use button styles instead of list style because of UX spec change.

Bug: 29421687
Change-Id: Icf178c881c2325b6183de8667a5657b3d2088f72
2016-07-06 18:15:06 +00: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
Daniel Nishi
55f2a8a8b5 Merge \"Add text to the Manage Settings page to show freed storage.\" into nyc-mr1-dev
am: 8c8791a807

Change-Id: I4b09319cf771325d1bbb11214733a45e7b26a3b5
2016-06-30 21:25:10 +00:00
Daniel Nishi
1b9afaff2b Add text to the Manage Settings page to show freed storage.
Bug: 29643106
Change-Id: Id05dc70e36a690e27cab67fecf921257ed7baf15
2016-06-29 14:48:50 -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
Adrian Roos
fa2bbcc288 resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
Change-Id: If97f5d5b4d67177b8160b96894a35d685573c46a
2016-06-16 18:58:04 -07:00
Adrian Roos
bd470255d0 resolve merge conflicts of 333ba2d to nyc-mr1-dev
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
2016-06-16 18:54:50 -07:00
Adrian Roos
380b01a00e Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
am: 333ba2df01

Change-Id: Ib9419acf4b09dd17fd15b53d32ce4616cbec94fa
2016-06-16 23:41:25 +00:00
Adrian Roos
38e4e5dca6 Remove RemoteInput on lockscreen setting
Bug: 29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79
2016-06-16 13:29:11 -07:00
Doris Ling
6dc50f9de6 Merge \"Update gesture related settings in Display.\" into nyc-mr1-dev
am: 600a1eeec5

Change-Id: I817d2e43f391b4e1f097c7509bd220041b0c18d5
2016-06-16 19:07:03 +00:00
Doris Ling
d0c8fd724d Update gesture related settings in Display.
1. Remove "Press power button twice for camera. Toggle is now available
in Settings->Gestures.
2. Remove toggle from "Ambient Display" and make it point to
Settings->Gestures->Quick screen check.

Bug: 28565958
Change-Id: I32fd2253a40be76ac9843a627df153eb4f1307d8
2016-06-16 10:23:49 -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
Mark Salyzyn
2fda09ad85 resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
am: f8c135a986

Change-Id: Ie1a71f0f029e5ca156eee2c15dc4670a724cc69c
2016-06-11 05:18:20 +00:00
Ruchi Kandoi
f8c135a986 resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
Change-Id: If75736f8e36e2a8e13fe9740f89f632ee6bedd49
2016-06-10 22:04:52 -07:00
Mark Salyzyn
03af2286ee Settings: add logpersist selection (actions)
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
  selecting Off (but not if turned off by Logging Size Off or
  Disabling Debugger Options).

Bug: 28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
2016-06-10 21:44:32 +00:00
Meng Wang
7648de1ec6 Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev 2016-06-10 16:36:46 +00:00
Doris Ling
ab595b8a98 Merge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev 2016-06-08 21:35:20 +00:00
Jason Monk
aaaa236cec resolve merge conflicts of 7f7092c to nyc-mr1-dev
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
2016-06-08 16:19:35 -04:00
Doris Ling
e6f635ff82 Moved network settings reset away from Backup & reset.
Moved Settings -> Backup & reset -> Network setting reset to
Settings -> Wireless & networks -> More.

Bug: 28683031
Change-Id: I52385ec862789985ccb8647398950605955569f7
2016-06-08 11:49:47 -07: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
Meng Wang
0dc4311333 Wi-Fi Calling settings UI update
Bug: 28404126
Change-Id: Id9c44c0b97d2ef81502a65e9238e47656068db50
2016-06-06 16:49:02 -07: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
Wei Wang
c687e9bfbd Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
am: d0d3ca3b7c

* commit 'd0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
  Revert "Add an entry in developer options for location tools."

Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
2016-06-02 17:22:59 +00:00
Wei Wang
d0d3ca3b7c Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev 2016-06-02 17:14:02 +00:00
Wei Wang
a0b28146ba Revert "Add an entry in developer options for location tools."
Bug:28251942

This reverts commit e1c1a13cba.

Change-Id: I864a813e8f6a9488b4db2f876a0097e947ceae45
2016-06-02 04:42:02 +00:00
Meng Wang
90e8e4713c Launch E911 address management activity at turning on Wifi Calling
Bug: 28404126
Change-Id: Id551d784d151e5f24cfcec96e6cf4b999f39ce0f
2016-05-31 15:57:27 -07:00
Sunny Goyal
60a4dc652d Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev 2016-05-25 22:50:43 +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