Commit Graph

9172 Commits

Author SHA1 Message Date
Joel Galenson
d8efe209f7 Merge "Remove Permissions Hub." into qt-dev
am: 63088840c4

Change-Id: I4d086debe20235d132fd62d96441c358ffe01b48
2019-05-31 06:07:30 -07:00
Joel Galenson
58246f66db Merge "Remove Permissions Hub." into qt-dev
am: 63088840c4

Change-Id: I59cef5b593630d75b6db51ae324c94f9dc3a8841
2019-05-31 06:07:29 -07:00
TreeHugger Robot
63088840c4 Merge "Remove Permissions Hub." into qt-dev 2019-05-31 13:02:12 +00:00
TreeHugger Robot
c0fbb533d2 Merge "Guard NPE when using search view" 2019-05-31 04:27:43 +00:00
Colin Cross
dc67600f18 Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d am: 2d7cf1d924
am: cde28793cd

Change-Id: I83e1cf3c191023b056c7f20e0f31577fd311e7ca
2019-05-30 20:46:28 -07:00
Colin Cross
cde28793cd Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d
am: 2d7cf1d924

Change-Id: I17cd8ae5326176f8451fd81af0d468326403a9ed
2019-05-30 20:28:58 -07:00
Colin Cross
2d7cf1d924 Merge "Make test_options.timeout an int64" am: c56651b345
am: 001b1c556d

Change-Id: I3ed30fbfadfd6c821bb7246d0abba19b9fb00ce6
2019-05-30 20:24:25 -07:00
tmfang
f841748be3 Guard NPE when using search view
Test: This crash pattern was observed from monkey test, I can't reproduce it.
So, just rebuild rom.
Fixes: 132819226

Change-Id: I0726524dcf8e1622d64f75c17b3600a7440b58c2
2019-05-31 10:47:30 +08:00
Fan Zhang
ec81d6121e Override 2 getSliceUri() instance to return platform slice
Bug: 126222433
Test: robotest
Change-Id: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
2019-05-30 16:50:43 -07:00
Fan Zhang
f36ca50ec7 Add slice uri to slice index db
And slightly refactored the SliceDataConverter to remove 1 reflection.

Bug: 126222433
Test: robotest
Change-Id: Ic5782bdd71f5c9cb77879a35de81dc61c01d1912
2019-05-30 16:47:31 -07:00
Alex Salo
88e3adce68 Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev am: fa127bd6f7
am: ac7851e1ce

Change-Id: Id621a398191568a76ed1e5bce00a63ad48a22f86
2019-05-30 16:31:17 -07:00
Alex Salo
ac7851e1ce Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
am: fa127bd6f7

Change-Id: Ie61452dd21b1d3d6183edab66c01b51d39c008da
2019-05-30 16:12:36 -07:00
Alex Salo
fa127bd6f7 Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev 2019-05-30 22:59:12 +00:00
Christine Franks
2adf1f213d Merge "Add SIM color picker" into qt-dev am: b747c5c270 am: c1c4a0858d
am: 3ccc01ca18

Change-Id: I0e2c4d96df27e71d11b8a092f2cf86733d29727b
2019-05-30 14:09:41 -07:00
Christine Franks
3ccc01ca18 Merge "Add SIM color picker" into qt-dev am: b747c5c270
am: c1c4a0858d

Change-Id: I0c4ac5abe7be3eeb2df324b41f13284ed25dea95
2019-05-30 13:35:49 -07:00
Christine Franks
02c4e123b7 Merge "Add SIM color picker" into qt-dev
am: b747c5c270

Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
2019-05-30 13:26:55 -07:00
Christine Franks
c1c4a0858d Merge "Add SIM color picker" into qt-dev
am: b747c5c270

Change-Id: Ia234bd596017cf98dd5a76202c6fe7af486562f4
2019-05-30 13:20:46 -07:00
Christine Franks
b747c5c270 Merge "Add SIM color picker" into qt-dev 2019-05-30 20:01:48 +00:00
Lei Yu
ebdca63be8 Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d am: 949c937fce
am: 2dd116845a

Change-Id: I8f7c3467362d2e4662c0a7ad9649a2b1ab505c07
2019-05-30 11:44:04 -07:00
Colin Cross
02ce47c2a1 Make test_options.timeout an int64
Test: m RunSettingsRoboTests
Change-Id: I979268540fb50a22316223f432d3c6cbb259f61a
2019-05-30 11:32:07 -07:00
Lei Yu
2dd116845a Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d
am: 949c937fce

Change-Id: Ied1099bc8d4781e6b804e53cb04b61614543cb9a
2019-05-30 11:10:41 -07:00
Lei Yu
949c937fce Merge "Update SliceView when slice is null" into qt-dev
am: f32025a17d

Change-Id: Ic68f9ecae701ed79e11401ec089cf02ab786c4ad
2019-05-30 11:00:47 -07:00
Lei Yu
e74d9b438c Merge "Update SliceView when slice is null" into qt-dev
am: f32025a17d

Change-Id: I3ada32a9c34ded2d1324228314272030b6f6b489
2019-05-30 11:00:45 -07:00
Fan Zhang
2f9c6ca6af Merge "Add interface and extend db to support storing slice uris" 2019-05-30 17:56:34 +00:00
Lei Yu
f32025a17d Merge "Update SliceView when slice is null" into qt-dev 2019-05-30 17:38:59 +00:00
Joel Galenson
1e7c172ad5 Remove Permissions Hub.
Bug: 132292477
Test: View all related screens.
Change-Id: Ic0e890e04f210f3be3eb80c95e398a40a8062001
2019-05-30 08:30:49 -07:00
Raff Tsai
c30e3ae727 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev am: fde0bee473 am: ce6c934609
am: f19cab831a

Change-Id: I3b19911c37631acaec09a347c64512d68989429b
2019-05-30 03:05:15 -07:00
Raff Tsai
f19cab831a Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev am: fde0bee473
am: ce6c934609

Change-Id: I30e96444b838eb3026245fafd09fcc9e45bac964
2019-05-30 03:01:05 -07:00
Raff Tsai
7d0518bdfa Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev
am: fde0bee473

Change-Id: I979bf482e49c1961b68c9d1f29f2fd4a7d53368c
2019-05-30 02:57:00 -07:00
Raff Tsai
ce6c934609 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev
am: fde0bee473

Change-Id: Iafe2e30e1fb3bb80c17f2ef651b41d5e8b458a38
2019-05-30 02:56:45 -07:00
TreeHugger Robot
fde0bee473 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev 2019-05-30 09:39:33 +00:00
Raff Tsai
1a2b34b625 Fix IllegalArgumentException in AudioHelper
Audio streams for phone calls in BT device (STREAM_VOICE_CALL) is not
supported in AudioManager.getStreamMinVolume(), fallback to use
STREAM_VOICE_CALL

Fixes: 133812547
Test: make RunSettingsRoboTests
Change-Id: I8e330f60bae2a7cf9cd0cf7288076b8320ccc504
2019-05-30 16:18:37 +08:00
Sunny Shao
33a45255d9 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519 am: 9c4fb7ea1d
am: 27f5a01cef

Change-Id: I4296880c339aecf93ddaa57cafeb04815b6e40e3
2019-05-30 00:08:59 -07:00
Lucas Dupin
d5d76a95ec Merge "Add setting to bypass lock screen" into qt-r1-dev am: 0783505433
am: a44a66f52a

Change-Id: I8164b1e3e6f32896710268d481b7fec593602fd3
2019-05-30 00:06:11 -07:00
Sunny Shao
27f5a01cef Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519
am: 9c4fb7ea1d

Change-Id: I2e74ff23833524c00f7fa5730199ce15bd662959
2019-05-30 00:05:20 -07:00
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
Sunny Shao
9c4fb7ea1d Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev
am: 3d16fc9519

Change-Id: I9bd04562a2d86e80c5401434eef5c45baaa6be87
2019-05-30 00:00:22 -07:00
Lucas Dupin
a44a66f52a Merge "Add setting to bypass lock screen" into qt-r1-dev
am: 0783505433

Change-Id: I533383a4e7c9ecc068c24cd55647c55487dfd5a6
2019-05-30 00:00:13 -07:00
Lucas Dupin
0783505433 Merge "Add setting to bypass lock screen" into qt-r1-dev 2019-05-30 06:50: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
Lucas Dupin
b2aaa26f38 Add setting to bypass lock screen
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockscreenBypassPreferenceControllerTest
Bug: 130327302
Change-Id: I324c6e384480fa8576ba58d0bf73c1ef20484ee0
2019-05-29 15:57:32 -07:00
Fan Zhang
225da1517c Add interface and extend db to support storing slice uris
Bug: 126222433
Test: manual
Change-Id: Ie81e69477d297aa96a0daad02d56196c956271a3
2019-05-29 15:41:15 -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
47742e5e5b Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034 am: 55ac2d75fc
am: 694de4f5aa

Change-Id: If06e0c1bd794b7f056f17da42f8e1b1904066c8f
2019-05-29 13:37:43 -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
Julia Reynolds
1fd8f23229 Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce am: 75034e5c20
am: 77d0d162a2

Change-Id: Icc3ba989ee166713cb9c1bf872f96c2c139fd4e1
2019-05-29 10:48:37 -07:00