PawletOS/app_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

34646 Commits

This Branch
This Branch
All Branches
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
Lei Yu
af95b3d3c2 Merge "Add textAlignment for preference_widget_summary" into oc-dev 
am: 8bb9f33c6f

Change-Id: Icece4eeeeefa2da5ce0a0d9318757b1270dcfce6
 2017-04-11 17:34:58 +00:00
Lei Yu
8bb9f33c6f Merge "Add textAlignment for preference_widget_summary" into oc-dev 2017-04-11 17:10:08 +00: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
Fan Zhang
2700a3148f Update string char limits 
am: d017f22372

Change-Id: Ia91e931c93a53d77a1c1ad554d60982b0c0c084a
 2017-04-11 16:27:17 +00:00
Fan Zhang
d017f22372 Update string char limits 
Fix: 36852178
Fix: 36851715
Fix: 36657781
Fix: 36700992
Fix: 36650008
Fix: 36657636
Test: builds and robotests
Change-Id: I14c21b2cb37b911c14dff40343fa094d7150f201
 2017-04-11 09:09:23 -07:00
Evan Laird
5c51987432 Merge "Add "Current screen saver" string" into oc-dev 
am: 42a1cb9e12

Change-Id: I411b6735ce8388274a120ea1a4097b1a7a618f27
 2017-04-11 15:55:18 +00:00
TreeHugger Robot
42a1cb9e12 Merge "Add "Current screen saver" string" into oc-dev 2017-04-11 15:44:30 +00:00
Doris Ling
47a44f0fea Merge "Update text for security preference." into oc-dev 
am: 74eee7838c

Change-Id: Ic09b5837c2fab9a5f11051c297f7571fe79ac7a1
 2017-04-11 15:31:43 +00:00
Doris Ling
74eee7838c Merge "Update text for security preference." into oc-dev 2017-04-11 15:24:44 +00: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
Sean Stout
2fcca5a647 Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev 
am: e4c73c24bc

Change-Id: I87b734b9fc79d09f6e4aa847b06311d8c92b75a2
 2017-04-11 02:05:52 +00:00
jackqdyulei
adcedce4e0 Add textAlignment for preference_widget_summary 
To make sure the text are aligned to the "viewEnd".

Bug: 37159537
Test: Screenshot
Change-Id: Ifab03dda6c9954d6b83ce4db0708303e0c5d32bd
 2017-04-10 18:57:12 -07:00
TreeHugger Robot
e4c73c24bc Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev 2017-04-11 01:24:09 +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
Sean Stout
40067bee4d Remove Night Light suggestion. DO NOT MERGE 
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Bug: 37207263
Change-Id: Ieeb660abdcbe07cb66f1ae3b6e86d8fd27a26478
 2017-04-10 16:22:01 -07: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
Honglu Yin
4604741c51 Merge "Title is different after tapping "Memory used by apps"" 
am: 7d9146e10a

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

Change-Id: I70542c676f8c738e0d846dd119a9af4ebc293175
 2017-04-10 23:00:11 +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
Doris Ling
ca95a90c11 Update text for security preference. 
Swap location to screen lock in title and summary.

Bug: 37161482
Test: builds
Change-Id: Ie95f1d8c984587bf3898a431edde0868b0e17fce
 2017-04-10 15:21:18 -07: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
Evan Laird
044001f991 Add "Current screen saver" string 
This one was missed originally.

Test: none
Bug:35031991
Change-Id: I9b1bff9a9c834c306fe03e4405950bc1ac3ac3ac
 2017-04-10 16:35:45 -04: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