Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,646 Commits 1 Branch 0 Tags
138d38a789c49b01adb359db7cb50709334ee5be
Commit Graph

15980 Commits

Author SHA1 Message Date
Andrew Sapperstein
138d38a789 Merge "Remove divider above ExpandPreference." into oc-dev 
am: abac8823b2

Change-Id: Id03d2e44fe8da8dc98b1a6694b2281d29c72a04d
 2017-04-12 00:20:08 +00:00
TreeHugger Robot
abac8823b2 Merge "Remove divider above ExpandPreference." into oc-dev 2017-04-12 00:03:06 +00:00
Tony Mantler
d9200e5ba4 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev 
am: 69faf046c0

Change-Id: I6c8310037826f13e9d468e9b27dc26d347b11249
 2017-04-11 23:48:17 +00:00
TreeHugger Robot
69faf046c0 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev 2017-04-11 23:43:27 +00:00
Fan Zhang
007b9e3cdd Merge "Don't show vpn info box when we don't have anything useful" into oc-dev 
am: d70abb53ee

Change-Id: I98af02698f46eb483cf5d64380854dd632d26113
 2017-04-11 23:43:01 +00:00
Fan Zhang
668dae22e7 Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev 
am: fd29aada6b

Change-Id: I30e9087f3e90055ccc1192743814c42f3a28a21e
 2017-04-11 23:42:46 +00:00
TreeHugger Robot
d70abb53ee Merge "Don't show vpn info box when we don't have anything useful" into oc-dev 2017-04-11 23:35:39 +00:00
TreeHugger Robot
fd29aada6b Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev 2017-04-11 23:35:13 +00:00
Jesse Evans
708a85065d Merge "Fixes instant apps on the Opening links screen" into oc-dev 
am: 15f963bed9

Change-Id: I21b6b40c9abb52c52e525000b1e5f063a1c4c475
 2017-04-11 22:52:09 +00:00
TreeHugger Robot
15f963bed9 Merge "Fixes instant apps on the Opening links screen" into oc-dev 2017-04-11 22:36:31 +00:00
Julia Reynolds
80f06dc54c Merge "Sort channels and groups by id" into oc-dev 
am: 665c1ced58

Change-Id: I3878ed917d63b9454b332f714ac83054452fab31
 2017-04-11 19:43:06 +00:00
Hyunyoung Song
71ba393033 Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev 
am: 9234a34a80

Change-Id: I25a0968edf534242130fdfda405bb6dfb8afc24a
 2017-04-11 19:42:47 +00:00
Andrew Sapperstein
c9469cddbc Remove divider above ExpandPreference. 
Change-Id: Ib1841d99025af3f97495efd6d6186b328af33f84
Fixes: 36479214
Test: manual, visual update
 2017-04-11 19:41:34 +00:00
Julia Reynolds
665c1ced58 Merge "Sort channels and groups by id" into oc-dev 2017-04-11 19:18:53 +00:00
Fan Zhang
b0509b48c6 Don't show vpn info box when we don't have anything useful 
Change-Id: I12a71b38486cab8a6a188c299e90a7674926dc98
Fix: 36068109
Test: make RunSettingsRoboTests -j40
 2017-04-11 12:02:29 -07:00
Hyunyoung Song
9234a34a80 Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev 2017-04-11 18:11:49 +00:00
Tony Mantler
76f46fc869 Fix sketchy usage of new PreferenceScreen 
Things get weird if you don't use PreferenceManager#createPreferenceScreen

Bug: 37216851
Test: Compiles and runs
Change-Id: I7cebec133c4f27f7eeda83c95d8acb4823f67dc4
 2017-04-11 10:35:24 -07:00
Fan Zhang
00d8ff5d6e Revert "Revert "Convert BT preference to use TwoTargetPreference"" 
This reverts commit 457c3cbec2.

Revert with fix/test.
The fix is that we removed DevicePickerFragment#initDevicePreference(),
which incorrectly set a useless widget on preference, and removes the
gear icon from preference, preventing bind() call to go through

Change-Id: Ia70cdb51d13cca6035a4e7fe8008d195f7f00c6e
Fix: 36511169
Test: runtest --path tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
 2017-04-11 09:45:27 -07:00
Paul Stewart
14633029d2 Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev 
am: 6d7f210c0b

Change-Id: I37c91c9df8e2b8ff86cf4e11ffbc8bbbfb8ad9dd
 2017-04-11 07:47:36 +00:00
TreeHugger Robot
6d7f210c0b Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev 2017-04-11 07:22:52 +00:00
Matthew Fritze
5bb64aeb59 Merge "Reindex on OTA and locale change" into oc-dev 
am: f84c8d3480

Change-Id: Ia8730a65d7199eefc6054954d2f0f5923dd6aad0
 2017-04-11 00:19:36 +00:00
TreeHugger Robot
f84c8d3480 Merge "Reindex on OTA and locale change" into oc-dev 2017-04-10 23:54:55 +00:00
Honglu Yin
381570cda2 Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am: 4604741c51 
am: b9b563d243

Change-Id: Id276fbc68b12985074393454f729f950612685ed
 2017-04-10 23:23:44 +00:00
Honglu Yin
b9b563d243 Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a 
am: 4604741c51

Change-Id: I1168d6d5862745210045efea402f6d0f1e85acab
 2017-04-10 23:22:49 +00:00
Jack He
075ee6109f Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06 
am: 336a7ccca7

Change-Id: I1a7ff476de330fbe0c0b48ce27c8dd363cd49c8f
 2017-04-10 23:20:34 +00:00
Jack He
336a7ccca7 Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 
am: 9e1e430f06

Change-Id: I8fe93eebafb60a237bfbe1009652672e17411a3d
 2017-04-10 23:11:42 +00:00
Treehugger Robot
7d9146e10a Merge "Title is different after tapping "Memory used by apps"" 2017-04-10 22:53:09 +00:00
Jack He
3d08bedba2 Merge "Add developer menu entry to enable Bluetooth inband ringing" 2017-04-10 22:47:55 +00:00
Hyunyoung Song
ebc17237c3 Add shadow to AdaptiveIconDrawables using View level shadow 
Test: $ make RunSettingsRoboTests -j40
RunSettingsRoboTests: ......
RunSettingsRoboTests: Time: 151.394
RunSettingsRoboTests:
RunSettingsRoboTests: OK (1355 tests)
RunSettingsRoboTests:

Bug: 36088922

Change-Id: I5b5651d2305ab65e1358609a4110e248dee9eab2
 2017-04-10 14:43:02 -07:00
Matthew Fritze
a0d03178d0 Reindex on OTA and locale change 
When the user gets an OTA or changes language, settings
will clear the database and reindex it.

Test: make RunSettingsRoboTests
Change-Id: I379ece86b2d41d673bbbffbcf947774f3ccd4cb9
Fixes: 36859162
 2017-04-10 14:28:39 -07:00
Garfield Tan
cea8a43a92 Merge "Fix the intent to launch storage details." into oc-dev 
am: 66871d8531

Change-Id: I6b082e06a434a9d1ea098458e665c19a4975fb84
 2017-04-10 20:41:47 +00:00
Garfield Tan
66871d8531 Merge "Fix the intent to launch storage details." into oc-dev 2017-04-10 20:24:20 +00:00
Daniel Nishi
f4af2774ee Merge "Add user icon to the other user preferences." into oc-dev 
am: b1c336de5f

Change-Id: Icce728807ace666984af3a93ef495c448cdb9e7b
 2017-04-10 17:32:27 +00:00
Daniel Nishi
b1c336de5f Merge "Add user icon to the other user preferences." into oc-dev 2017-04-10 17:27:25 +00:00
Lei Yu
964de0d7be Merge "Add log for BatteryUtils" into oc-dev 
am: 27dc9b69ac

Change-Id: I5bad76814ac4b6346c634498e0a5952f5d539f17
 2017-04-10 17:13:22 +00:00
Lei Yu
27dc9b69ac Merge "Add log for BatteryUtils" into oc-dev 2017-04-10 17:06:45 +00:00
Julia Reynolds
7be0dbd86c Sort channels and groups by id 
Test: manual
Change-Id: I3949e9eb7b901bd897d848627682878937aac0c1
 2017-04-10 12:47:13 -04:00
Garfield Tan
973cddcb1b Fix the intent to launch storage details. 
Test: Manual tests & robo tests.
Bug: 37164357
Change-Id: Ia73a6286edadb9c9e1691dcc0c9e391ce2981dee
 2017-04-07 19:08:29 -07:00
Daniel Nishi
fe33c58a18 Add user icon to the other user preferences. 
This icon is loaded in the background to avoid doing IO on
the main thread. Once we know there are more users and also
have the icon loaded, we add the category to the view.

Fixes: 36252572
Test: Robotest

Change-Id: Ib50287bb7ed323f22fbe407b56be1bf2fe98f121
 2017-04-07 14:57:07 -07:00
Kevin Chyn
e359c21f71 Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev 
am: 78dce02079

Change-Id: I453db9fc9af0ab8f44535aa39517967e8ec9761c
 2017-04-07 21:01:09 +00:00
TreeHugger Robot
78dce02079 Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev 2017-04-07 20:55:15 +00:00
Doris Ling
f8dead2f40 Merge "Add summary text to Lock screen preferences." into oc-dev 
am: a258e424a2

Change-Id: I11366b87d3f3920a79096dad0dd29938da2f8a52
 2017-04-07 20:07:55 +00:00
TreeHugger Robot
a258e424a2 Merge "Add summary text to Lock screen preferences." into oc-dev 2017-04-07 20:03:36 +00:00
Daniel Nishi
af587b0cfc Merge "Update the automatic storage management preferences." into oc-dev 
am: 7badf46542

Change-Id: Ic9311706e67f28607f17e036eee5bfa8290af82b
 2017-04-07 19:46:05 +00:00
Daniel Nishi
7badf46542 Merge "Update the automatic storage management preferences." into oc-dev 2017-04-07 19:38:27 +00:00
Kevin Chyn
474178d094 renaming/removing fingerprints should be reflected in UI immediately 
Fixes 30252265
Test: manual

Change-Id: I5b1bcfff6a6a9ae407db6084562d0244cc5c45c2
 2017-04-07 11:52:00 -07:00
jackqdyulei
5d2918a675 Add log for BatteryUtils 
This cl add logs to get more data for app usage time.

Also refactor BatteryUtils to singleton pattern because we need
to extract package name from uid.

Bug: 36909166
Test: RunSettingsRoboTests
Change-Id: I6ede354035c46e46cb856b7cf57bd1b7ccbd6d4f
 2017-04-07 11:18:39 -07:00
Doris Ling
cee83e4bbf Add summary text to Lock screen preferences. 
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
 2017-04-07 11:11:45 -07:00
Lei Yu
52e096284f Merge "Remove misc data in battery main page." into oc-dev 
am: abde170529

Change-Id: I6552e8280746f53b05421b767fd92adafecdbf4f
 2017-04-07 17:51:50 +00:00
Lei Yu
abde170529 Merge "Remove misc data in battery main page." into oc-dev 2017-04-07 17:37:18 +00:00