Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,129 Commits 1 Branch 0 Tags
024d1dca466cd9400dc8ddaf76936ecd229644bd
Commit Graph

43129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antony Sargent
024d1dca46 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 am: 5943908af4 -s ours am: f224aa6af9 -s ours am: 086df75f9a -s ours 
am: 9a9b8cad39  -s ours

Change-Id: I3dfd1cf3e9bb94825aaec93c881b327cc65e1149
 2018-03-08 20:22:22 +00:00
Antony Sargent
9a9b8cad39 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 am: 5943908af4 -s ours am: f224aa6af9 -s ours 
am: 086df75f9a  -s ours

Change-Id: I5d48e96b63dc79dbe89adde6eb83ceaad288efe7
 2018-03-08 19:59:36 +00:00
Antony Sargent
086df75f9a [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 am: 5943908af4 -s ours 
am: f224aa6af9  -s ours

Change-Id: I0441b99e9f7b945d41303fdc8d0e412426a081e3
 2018-03-08 19:48:36 +00:00
Maurice Lam
a9a48d83d4 Hide options button when user starts entering pattern 
am: 4723abfe26

Change-Id: I3223a1a40b08c0dcef90ec117ac08b1888e6174e
 2018-03-08 19:43:21 +00:00
Antony Sargent
f224aa6af9 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 
am: 5943908af4  -s ours

Change-Id: I26672d57ced63374a8b03ae3e8e0647c6a4bd150
 2018-03-08 19:42:30 +00:00
Brad Ebinger
be581fd7ef Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." am: 4ec0e8e865 
am: 9b282e231f

Change-Id: I95a108f4e6090b61e4584a64bed58c024e120fd0
 2018-03-08 19:18:08 +00:00
Brad Ebinger
9b282e231f Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." 
am: 4ec0e8e865

Change-Id: I04c42bb5786b37f6d9aa124a663eef6d69b930a2
 2018-03-08 19:13:20 +00:00
Maurice Lam
4723abfe26 Hide options button when user starts entering pattern 
Test: cd tests/robotests && mma
Bug: 72409245
Change-Id: I82ab8822f13bc8bf8b74bc67f6d4d3a9fd2cc0c8
(cherry picked from commit ad554244b6)
 2018-03-08 18:59:29 +00:00
Victor Chang
894f5521ab Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev 
am: 4f5a113d8f

Change-Id: Icadc36b185da4f26c81985895569b18d9234f639
 2018-03-08 18:58:32 +00:00
TreeHugger Robot
4f5a113d8f Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev 2018-03-08 18:45:30 +00:00
Brad Ebinger
4ec0e8e865 Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." 2018-03-08 18:32:56 +00:00
Victor Chang
d251a10cd6 Show time zone standard name in FixedOffsetPreferenceController 
- Among all fixed offset time zone, only Etc/UTC has a time zone
standard name. The name should be shown in both picker and preference's
secondary text (summary).

Bug: 74338688
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: I10c140f6054ab9acf6e0fb44528adef8b28fa23c
 2018-03-08 15:13:15 +00:00
Doris Ling
7eef8156ea Merge "Fix layout height for suggestion tile." into pi-dev 
am: ec9606addb

Change-Id: I518af49e44a386ef6fcc7381f11ad0b635ba3ea7
 2018-03-08 05:40:11 +00:00
TreeHugger Robot
ec9606addb Merge "Fix layout height for suggestion tile." into pi-dev 2018-03-08 05:32:25 +00:00
Bill Yi
663ad81f07 Merge "Import translations. DO NOT MERGE" into pi-dev 
am: 7c2713cb2d  -s ours

Change-Id: I8eabcb331f4eb0809c644e724fe5a6a07802210b
 2018-03-08 05:22:18 +00:00
TreeHugger Robot
7c2713cb2d Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-08 05:12:11 +00:00
jackqdyulei
6217b5cd7e Merge "Update fuelguage to use uid in AppInfo" into pi-dev 
am: 6949175423

Change-Id: I31a6b9eeaba39e3678945796b729ddede797a28e
 2018-03-08 03:32:00 +00:00
TreeHugger Robot
6949175423 Merge "Update fuelguage to use uid in AppInfo" into pi-dev 2018-03-08 03:22:40 +00:00
jackqdyulei
b65ae02db2 Merge "Make "Add device" as restricted preference." into pi-dev 
am: e03bb88c09

Change-Id: I8ba721585a25bdc45b4d3dff97811955e02715b6
 2018-03-08 03:05:09 +00:00
TreeHugger Robot
e03bb88c09 Merge "Make "Add device" as restricted preference." into pi-dev 2018-03-08 02:58:25 +00:00
Fan Zhang
29f7e7f13c Merge "Move Auto sync data prefs from user to account screen" into pi-dev 
am: 799c2545c0

Change-Id: I134995bd6c9191db9f82941c1212f7ef598fbef3
 2018-03-08 02:20:27 +00:00
Lei Yu
89105f7c47 Merge "Add whitelist for anomaly detection." into pi-dev 
am: 13eb2f18b4

Change-Id: I2fd14ec8f8f1770856c8aabf49e0e39210a08293
 2018-03-08 02:07:58 +00:00
Fan Zhang
9bbfe66b23 Merge "For vibration settings page, create controllers from xml" into pi-dev 
am: f3cfced1d1

Change-Id: I518634fb8e61f701ee8acab19855df5c941fec53
 2018-03-08 02:01:52 +00:00
TreeHugger Robot
799c2545c0 Merge "Move Auto sync data prefs from user to account screen" into pi-dev 2018-03-08 02:01:46 +00:00
jackqdyulei
c7a0c33ab5 Update fuelguage to use uid in AppInfo 
The uid is needed to distinguish the same app used
by different users(even work profile user). So
we need to store the correct uid in AppInfo and
use it across the settings app.

Bug: 74022362
Test: RunSettingsRoboTests
Change-Id: Iaa0ea1ac1fbd3a3a1251e0cd1096d6a8c75c4ed8
 2018-03-08 01:33:54 +00:00
Lei Yu
13eb2f18b4 Merge "Add whitelist for anomaly detection." into pi-dev 2018-03-08 01:14:51 +00:00
TreeHugger Robot
f3cfced1d1 Merge "For vibration settings page, create controllers from xml" into pi-dev 2018-03-08 01:07:38 +00:00
Fan Zhang
ad47e1aada Move Auto sync data prefs from user to account screen 
Change-Id: Idb69ed49c6e21f93cafa593ba5e7dffa32f377b7
Fixes: 73739376
Test: existing robotests & atest
 2018-03-07 15:53:18 -08:00
Fan Zhang
d68b9830cf Merge "Clean up comment" into pi-dev 
am: 12a8fced66

Change-Id: Ie7ad8654f289e9772ea395c362fa9a77be0eb217
 2018-03-07 23:46:01 +00:00
Fan Zhang
3c5196a5de Merge "Update string: clear data -> clear storage" into pi-dev 
am: ad24c98c2d

Change-Id: Iea916ddb14f8202ea43b79577d272b66b77de8ab
 2018-03-07 23:36:57 +00:00
TreeHugger Robot
12a8fced66 Merge "Clean up comment" into pi-dev 2018-03-07 23:34:43 +00:00
Bill Yi
92931b1fae Import translations. DO NOT MERGE 
BUG:72647570

Change-Id: I0056af6763c58ffc34e49c3c6f84211c1c9a674c
Auto-generated-cl: translation import
 2018-03-07 15:28:17 -08:00
TreeHugger Robot
ad24c98c2d Merge "Update string: clear data -> clear storage" into pi-dev 2018-03-07 23:26:30 +00:00
Andreas Terzis
97e9f1611e Merge "Rename "Billing Cycle" to "App usage cycle"." into pi-dev 
am: d9eba6b856

Change-Id: Ic41ad59b20a933bef89f0f15989788b61c2e11ed
 2018-03-07 23:25:05 +00:00
Doris Ling
8f5773b834 Fix layout height for suggestion tile. 
- set minHeight instead of using a fix height, so that when the
font/display size is set to larger, the height will expand accordingly
to fit all elements in the suggestion card.

- revert the change that tint all suggestion icons. The previous logic
should be used to determine if we should tint the icon or not.

Change-Id: I2451490130cee216ff65301a600eb91d2e65c321
Fixes: 74261827
Test: visual and make RunSettingsRoboTests
 2018-03-07 15:04:11 -08:00
Salvador Martinez
ebb7148fd6 Update BatteryInfo to include averageTimeToDischarge 
am: db1efa3e03

Change-Id: Ibad0041006908e4ab4a229bf8dc7bde5f14bb18a
 2018-03-07 22:51:56 +00:00
Fan Zhang
36680b0934 For vibration settings page, create controllers from xml 
This change leverages a new support in settings framework to
automatically share preference controllers between full setting page,
search, and slice provider.

Bug: 73668763
Test: existing robotest and atest
Change-Id: Ie96a28f1b503377b3fdf86e28d297c8560d8bf71
 2018-03-07 14:48:26 -08:00
Andreas Terzis
d9eba6b856 Merge "Rename "Billing Cycle" to "App usage cycle"." into pi-dev 2018-03-07 22:46:13 +00:00
Fan Zhang
9c18ac0554 Clean up comment 
Bug: 73074893
Test: none
Change-Id: If7dcfcbb2e943d5734239ddb51c0e6ac798b641b
 2018-03-07 13:36:58 -08:00
jackqdyulei
10051afb96 Add whitelist for anomaly detection. 
Even though we can add whitelist in config, we still need to have a
on device whitelist to reduce the size of config.

Use doze whitelist here because we already used it to detect whether
we can restrict the app in battery detail page.

Bug: 74241534
Test: RunSettingsRoboTests
Change-Id: I35b6f3eba9fbc8ae51bb02cd9d5416e4360c388e
 2018-03-07 13:20:36 -08:00
Fan Zhang
6acc0cf3cd Update string: clear data -> clear storage 
Change-Id: I710f7b95a53e5437d895ff920f3cce7aa4c5a6cf
Fixes: 34515307
Test: visual
 2018-03-07 13:19:52 -08:00
Salvador Martinez
db1efa3e03 Update BatteryInfo to include averageTimeToDischarge 
This updates the Estimate data model class as well as the places
it is used to populate the new field when available.

Test: robotests
Bug: 74020365
Change-Id: Ibcecf933819f8b8cd8514205768569e9bd7d1517
(cherry picked from commit 453db0cdbc)
Merged-In: 453db0cdbc
 2018-03-07 20:39:59 +00:00
Andreas Terzis
30743c787e Rename "Billing Cycle" to "App usage cycle". 
Under Settings > Data Usage, rename "Billing cycle" to
"Data warning & limit".

In the new "Data warning & limit" screen rename "Billing cycle"
to "App usage cycle".

Bug: 74321150
Test: manual
Change-Id: Ied4fd604fe98f5fc613fd4f7fc3a3bea5908bb7c
 2018-03-07 12:19:36 -08:00
Yueming Wang
82edd2006c Merge "Block location accuracy when DISALLOW_CONFIG_LOCATION is set." into pi-dev 
am: fd7b78afb0

Change-Id: Ib3f68f2b2372973b300091cbd9640f4cd5a972d0
 2018-03-07 20:19:23 +00:00
Yueming Wang
fd7b78afb0 Merge "Block location accuracy when DISALLOW_CONFIG_LOCATION is set." into pi-dev 2018-03-07 20:10:10 +00:00
Fan Zhang
4a9cd8efc5 Merge "Misc fixes to improve search" into pi-dev 
am: 6b83c2d332

Change-Id: Ifd491df275c7e74bf52901b2a919e1f6043efe00
 2018-03-07 20:07:50 +00:00
TreeHugger Robot
6b83c2d332 Merge "Misc fixes to improve search" into pi-dev 2018-03-07 19:59:11 +00:00
jackqdyulei
7f5e5e0522 Merge "Add dump log for BatteryTip." into pi-dev 
am: 26b5b5b5db

Change-Id: I0738c5dce35fa045b4393a246d4df2c2cba1c986
 2018-03-07 19:19:06 +00:00
TreeHugger Robot
26b5b5b5db Merge "Add dump log for BatteryTip." into pi-dev 2018-03-07 18:53:09 +00:00
Fan Zhang
02caf0f861 Misc fixes to improve search 
- Suppress one of results from "On lock screen"
- Remove screen title from sub sections in data usage screen.
- On UserSettins, index using resource instead raw. And build
  non-indexables using getNonIndexable and pref controlleres.

Change-Id: I947a97af60f1a08b237fda2f3c456cf1105b9231
Fixes: 74120518
Fixes: 74119743
Fixes: 74250251
Fixes: 74119687
Test: reindex
 2018-03-07 10:00:57 -08:00