OSDN Git Service
Lei Yu [Wed, 21 Jun 2017 01:10:28 +0000 (01:10 +0000)]
Merge "Update anomaly High usage" into oc-dr1-dev am:
50062193c4
am:
216710961b
Change-Id: Idb6368febae133d373f76cc44eae73776358511b
Lei Yu [Wed, 21 Jun 2017 01:10:08 +0000 (01:10 +0000)]
Merge "Update footer string in battery settings" into oc-dr1-dev am:
eca713c1c2
am:
17b88aca70
Change-Id: Ic4e3802cce4147cf189ce86ecc46d12866467fd8
Lei Yu [Wed, 21 Jun 2017 01:09:45 +0000 (01:09 +0000)]
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev am:
65afc6f86b
am:
76b09dfae5
Change-Id: I640153489cb5aa42f589a4320b4de6d557ddf986
Lei Yu [Wed, 21 Jun 2017 01:06:55 +0000 (01:06 +0000)]
Merge "Update anomaly High usage" into oc-dr1-dev
am:
50062193c4
Change-Id: I5de568b3397dc18ee800aa866b883fe33dcb3d95
Lei Yu [Wed, 21 Jun 2017 01:03:41 +0000 (01:03 +0000)]
Merge "Update anomaly High usage" into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 01:03:15 +0000 (01:03 +0000)]
Merge "Update footer string in battery settings" into oc-dr1-dev
am:
eca713c1c2
Change-Id: Iaaa78a3742a91f7d2d4e0a2edd361589fb340a39
Lei Yu [Wed, 21 Jun 2017 01:02:56 +0000 (01:02 +0000)]
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
am:
65afc6f86b
Change-Id: Ie4169d421e4c31e0e4eb780a9b1c8b3921db3fd4
Lei Yu [Wed, 21 Jun 2017 00:52:06 +0000 (00:52 +0000)]
Merge "Update footer string in battery settings" into oc-dr1-dev
Lei Yu [Wed, 21 Jun 2017 00:51:30 +0000 (00:51 +0000)]
Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
Kevin Chyn [Tue, 20 Jun 2017 23:47:27 +0000 (23:47 +0000)]
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev am:
b4bbc52e27
am:
57d52c6b50
Change-Id: Iec562ad11b1ca6488dff21bac38c4983b2db1ca4
Fan Zhang [Tue, 20 Jun 2017 23:44:21 +0000 (23:44 +0000)]
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev am:
58d27eef9a
am:
1d3f5e55cd
Change-Id: I1f0bd8ed2dcedb9add6c63d1ab72ce30fb93ca70
Kevin Chyn [Tue, 20 Jun 2017 23:38:12 +0000 (23:38 +0000)]
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev
am:
b4bbc52e27
Change-Id: I7d9ba9fb5b1bd75a3565963bc13b82606761970b
TreeHugger Robot [Tue, 20 Jun 2017 23:36:25 +0000 (23:36 +0000)]
Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev
Fan Zhang [Tue, 20 Jun 2017 23:34:24 +0000 (23:34 +0000)]
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev
am:
58d27eef9a
Change-Id: I352415bd83dccd9f86cf9017816d5858b0afbedb
jackqdyulei [Tue, 20 Jun 2017 23:30:24 +0000 (23:30 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev am:
05777a7918 am:
7de9af3b8f
am:
b7c8809d3b
Change-Id: I1d55f21e8eb11aea2d88128179381e5055d8577a
jackqdyulei [Tue, 20 Jun 2017 23:29:53 +0000 (23:29 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev am:
05777a7918 am:
9d0d6e4fcc
am:
4b5a6a5284
Change-Id: Ieff7f23d06a16ff225cea8bebc31c6b2e0d8ee97
jackqdyulei [Tue, 20 Jun 2017 23:29:33 +0000 (23:29 +0000)]
Merge "Refine Anomaly detail page" into oc-dr1-dev am:
aad82fa4ee
am:
4d75698dac
Change-Id: I8c54da995f49826a982937f1c464a6e142ec43c2
TreeHugger Robot [Tue, 20 Jun 2017 23:23:38 +0000 (23:23 +0000)]
Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev
jackqdyulei [Tue, 20 Jun 2017 23:11:47 +0000 (23:11 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev am:
05777a7918
am:
7de9af3b8f
Change-Id: I7230df797ff3cc6435d9145527bc962a0df9deb3
jackqdyulei [Tue, 20 Jun 2017 23:05:34 +0000 (23:05 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev am:
05777a7918
am:
9d0d6e4fcc
Change-Id: If6960f114f3d42e95061a8e832f9b99695c2bd7f
jackqdyulei [Tue, 20 Jun 2017 23:03:00 +0000 (23:03 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev
am:
05777a7918
Change-Id: I2c12178379cfed44d6007533f420c7611038bfed
jackqdyulei [Tue, 20 Jun 2017 22:55:47 +0000 (22:55 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev
am:
05777a7918
Change-Id: If676ec0119bebed800727f618225fd355e9da74f
jackqdyulei [Tue, 20 Jun 2017 22:36:50 +0000 (22:36 +0000)]
Merge "Refine Anomaly detail page" into oc-dr1-dev
am:
aad82fa4ee
Change-Id: I0537ea1cd0c318d7c03a3a40865dcda7ea126c6b
TreeHugger Robot [Tue, 20 Jun 2017 22:35:57 +0000 (22:35 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev
TreeHugger Robot [Tue, 20 Jun 2017 22:14:53 +0000 (22:14 +0000)]
Merge "Refine Anomaly detail page" into oc-dr1-dev
Lei Yu [Tue, 20 Jun 2017 21:26:02 +0000 (21:26 +0000)]
Merge "Update battery footer text" into oc-dr1-dev am:
2c986d9b94
am:
b8d9cacae5
Change-Id: I1b697d40d8fc12ba0825fed2436ac79252a2311f
Kevin Chyn [Tue, 20 Jun 2017 21:24:43 +0000 (14:24 -0700)]
FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT
Fixes:
62681560
Test: open fingerprint settings, use an unenrolled fingerprint to
authenticate 20 times in a row. Look at logs and it shouldn't be flooded
with fingerprint logs
Change-Id: I59051e8d3a9e040bcd894e956abcbf0497838988
Lei Yu [Tue, 20 Jun 2017 21:10:07 +0000 (21:10 +0000)]
Merge "Update battery footer text" into oc-dr1-dev
am:
2c986d9b94
Change-Id: I7f5ed8710ba55def643a6f17240d5b0adc25d9ca
jackqdyulei [Tue, 20 Jun 2017 21:08:29 +0000 (14:08 -0700)]
Update footer string in battery settings
Bug:
62422269
Test: Screenshot
Change-Id: I4b2e7c40c09878562c4fe2e8a3e8117be7ffc6fd
Lei Yu [Tue, 20 Jun 2017 20:58:29 +0000 (20:58 +0000)]
Merge "Update battery footer text" into oc-dr1-dev
jackqdyulei [Tue, 20 Jun 2017 00:01:47 +0000 (17:01 -0700)]
Only update anomaly icon in AnomalyLoader
Before this cl, it will re-calculate battery percentage once we get
anomaly data, which will add screen usage data twice. This cl make it
only update anomaly icon after the anomaly detection is done.
Bug:
62803379
Test: RunSettingsRoboTests
Change-Id: I2089646679e299fa948b1f3ed21f4a13a1317aa3
jackqdyulei [Tue, 20 Jun 2017 20:34:51 +0000 (13:34 -0700)]
Hide wifi and bt in battery settings
Hide them in app usage list but don't smear them
Bug:
62787787
Test: RunSettingsRoboTests
Change-Id: I43c15ea8a2b32f293eb859f3fead8666e45674ef
Maurice Lam [Tue, 20 Jun 2017 20:11:58 +0000 (20:11 +0000)]
Merge "Read setup wizard theme from system properties" into oc-dr1-dev am:
1fe5766e30
am:
7a665455de
Change-Id: I3ba7e7df48d0dd1fb0593127dcc6b13ebefbea58
Maurice Lam [Tue, 20 Jun 2017 20:11:29 +0000 (20:11 +0000)]
Merge "Align fingerprint illustration size" into oc-dr1-dev am:
3065eeff42
am:
84f1031a62
Change-Id: Ib537e8cd499806660673f656f22c1a3da40d5b74
Maurice Lam [Tue, 20 Jun 2017 20:07:30 +0000 (20:07 +0000)]
Merge "Read setup wizard theme from system properties" into oc-dr1-dev
am:
1fe5766e30
Change-Id: I0e8335e937342bbb1639c24cb44b25639e005b32
Maurice Lam [Tue, 20 Jun 2017 20:07:02 +0000 (20:07 +0000)]
Merge "Align fingerprint illustration size" into oc-dr1-dev
am:
3065eeff42
Change-Id: I84c1be2200cf0af4386035c59ec7b0a40a6b6004
Maurice Lam [Tue, 20 Jun 2017 19:57:16 +0000 (19:57 +0000)]
Merge "Read setup wizard theme from system properties" into oc-dr1-dev
Maurice Lam [Tue, 20 Jun 2017 19:56:49 +0000 (19:56 +0000)]
Merge "Align fingerprint illustration size" into oc-dr1-dev
TreeHugger Robot [Tue, 20 Jun 2017 19:33:19 +0000 (19:33 +0000)]
Merge "Clarify "importance" settings for apps not targeting O."
Doris Ling [Tue, 20 Jun 2017 19:07:53 +0000 (19:07 +0000)]
Merge "Add Account.name to the tile's intent."
jackqdyulei [Mon, 19 Jun 2017 17:55:20 +0000 (10:55 -0700)]
Update anomaly High usage
Update the title and summary for anomaly summary preference.
Bug:
62791930
Test: RunSettingsRoboTests
Change-Id: I30ac554f227904c102d0903505e3a99966f50581
jackqdyulei [Fri, 16 Jun 2017 22:03:09 +0000 (15:03 -0700)]
Refine Anomaly detail page
1. Fix the layout issue(title not vertical horizontal)
2. Add subtitle for anomaly
Bug:
36924669
Test: RunSettingsRoboTests
Change-Id: I9b3627f09bbe37b104644d203ff8924f0faaea47
Alison Cichowlas [Tue, 20 Jun 2017 17:30:51 +0000 (13:30 -0400)]
Clarify "importance" settings for apps not targeting O.
Bug:
37041902
Test: strings only; manually tested.
Change-Id: Idfa756b5f2aacf41b82192d4a40f76d5a45c722b
jackqdyulei [Tue, 20 Jun 2017 17:11:06 +0000 (10:11 -0700)]
Update battery footer text
Bug:
62422269
Test: Build
Change-Id: I9cb5edbde3c33a29edfbe03706dd2d71be6a2be0
Fan Zhang [Mon, 19 Jun 2017 19:31:30 +0000 (12:31 -0700)]
Add logging when entity header buttons are clicked
Change-Id: I673e5b4a6c5f8736bbec72e259a82acb3f514828
Fix:
62709062
Test: make RunSettingsRoboTests
Sean Stout [Thu, 18 May 2017 20:39:25 +0000 (13:39 -0700)]
Add Night Light Suggestion and tests
Night Light settings suggestion will only show when the user
has not previously interacted with Night Light.
Bug:
37207263
Test: make ROBOTEST_FILTER=\
"(SettingsSuggestionsTest|SuggestionFeatureProviderImplTest)"\
RunSettingsRoboTests
Change-Id: I432d5fef19f5e4a52503da136b044598cb82164a
Maurice Lam [Thu, 25 May 2017 04:14:49 +0000 (21:14 -0700)]
Read setup wizard theme from system properties
Test: cd tests/robotests && mma
Bug:
62060286
Change-Id: I285638736efa63314fa3e055f72ac021bce40bfe
Fan Zhang [Mon, 19 Jun 2017 23:45:43 +0000 (23:45 +0000)]
Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev am:
6dfafa5d95
am:
f66702c930
Change-Id: Iaa8dde8ae93cf895001505e84907dfa60b9079f1
Fan Zhang [Mon, 19 Jun 2017 23:33:13 +0000 (23:33 +0000)]
Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev
am:
6dfafa5d95
Change-Id: I9f17e8f5f3ffe084567c7be7743cc7b62a4e482d
TreeHugger Robot [Mon, 19 Jun 2017 23:21:12 +0000 (23:21 +0000)]
Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev
TreeHugger Robot [Mon, 19 Jun 2017 23:07:18 +0000 (23:07 +0000)]
Merge "Keep candidates in radio button picker UI ordered"
Fan Zhang [Mon, 19 Jun 2017 22:13:11 +0000 (22:13 +0000)]
Merge "Update gesture title" into oc-dr1-dev am:
e54e0d394e
am:
d4402d221b
Change-Id: Iec3e06a5e9959d104f9c6f225adc2d5979e7ed92
Fan Zhang [Mon, 19 Jun 2017 22:07:03 +0000 (22:07 +0000)]
Merge "Update gesture title" into oc-dr1-dev
am:
e54e0d394e
Change-Id: I1684228f7223342491233f1a68b3c5d5f9ef85ed
TreeHugger Robot [Mon, 19 Jun 2017 21:58:58 +0000 (21:58 +0000)]
Merge "Update gesture title" into oc-dr1-dev
Lei Yu [Mon, 19 Jun 2017 21:45:40 +0000 (21:45 +0000)]
Merge "Hook up bt related knobs to AnomalyDetectionPolicy" into oc-dr1-dev am:
43ea43a6e5
am:
03ea4110ae
Change-Id: I413bc39f7d78999d5a49a771c5215dc2d2d2d4d4
jackqdyulei [Mon, 19 Jun 2017 21:45:08 +0000 (21:45 +0000)]
Merge "Add anomaly detector for unoptimized bt scanning" into oc-dr1-dev am:
37da099df1
am:
ba61248568
Change-Id: I2e94b72d66f26814822dbf73865e3e4cb8b38237
Lei Yu [Mon, 19 Jun 2017 21:30:18 +0000 (21:30 +0000)]
Merge "Hook up bt related knobs to AnomalyDetectionPolicy" into oc-dr1-dev
am:
43ea43a6e5
Change-Id: Ie2e58d02d9fe1a68a8583ad31158df68384cfa91
jackqdyulei [Mon, 19 Jun 2017 21:29:32 +0000 (21:29 +0000)]
Merge "Add anomaly detector for unoptimized bt scanning" into oc-dr1-dev
am:
37da099df1
Change-Id: I76dccf645d50c1160010ad59607a4ffeba6a3035
Lei Yu [Mon, 19 Jun 2017 21:16:03 +0000 (21:16 +0000)]
Merge "Hook up bt related knobs to AnomalyDetectionPolicy" into oc-dr1-dev
TreeHugger Robot [Mon, 19 Jun 2017 21:13:04 +0000 (21:13 +0000)]
Merge "Add anomaly detector for unoptimized bt scanning" into oc-dr1-dev
Fan Zhang [Mon, 19 Jun 2017 21:07:23 +0000 (14:07 -0700)]
Add help url placeholder for SimLock settings
Bug:
38412798
Test: manual
Change-Id: I77a8fa89c2b16da9269b40c5efcb6d0f868d5b76
Fan Zhang [Mon, 19 Jun 2017 20:34:39 +0000 (13:34 -0700)]
Keep candidates in radio button picker UI ordered
We will use the order from candidate list.
Change-Id: I3f5bfb9d603d6c926fddd4711e2899df10cb72ac
Fix:
37542504
Test: make RunSettingsRoboTests
Fan Zhang [Mon, 19 Jun 2017 19:45:20 +0000 (12:45 -0700)]
Update gesture title
Change-Id: I95de69c0b7a8c1bda4781c33aaf025b3ec5c275b
Fix:
36685646
Test: visual
Doris Ling [Tue, 13 Jun 2017 23:50:46 +0000 (16:50 -0700)]
Add Account.name to the tile's intent.
For dynamic tiles that are displayed in specific account type, add the
account name to the tile's intent so that when we launch the preference,
it can associate with the correct account.
Change-Id: I25f76c1b5710f525634983d00832c9a68cdeeebb
Fix:
62365341
Test: make RunSettingsRoboTests
jackqdyulei [Thu, 15 Jun 2017 22:30:44 +0000 (15:30 -0700)]
Hook up bt related knobs to AnomalyDetectionPolicy
This cl adds the following knobs:
1. bluetoothScanDetectionEnabled: whether to enable this detector
2. bluetoothScanThreshold: threshold about bt unoptimized scanning
time in background
Also add the default values for these knobs, which are:
1. bluetoothScanDetectionEnabled: true
2. bluetoothScanThreshold: 30 minutes
Bug:
36921532
Test: RunSettingsRoboTests
Change-Id: I7619453ebe3cc3f5a13b3bbd4fbf3b65a1f1d45c
jackqdyulei [Thu, 15 Jun 2017 20:13:09 +0000 (13:13 -0700)]
Add anomaly detector for unoptimized bt scanning
This cl detects bt anomaly by using
BluetoothUnoptimizedScanBackgroundTimer. It will report anomaly
if total duration is longer than threshold.
Future cl will hook up the threshold to server side.
Bug:
36921532
Test: RunSettingsRoboTests
Change-Id: I5d6a42b2d2c4fec94387ca59ba8e6a2f3346d047
Daniel Nishi [Mon, 19 Jun 2017 18:12:24 +0000 (18:12 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev am:
4743423a82 am:
f2e4449f6f
am:
d641c064af
Change-Id: Idf9929d54b2625a7561ccd44d251fb68b99bb8fe
Daniel Nishi [Mon, 19 Jun 2017 18:11:59 +0000 (18:11 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev am:
4743423a82 am:
2de5ab35f8
am:
72e8d24c10
Change-Id: I4606ad001b3742b8b9eec7d21c7296b0010b2430
Alison Cichowlas [Mon, 19 Jun 2017 18:11:30 +0000 (18:11 +0000)]
Merge "Notification settings update." into oc-dev am:
e5493808fd -s ours am:
e79681c5b4 -s ours
am:
2338ef6794 -s ours
Change-Id: I937d3122c5606d13805b53c1e7b9ac73590f8e0a
Daniel Nishi [Mon, 19 Jun 2017 18:01:18 +0000 (18:01 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev am:
4743423a82
am:
f2e4449f6f
Change-Id: I51f05270e35631473f127018cc626587c56b45ce
Daniel Nishi [Mon, 19 Jun 2017 18:00:36 +0000 (18:00 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev am:
4743423a82
am:
2de5ab35f8
Change-Id: Ib952ba6b05373995a95eac4955f75b3347c368a7
Alison Cichowlas [Mon, 19 Jun 2017 18:00:21 +0000 (18:00 +0000)]
Merge "Notification settings update." into oc-dev am:
e5493808fd am:
7cdc518674 -s ours
am:
f1ca862c5a -s ours
Change-Id: Ia3c60d6751471431432c7b27206b59b22c417958
Alison Cichowlas [Mon, 19 Jun 2017 17:59:58 +0000 (17:59 +0000)]
Merge "Notification settings update." into oc-dev am:
e5493808fd -s ours
am:
e79681c5b4 -s ours
Change-Id: I474100a5e3bfad5ad9e9f09b44a8bf0fdc0b4814
Julia Reynolds [Mon, 19 Jun 2017 17:59:00 +0000 (17:59 +0000)]
Merge "Migrate from setting to NotificationManager."
Daniel Nishi [Mon, 19 Jun 2017 17:55:30 +0000 (17:55 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev
am:
4743423a82
Change-Id: Ia2c95906c0c526f426deaa243ff075ce70bee1fc
Daniel Nishi [Mon, 19 Jun 2017 17:55:28 +0000 (17:55 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev
am:
4743423a82
Change-Id: I59630cf77da700cd5a159e11ac6f9818f1303199
Alison Cichowlas [Mon, 19 Jun 2017 17:54:47 +0000 (17:54 +0000)]
Merge "Notification settings update." into oc-dev am:
e5493808fd
am:
7cdc518674 -s ours
Change-Id: Ia4b989c4b3459d7ea1b76fa167f034844fc8159a
Alison Cichowlas [Mon, 19 Jun 2017 17:49:22 +0000 (17:49 +0000)]
Merge "Notification settings update." into oc-dev
am:
e5493808fd -s ours
Change-Id: I43f0d112d2a5bbd57995e42d50f5877e905dfe20
Alison Cichowlas [Mon, 19 Jun 2017 17:49:20 +0000 (17:49 +0000)]
Merge "Notification settings update." into oc-dev
am:
e5493808fd
Change-Id: I0d1b48669d85b6c1289c50a2a84aaa2dc292ea2a
gaochong [Mon, 19 Jun 2017 17:48:52 +0000 (17:48 +0000)]
Merge "Fix Screen Magnification recursive draw" am:
4e7846fbe4 am:
db233c6e88 am:
dd3945eca5
am:
aedbdd0df5
Change-Id: I79dff482bf2e1b0013c9641b8d05c0b38e0663a5
Lei Yu [Mon, 19 Jun 2017 17:47:35 +0000 (17:47 +0000)]
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev am:
d55579889a
am:
5350ec84c6
Change-Id: I266271d5514f03bbb77fcb8c07cb53387fb1ec39
Daniel Nishi [Mon, 19 Jun 2017 17:45:30 +0000 (17:45 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 17:34:39 +0000 (17:34 +0000)]
Merge "Notification settings update." into oc-dev
gaochong [Mon, 19 Jun 2017 17:24:00 +0000 (17:24 +0000)]
Merge "Fix Screen Magnification recursive draw" am:
4e7846fbe4 am:
db233c6e88
am:
dd3945eca5
Change-Id: Idb43358ecaa0ab0b04c59f255c75476857a5fb5d
Lei Yu [Mon, 19 Jun 2017 17:22:57 +0000 (17:22 +0000)]
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
am:
d55579889a
Change-Id: I5c689e2f50f06c6501a771dd957e4408e888a092
gaochong [Mon, 19 Jun 2017 17:12:41 +0000 (17:12 +0000)]
Merge "Fix Screen Magnification recursive draw" am:
4e7846fbe4
am:
db233c6e88
Change-Id: If8a23a012e0b7a82dc0c6a7d349a15310b4eb43e
gaochong [Mon, 19 Jun 2017 17:07:37 +0000 (17:07 +0000)]
Merge "Fix Screen Magnification recursive draw"
am:
4e7846fbe4
Change-Id: I4890ba0d33dd9245f1393c59c77531f0597ff6ff
Lei Yu [Mon, 19 Jun 2017 17:03:28 +0000 (17:03 +0000)]
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
Treehugger Robot [Mon, 19 Jun 2017 17:00:07 +0000 (17:00 +0000)]
Merge "Fix Screen Magnification recursive draw"
Alison Cichowlas [Fri, 16 Jun 2017 17:56:56 +0000 (13:56 -0400)]
Notification settings update.
- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.
Bug:
62705435
Test: make RunSettingsRoboTests; manual verification
Merged-In: Iac31575d894d7f3532c8e631ee9d77ee21830b29
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
Alison Cichowlas [Mon, 19 Jun 2017 15:15:31 +0000 (15:15 +0000)]
Merge "Notification settings update." into oc-dr1-dev am:
cd9224a058
am:
eeda4ae540
Change-Id: I3139992a754e69e8ef1e2da858403a0e3b3f3b79
Alison Cichowlas [Mon, 19 Jun 2017 15:10:02 +0000 (15:10 +0000)]
Merge "Notification settings update." into oc-dr1-dev
am:
cd9224a058
Change-Id: I22d96e1d02f9a5a19f0eae1db368ad71d9de9b7b
Alison Cichowlas [Mon, 19 Jun 2017 15:02:15 +0000 (15:02 +0000)]
Merge "Notification settings update." into oc-dr1-dev
Fan Zhang [Mon, 19 Jun 2017 14:59:03 +0000 (14:59 +0000)]
Merge "Misc fixes for notification" into oc-dev am:
e3f322dfc7 am:
8d62516e89 -s ours
am:
411e99a793 -s ours
Change-Id: Iac2feeee7ab758c9534522bf49b8aaa7f20620aa
Fan Zhang [Mon, 19 Jun 2017 14:58:33 +0000 (14:58 +0000)]
Merge "Misc fixes for notification" into oc-dev am:
e3f322dfc7 -s ours am:
c15dd4ee9b -s ours
am:
5b3bc0e1d8 -s ours
Change-Id: I09fcb2c2270b17a4de1e2f19b5c6f0cf37bd0758
Fan Zhang [Mon, 19 Jun 2017 14:54:00 +0000 (14:54 +0000)]
Merge "Misc fixes for notification" into oc-dev am:
e3f322dfc7
am:
8d62516e89 -s ours
Change-Id: I64db01eb7d3d9f2fd6e951383b62f79032c7f9e4
Fan Zhang [Mon, 19 Jun 2017 14:53:02 +0000 (14:53 +0000)]
Merge "Misc fixes for notification" into oc-dev am:
e3f322dfc7 -s ours
am:
c15dd4ee9b -s ours
Change-Id: Ib0cbd32dc877e3863de88bdebd26c693235e1c1e
Fan Zhang [Mon, 19 Jun 2017 14:47:34 +0000 (14:47 +0000)]
Merge "Misc fixes for notification" into oc-dev
am:
e3f322dfc7
Change-Id: I0847813623ad35b38eafc73a69f02d45208e8d32
Fan Zhang [Mon, 19 Jun 2017 14:47:33 +0000 (14:47 +0000)]
Merge "Misc fixes for notification" into oc-dev
am:
e3f322dfc7 -s ours
Change-Id: Ifef5d6fe32b61837fb03285cdc46744954b246ad
TreeHugger Robot [Mon, 19 Jun 2017 14:39:18 +0000 (14:39 +0000)]
Merge "Misc fixes for notification" into oc-dev
OSDN Git Service
