Commit Graph

52880 Commits

Author SHA1 Message Date
Sunny Shao
0135cde020 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev
am: 3d16fc9519

Change-Id: Id2aa3c501378686d1b3a1b352b8fa15132bc396f
2019-05-30 00:00:24 -07:00
TreeHugger Robot
3d16fc9519 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev 2019-05-30 06:37:12 +00:00
Mehdi Alizadeh
be98ea25ca Increase char limit to 60 for string translation
Bug: 133862422
Test: None
Change-Id: I3fa6705a6657c5aa65e496cba2ce470fb558a45f
2019-05-29 20:22:09 -07:00
Raff Tsai
c3740704f3 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours am: 08672ec74e -s ours
am: dd7de36bbc -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: If8f23bb912f13f355b807358e28f5d74c0bfa066
2019-05-29 18:50:30 -07:00
Raff Tsai
dd7de36bbc [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours
am: 08672ec74e -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I1f06a8e5c931e789518ea1a751a93ecfc73a9090
2019-05-29 18:44:27 -07:00
Raff Tsai
08672ec74e [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours
am: 3fb5933880 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history

Change-Id: I68b1c3e845c9f8cff305583b6cd19869e36cc027
2019-05-29 18:40:29 -07:00
Raff Tsai
3e6af30847 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours
am: 93aed56281 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ic8675a751a6efde129338108c318d4f75ab75518
2019-05-29 18:38:38 -07:00
Raff Tsai
3fb5933880 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd
am: fd058ab872 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 e4800786cf is in history

Change-Id: I7fbd29f4d72fda672e986f12d17e37bee1b89e4b
2019-05-29 18:35:24 -07:00
Raff Tsai
93aed56281 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours
am: 8837b15f78 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Iaee4509328c45e5405edc1bae475d2e1cf5f4ba7
2019-05-29 18:33:23 -07:00
Raff Tsai
fd058ab872 Merge "Do not allow draw on top for App notification settings" into oc-dev
am: 811229a2fd

Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4
2019-05-29 18:30:24 -07:00
Raff Tsai
8837b15f78 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev
am: b95361ab60 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history

Change-Id: I66e6f4f24bd7349db363f28f0462d16825e544c8
2019-05-29 18:28:27 -07:00
TreeHugger Robot
811229a2fd Merge "Do not allow draw on top for App notification settings" into oc-dev 2019-05-30 01:14:19 +00:00
TreeHugger Robot
b95361ab60 Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev 2019-05-30 01:11:01 +00:00
Raff Tsai
9da6ed05d9 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours
am: d08b633e28 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Id6c85e054c145ef831461a69ed19a85c01b96a7b
2019-05-29 17:36:52 -07:00
Raff Tsai
d08b633e28 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev
am: 4d01717c14 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ifb49814e6f18d000aafb89652ce26e5469ef0fb5
2019-05-29 17:28:49 -07:00
TreeHugger Robot
4d01717c14 Merge "Do not allow draw on top for App notification settings" into pi-dev 2019-05-30 00:15:17 +00:00
Christine Franks
8869db9555 Add SIM color picker
Bug: 133193155
Test: make ROBOTEST_FILTER="(RenameMobileNetwork*)" RunSettingsRoboTests -j48

Change-Id: Ifae8b77bc5b4ba1039ede70889468a018f57d78f
2019-05-29 17:03:31 -07:00
Sunny Shao
bddf5149e5 Fix the crash while tapping "app data usage" as second user
Second user or guest is limited some mobile network access. We need to check current user
is admin or not to decide the preferece page will be found in search or not.

Bug: 133466016
Fixes: 133466016
Test: Manual test & make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.network

Change-Id: I48d3064a8aa28ac1f2ac699b42a999b9682b1b52
2019-05-30 06:15:11 +08:00
Colin Cross
e0e22cf2a4 Convert Settings to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Test: m RunSettingsRoboTests
Change-Id: I267534c095c30833f77273dbdb1893b7830ed45d
Merged-In: I267534c095c30833f77273dbdb1893b7830ed45d
2019-05-29 14:45:30 -07:00
Lei Yu
c89ba29e92 Fix issues in battery usage accounting
1. In High usage dialog, show top apps based on battery usage, not app
time.
2. Refactor the check for hidden system modules into ShouldHideSipper,
however don't smear it, this is also the current logic before this CL.

Bug: 133445008
Test: RunSettingsRoboTests
Change-Id: I851a1c9ef9b79a934ba0501cd96001f2e450bda4
2019-05-29 13:57:04 -07:00
Antony Sargent
55ac2d75fc Merge "Switch to using an intent for eSIM erasing" into qt-dev
am: f010cb4034

Change-Id: Ia08496db92bd4a432db729d7734bc3bb3b9d6f0a
2019-05-29 13:14:42 -07:00
Lei Yu
798b80e5ad Update SliceView when slice is null
When it is null, we should also update SliceView, so SliceView can
update to be "invisible"

Fixes: 133790296
Test: RunSettingsRoboTests
Change-Id: I239405cce8bcadacbd374ccbb24d0fcbadc04880
2019-05-29 13:11:57 -07:00
TreeHugger Robot
f010cb4034 Merge "Switch to using an intent for eSIM erasing" into qt-dev 2019-05-29 20:02:48 +00:00
Evan Laird
03acd2962e Merge "Change title to "Alerting"" into qt-dev
am: c64d41fd98

Change-Id: I2305841504e8146481bfd6128d1194d1741e1ba2
2019-05-29 12:40:16 -07:00
TreeHugger Robot
c64d41fd98 Merge "Change title to "Alerting"" into qt-dev 2019-05-29 19:19:59 +00:00
Amit Mahajan
38b3a56364 Merge "Allow renaming inactive subscriptions." into qt-dev
am: d133a026cd

Change-Id: Ifb4aafad705860d12c02ad3d26a3a36019ad9847
2019-05-29 11:28:13 -07:00
TreeHugger Robot
d133a026cd Merge "Allow renaming inactive subscriptions." into qt-dev 2019-05-29 18:16:40 +00:00
Julia Reynolds
75d207c364 Merge "Add snooze notification setting" into qt-dev
am: b8f7db90ce

Change-Id: If4f5777f87dda64edd2b947fe08be88fdae0c4db
2019-05-29 10:24:19 -07:00
Evan Laird
b18ec1958a Change title to "Alerting"
Test: visual
Fixes: 133825282
Change-Id: I08c58328eafdc37ba993d5189c8830e2c00115e6
2019-05-29 13:19:37 -04:00
Mill Chen
7d5050f252 Merge "Add EID as a synonym to SIM status" into qt-dev
am: 994d7d63d3

Change-Id: If6eefc766dd97858b424ffcd2387106dbd270de9
2019-05-29 10:04:24 -07:00
TreeHugger Robot
b8f7db90ce Merge "Add snooze notification setting" into qt-dev 2019-05-29 17:03:32 +00:00
TreeHugger Robot
994d7d63d3 Merge "Add EID as a synonym to SIM status" into qt-dev 2019-05-29 16:48:23 +00:00
Tsung-Mao Fang
8456765698 Revert "Tweak title for "App content""
am: 685d247730

Change-Id: I17befd995e227e53ecf7870dcc5af2e261039454
2019-05-29 09:45:30 -07:00
Pavel Grafov
b49eb4348a Make work challenge pattern resizeable.
Currently in split-screen mode if work challenge window is made too narrow,
the dots of the pattern will go beyond window/screen boundaries. This change
makes pattern behave in the same way as primary profile pattern does, see
confirm_lock_pattern_normal.xml

Fixes: 133135598
Test: manual, resizing work challenge in portrait and landscape.
Change-Id: I40649911c2b7c587bf0b7e4a5c0449a5c2b7abb0
2019-05-29 14:41:33 +01:00
Tsung-Mao Fang
685d247730 Revert "Tweak title for "App content""
This reverts commit a00e725b0a.

Reason for revert: The string change only for Google Settings instead of
AOSP.

Test: visual
Bug: 133370964

Change-Id: Ib21bff1abc2fd169f957f10154914f85c71d22d1
2019-05-29 17:19:36 +08:00
Mill Chen
a5bbb26dfe Add EID as a synonym to SIM status
We can't use EID as keyword to search for it because EID info is located
in the SIM status dialog in which it's not searchable. EID is added as a
synonym of SIM status to support its search result.

Fixes: 133801685
Test: Settings > Search settings > type "eid"
      then will show "SIM status" search result
Change-Id: I03b49bf6f2951c468440f635d7b211266bb00d83
2019-05-29 07:36:38 +00:00
Yi-Ling Chuang
bef25b52fb Load wallpaper colors in a background thread.
In WallpaperManagerService, it takes some time to load wallpaper colors
from image wallpapers since bitmap decoding will be involved. This will
block the UI thread and lead to app launch latency. So here we are
making it in another thread to avoid this.

Bug: 133396959
Test: robotest, reboot phone and look at boot trace
Change-Id: Ibd1952a4bf10431ba4be4dd69634d64354670daa
2019-05-29 12:02:12 +08:00
Roshan Pius
05df09fe96 Merge "Developer settings: Disable wifi scan throttling" into qt-dev
am: 7b2897ff93

Change-Id: Id2847a87434737fd56c24618dc4b432394e880f7
2019-05-28 16:24:31 -07:00
Roshan Pius
7b2897ff93 Merge "Developer settings: Disable wifi scan throttling" into qt-dev 2019-05-28 23:13:03 +00:00
Amit Mahajan
e0285703b2 Allow renaming inactive subscriptions.
Test: manual
Bug: 132922483
Change-Id: I30b4b88ddf53b917081a57bd9a917a51b4b44ec6
2019-05-28 16:03:55 -07:00
Antony Sargent
c6e07c61d0 Switch to using an intent for eSIM erasing
We initially landed support for erasing an eSIM subscription in
ag/7208624 for b/124254555 using our own confirmation/progress UI, and
calling the EuiccManager.deleteSubscription method to do the
deletion. It turns out this is a low-level API which doesn't handle some
important cases such as subscription grouping or the eSIM slot not being
active.

This CL changes Settings to just launch an intent to begin an eSIM
Manager flow to delete a subscription that provides its own
confirmation/progress UI, and should properly handle subscription
grouping and making the eSIM slot active as needed.

Bug: 132114333
Test: make RunSettingsRoboTests
Change-Id: Ie59fea37fa73c5e6573e1181e271ffb5d453bd08
2019-05-28 15:31:51 -07:00
Antony Sargent
3f48938e03 Merge "Add signal strength icons to multi-SIM header" into qt-dev
am: 42c451610e

Change-Id: I99abda9f54a97f0103c926ded07f027fac1d5482
2019-05-28 14:58:13 -07:00
TreeHugger Robot
42c451610e Merge "Add signal strength icons to multi-SIM header" into qt-dev 2019-05-28 21:54:12 +00:00
tmfang
21d1cab50d Merge "Tweak title for "App content"" into qt-dev
am: e40b0f7b8a

Change-Id: Ifa324de0e653e978743433da44657a5b5e30fd1e
2019-05-28 13:48:28 -07:00
TreeHugger Robot
e40b0f7b8a Merge "Tweak title for "App content"" into qt-dev 2019-05-28 20:31:51 +00:00
Antony Sargent
223c179cd3 Add signal strength icons to multi-SIM header
When a device is in DSDS mode with multiple SIMs, we show a header on
the Network & internet page with a "connectivity overview", with an
entry for Wi-Fi (if connected) and each active SIM. The icon for Wi-Fi
shows signal strength, but the icons for the active SIMs were just
static; this CL fixes that. It introduces a class for listening to
signal strength changes on a set of subscriptions, and moves some
existing code we had for displaying signal strength (when manually
picking networks for GSM) in NetworkOperatorPreference into a utility
method that can be shared.

Bug: 128855095
Test: make RunSettingsRoboTests
Change-Id: I668cafe1e9f9c3651b1f33783c8538ad9c2732b5
2019-05-28 12:49:08 -07:00
Fan Zhang
7b3314ac17 Merge "Fix transparent view issue in page "Erase all data"" into qt-dev
am: 317597ae6a

Change-Id: I1ba4258bc545df55dee5066f3c6e5c72b10b0735
2019-05-28 12:39:29 -07:00
Fan Zhang
317597ae6a Merge "Fix transparent view issue in page "Erase all data"" into qt-dev 2019-05-28 19:23:54 +00:00
Mehdi Alizadeh
5409188e03 Merge "Adds string resources for gesture not supported dialog" into qt-dev
am: 7009b21d74

Change-Id: I4737dfb0132d52780c327b0c8b9fd48f6009b392
2019-05-28 11:33:52 -07:00
Mehdi Alizadeh
7009b21d74 Merge "Adds string resources for gesture not supported dialog" into qt-dev 2019-05-28 18:16:27 +00:00