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
Adam He
83f0d24f67
Profile select only shows with multiple profiles present.
...
Bug: 133328247
Change-Id: Id5d03a1aa74f1789c41af37562848603a90db84f
Test: manual verification
2019-05-29 14:22:22 -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
c28ceeb775
Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034 am: e4ede480d7
...
am: 127f1ebdc1
2019-05-29 13:39:54 -07:00
Antony Sargent
47742e5e5b
Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034 am: 55ac2d75fc
...
am: 694de4f5aa
2019-05-29 13:37:43 -07:00
Antony Sargent
127f1ebdc1
Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034
...
am: e4ede480d7
2019-05-29 13:23:14 -07:00
Antony Sargent
694de4f5aa
Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034
...
am: 55ac2d75fc
2019-05-29 13:22:34 -07:00
Antony Sargent
e4ede480d7
Merge "Switch to using an intent for eSIM erasing" into qt-dev
...
am: f010cb4034
2019-05-29 13:16:31 -07:00
Antony Sargent
55ac2d75fc
Merge "Switch to using an intent for eSIM erasing" into qt-dev
...
am: f010cb4034
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
feaec04896
Merge "Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98 am: 03acd2962e" into qt-r1-dev-plus-aosp
...
am: b2a7a2c7bf
2019-05-29 12:51:10 -07:00
Evan Laird
c8dc95bbaa
Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98 am: f7ad71aab2
...
am: 6dd09d09ea
2019-05-29 12:50:19 -07:00
Android Build Merger (Role)
b2a7a2c7bf
Merge "Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98 am: 03acd2962e" into qt-r1-dev-plus-aosp
2019-05-29 19:44:29 +00:00
Evan Laird
6dd09d09ea
Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98
...
am: f7ad71aab2
2019-05-29 12:44:16 -07:00
Evan Laird
0a06e6ca9b
Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98
...
am: 03acd2962e
2019-05-29 12:44:15 -07:00
Evan Laird
03acd2962e
Merge "Change title to "Alerting"" into qt-dev
...
am: c64d41fd98
2019-05-29 12:40:16 -07:00
Evan Laird
f7ad71aab2
Merge "Change title to "Alerting"" into qt-dev
...
am: c64d41fd98
2019-05-29 12:39:14 -07:00
TreeHugger Robot
c64d41fd98
Merge "Change title to "Alerting"" into qt-dev
2019-05-29 19:19:59 +00:00
Amit Mahajan
502472beaa
Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd am: 355340fd7e
...
am: e7c821a58d
2019-05-29 11:43:34 -07:00
Amit Mahajan
5ec6aca8c3
Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd am: 38b3a56364
...
am: 7670329876
2019-05-29 11:41:12 -07:00
Amit Mahajan
e7c821a58d
Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd
...
am: 355340fd7e
2019-05-29 11:38:00 -07:00
Amit Mahajan
7670329876
Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd
...
am: 38b3a56364
2019-05-29 11:32:05 -07:00
Amit Mahajan
355340fd7e
Merge "Allow renaming inactive subscriptions." into qt-dev
...
am: d133a026cd
2019-05-29 11:28:42 -07:00
Amit Mahajan
38b3a56364
Merge "Allow renaming inactive subscriptions." into qt-dev
...
am: d133a026cd
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
3d06efb9bc
Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce am: 75d207c364
...
am: 3077d8418c
2019-05-29 11:01:49 -07:00
Mill Chen
8ef8c78e11
Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3 am: 7d5050f252
...
am: 3ae11224a9
2019-05-29 10:59:43 -07:00
Julia Reynolds
1fd8f23229
Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce am: 75034e5c20
...
am: 77d0d162a2
2019-05-29 10:48:37 -07:00
Yi Jiang
7605494cc5
Adds contextual cards for screen attention in Settings Homepage
...
Bug: 128527964
Test: atest ContextualAdaptiveSleepSliceTest, maually verified.
Change-Id: Ifaea7d8d4391e91cf6cbde38a2506728f55913d8
2019-05-29 10:37:11 -07:00
Julia Reynolds
3077d8418c
Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce
...
am: 75d207c364
2019-05-29 10:33:19 -07:00
Mill Chen
3ae11224a9
Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3
...
am: 7d5050f252
2019-05-29 10:30:31 -07:00
Mill Chen
0dad405c57
Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3 am: 9ebf7e8ece
...
am: c301af9e32
2019-05-29 10:27:38 -07:00
Julia Reynolds
75d207c364
Merge "Add snooze notification setting" into qt-dev
...
am: b8f7db90ce
2019-05-29 10:24:19 -07:00
Julia Reynolds
77d0d162a2
Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce
...
am: 75034e5c20
2019-05-29 10:23:59 -07:00
Tsung-Mao Fang
dddbe4c1b9
Revert "Tweak title for "App content"" am: 685d247730 am: 6705e45ca6
...
am: 7a794c3720
2019-05-29 10:23:58 -07:00
Tsung-Mao Fang
1c125ab5d5
Revert "Tweak title for "App content"" am: 685d247730 am: 8456765698
...
am: 103ac2d568
2019-05-29 10:20:18 -07:00
Evan Laird
b18ec1958a
Change title to "Alerting"
...
Test: visual
Fixes: 133825282
Change-Id: I08c58328eafdc37ba993d5189c8830e2c00115e6
2019-05-29 13:19:37 -04:00
Julia Reynolds
75034e5c20
Merge "Add snooze notification setting" into qt-dev
...
am: b8f7db90ce
2019-05-29 10:15:46 -07:00
Mill Chen
c301af9e32
Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3
...
am: 9ebf7e8ece
2019-05-29 10:09:20 -07:00
Mill Chen
9ebf7e8ece
Merge "Add EID as a synonym to SIM status" into qt-dev
...
am: 994d7d63d3
2019-05-29 10:04:32 -07:00
Mill Chen
7d5050f252
Merge "Add EID as a synonym to SIM status" into qt-dev
...
am: 994d7d63d3
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
Tsung-Mao Fang
7a794c3720
Revert "Tweak title for "App content"" am: 685d247730
...
am: 6705e45ca6
2019-05-29 09:59:36 -07:00
Tsung-Mao Fang
103ac2d568
Revert "Tweak title for "App content"" am: 685d247730
...
am: 8456765698
2019-05-29 09:57:04 -07:00
Tsung-Mao Fang
6705e45ca6
Revert "Tweak title for "App content""
...
am: 685d247730
2019-05-29 09:48:52 -07: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
2019-05-29 09:45:30 -07:00
