OSDN Git Service
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: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
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
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: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
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
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
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: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
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: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 19:45:20 +0000 (12:45 -0700)]
Update gesture title
Change-Id: I95de69c0b7a8c1bda4781c33aaf025b3ec5c275b
Fix:
36685646
Test: visual
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: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 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
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
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: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: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
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
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
gaochong [Wed, 14 Jun 2017 13:51:11 +0000 (21:51 +0800)]
Fix Screen Magnification recursive draw
When invoke the method View#setLayoutParams(), ViewRootImpl
will run method ViewRootImpl#performTraversals(). And
OnGlobalLayoutListener#onGlobalLayout() will be invoked.
When the method View#setLayoutParams() is invoked in
OnGlobalLayoutListener#onGlobalLayout(), there will be recursive
call. The view will be draw on and on. This situation happen in
Screen Magnification. It should remove the listener after
work completion.
Bug: https://issuetracker.google.com/issues/
62613000
Test: use systrace when enter Screen Magnification,and view the
"traversal" times.
Change-Id: I01b1fcccb8b915ec436fb95f1d30c8ec0c0de0a9
Signed-off-by: gaochong <gaochong@xiaomi.com>
Bill Yi [Sat, 17 Jun 2017 06:25:30 +0000 (06:25 +0000)]
Import translations. DO NOT MERGE am:
251cbcbcc5 -s ours
am:
3d6acb722c -s ours
Change-Id: I6504b98738a17e027a7fb77dbdbdce4b8fa8fa6a
Bill Yi [Sat, 17 Jun 2017 06:16:44 +0000 (06:16 +0000)]
Import translations. DO NOT MERGE am:
251cbcbcc5 -s ours
am:
a09c96c1a5 -s ours
Change-Id: If4cd48f7385e36f9473e171824e7fe96c63ab338
Bill Yi [Sat, 17 Jun 2017 06:14:17 +0000 (06:14 +0000)]
Import translations. DO NOT MERGE
am:
251cbcbcc5 -s ours
Change-Id: Iac1be0f9462447d5935664f5f111a2d721237436
Bill Yi [Sat, 17 Jun 2017 06:14:14 +0000 (06:14 +0000)]
Import translations. DO NOT MERGE
am:
251cbcbcc5 -s ours
Change-Id: I068211d35ea2f411c996daa834d09c49db78b80a
Bill Yi [Sat, 17 Jun 2017 06:07:14 +0000 (06:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
fa8fa0d212 -s ours
Change-Id: I44db74c9ae9d6b236ee4f068dac9fdcfd190c3e0
TreeHugger Robot [Sat, 17 Jun 2017 06:00:19 +0000 (06:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Maurice Lam [Sat, 17 Jun 2017 04:34:34 +0000 (21:34 -0700)]
Align fingerprint illustration size
Test: Manual
Bug:
62677095
Change-Id: I352bf5e20f4ce254d0777dfd544f4604f5c86dcb
Fan Zhang [Sat, 17 Jun 2017 00:50:49 +0000 (00:50 +0000)]
Merge "Hide app info button from app notification settings header" into oc-dr1-dev
am:
9b4bb95e82
Change-Id: Ie9d8419b88c3bb97eca24e6037c8e46ab8fc8489
TreeHugger Robot [Sat, 17 Jun 2017 00:41:22 +0000 (00:41 +0000)]
Merge "Hide app info button from app notification settings header" into oc-dr1-dev
Maurice Lam [Sat, 17 Jun 2017 00:20:54 +0000 (00:20 +0000)]
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev
am:
2b836b0c0c
Change-Id: I8229328b2d1ab55c76cf939b55d8528f511dfcda
TreeHugger Robot [Sat, 17 Jun 2017 00:07:38 +0000 (00:07 +0000)]
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev
Fan Zhang [Fri, 16 Jun 2017 18:57:14 +0000 (11:57 -0700)]
Hide app info button from app notification settings header
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug:
62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
(cherry picked from commit
5d811c40d3d1cdb5dfa8eada42329f612d8fbff9)
Fan Zhang [Fri, 16 Jun 2017 18:57:14 +0000 (11:57 -0700)]
Misc fixes for notification
- Tweak alignment for footer preference icon and text
- Hide app info button from app notification settings header
Merged-In: I10803e78fe4f30c2d84ec795c343ed660aab7762
Change-Id: Ia95fc30025c042635ad6467c7fde51991b0c47d9
Fix:
62138362
Fix:
62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
Maurice Lam [Fri, 16 Jun 2017 22:17:18 +0000 (22:17 +0000)]
Merge "Make confirm lock screen use the right theme" into oc-dr1-dev
am:
98a9d341c8
Change-Id: Iac233acde24c37fd7f93faba312bc5d894bb224d
TreeHugger Robot [Fri, 16 Jun 2017 22:08:04 +0000 (22:08 +0000)]
Merge "Make confirm lock screen use the right theme" into oc-dr1-dev
Lei Yu [Fri, 16 Jun 2017 20:52:09 +0000 (20:52 +0000)]
Merge "Update wakelock detector" into oc-dr1-dev
am:
e2530c2f62
Change-Id: Ib3e2aef02b5b3484ffbc43648210781d39e89a55
jackqdyulei [Fri, 2 Jun 2017 01:11:13 +0000 (18:11 -0700)]
Move "Received files" in BluetoothSettings
Move it from menu to preference
Also clean up the code about menu since there is no menu anymore
in BluetoothSettings
Bug:
35876447
Test: RunSettingsRoboTests
Change-Id: I4a3821595a0cc75382f1cf74bcafb3ecc44cc178
Lei Yu [Fri, 16 Jun 2017 20:30:36 +0000 (20:30 +0000)]
Merge "Update wakelock detector" into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 03:17:18 +0000 (20:17 -0700)]
Make Accessibility settings a SUW suggestion
Make it a suggestion so that SUW can show it during deferred setup
Test: Manual
Bug:
38506169
Change-Id: I03d5d0d7c2e5168b8d3ccccedce74620675865b8
Maurice Lam [Mon, 12 Jun 2017 19:15:40 +0000 (12:15 -0700)]
Make confirm lock screen use the right theme
Test: cd tests/robotests && mma
Bug:
62348472
Change-Id: Ie05c2e6adba8450a1092f0fefcad6b003398de7d
Shinji Sogo [Fri, 16 Jun 2017 19:06:38 +0000 (19:06 +0000)]
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am:
cd1f7a3146 am:
27ca1272a5
am:
879fd4b406
Change-Id: Ie7b7de6ab3e9d8ebf13beffffd0ca0aa4026e8ea
Shinji Sogo [Fri, 16 Jun 2017 19:00:18 +0000 (19:00 +0000)]
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am:
cd1f7a3146
am:
27ca1272a5
Change-Id: I70f81796a7c29c416729cc7fd7b4fd8150fdc981
Shinji Sogo [Fri, 16 Jun 2017 18:53:50 +0000 (18:53 +0000)]
Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
am:
cd1f7a3146
Change-Id: I18adec05022abe4d96f3aac2e893a5b5cbc7f2dc
Treehugger Robot [Fri, 16 Jun 2017 18:41:39 +0000 (18:41 +0000)]
Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
Lei Yu [Fri, 16 Jun 2017 17:06:37 +0000 (17:06 +0000)]
Merge "Display anomaly in battery usage page" into oc-dr1-dev
am:
b275471725
Change-Id: Ib9a7a971bdd3c9685287d25985f06f39507dbdad
Lei Yu [Fri, 16 Jun 2017 16:55:52 +0000 (16:55 +0000)]
Merge "Display anomaly in battery usage page" into oc-dr1-dev
Christine Franks [Fri, 16 Jun 2017 14:43:56 +0000 (14:43 +0000)]
Merge "Update Night display icon in Settings" into oc-dr1-dev
am:
ddd692cf1a
Change-Id: I1af8434bc68283f5579cdf01901022d292ba2a13
Christine Franks [Fri, 16 Jun 2017 14:36:10 +0000 (14:36 +0000)]
Merge "Update Night display icon in Settings" into oc-dr1-dev
Bill Yi [Fri, 16 Jun 2017 14:12:33 +0000 (07:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f7cec1865c8447d601b0d369de105da3fc7afa1
Auto-generated-cl: translation import
Bill Yi [Fri, 16 Jun 2017 14:00:00 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c041b74f7d78f0b69a4c8553118ed069393586e
Auto-generated-cl: translation import
OSDN Git Service
