OSDN Git Service
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
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
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
Bill Yi [Sat, 17 Jun 2017 06:27:54 +0000 (06:27 +0000)]
Import translations. DO NOT MERGE am:
251cbcbcc5 -s ours am:
3d6acb722c -s ours
am:
f1d7a456ea -s ours
Change-Id: If0f5b5f1fc2cc6e7ac6ab74e2ce0506cc009f5a2
Bill Yi [Sat, 17 Jun 2017 06:27:25 +0000 (06:27 +0000)]
Import translations. DO NOT MERGE am:
251cbcbcc5 -s ours am:
a09c96c1a5 -s ours
am:
07044295c8 -s ours
Change-Id: I94498408ff405b7f0093b0d1bf7beae718a4a2d5
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:09:13 +0000 (06:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
fa8fa0d212 -s ours
am:
92c2ff2307 -s ours
Change-Id: I80efbfae39a572306becec0f7839a49c1e3d9775
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
TreeHugger Robot [Sat, 17 Jun 2017 05:57:35 +0000 (05:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Fan Zhang [Sat, 17 Jun 2017 02:15:16 +0000 (02:15 +0000)]
Merge "Hide app info button from app notification settings header" into oc-dr1-dev am:
9b4bb95e82
am:
49347cfb22
Change-Id: Idec10ca420e5b7ae3f1a23cc24af67a110209483
Maurice Lam [Sat, 17 Jun 2017 02:14:44 +0000 (02:14 +0000)]
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev am:
2b836b0c0c
am:
3346d456f9
Change-Id: I620fb411d5a69b71b321371e494d3db1b8e7b4cf
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
TreeHugger Robot [Fri, 16 Jun 2017 23:35:22 +0000 (23:35 +0000)]
Merge "Add more space above the first item in choose usb mode dialog."
Maurice Lam [Fri, 16 Jun 2017 22:42:26 +0000 (22:42 +0000)]
Merge "Make confirm lock screen use the right theme" into oc-dr1-dev am:
98a9d341c8
am:
9b8f36e359
Change-Id: I08f5a9da6f6fac3206a5bb6df2e2106e91033863
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
TreeHugger Robot [Fri, 16 Jun 2017 22:26:08 +0000 (22:26 +0000)]
Merge "Hide app info button from app notification settings header"
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 21:12:21 +0000 (21:12 +0000)]
Merge "Update wakelock detector" into oc-dr1-dev am:
e2530c2f62
am:
25371b152c
Change-Id: I980c6b356862e9d8af46e36e08f3d2cc07d5cf65
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
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
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
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:13:22 +0000 (19:13 +0000)]
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am:
cd1f7a3146 am:
27ca1272a5 am:
879fd4b406
am:
d6db6d8938
Change-Id: I0d270d27a3f8b5050c9b14519bec16e2937ce12e
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:11:07 +0000 (17:11 +0000)]
Merge "Display anomaly in battery usage page" into oc-dr1-dev am:
b275471725
am:
1522839283
Change-Id: Ia234aa8a6e478ae7e5dac88867cef9297ff74ceb
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:47:57 +0000 (14:47 +0000)]
Merge "Update Night display icon in Settings" into oc-dr1-dev am:
ddd692cf1a
am:
3fb1655289
Change-Id: I10bf8db6918676588558c453f36b71c6f82872f2
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
Bill Yi [Fri, 16 Jun 2017 13:33:12 +0000 (06:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0774e86c6160591d1048a8f60c74d29aecaa8c9f
Auto-generated-cl: translation import
Tony Mak [Fri, 16 Jun 2017 13:06:23 +0000 (13:06 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev am:
e3d890eaae -s ours
am:
caac960e1a -s ours
Change-Id: I085d29824d90f74b5254f1efc4e18056d8814eb4
Tony Mak [Fri, 16 Jun 2017 13:01:51 +0000 (13:01 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev
am:
e3d890eaae -s ours
Change-Id: Ifbb300aa90cad12431121c380aa306d04dedb5bd
TreeHugger Robot [Fri, 16 Jun 2017 12:55:38 +0000 (12:55 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev
Charles He [Fri, 16 Jun 2017 11:49:14 +0000 (11:49 +0000)]
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev am:
add67648c7
am:
569a238509
Change-Id: Ibae09f8a237e528aa9122d1fc26142e1ede10629
Charles He [Fri, 16 Jun 2017 11:44:42 +0000 (11:44 +0000)]
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
am:
add67648c7
Change-Id: I2058ec725fb10fc0a8572237d5927f70b3d89525
Charles He [Fri, 16 Jun 2017 11:36:05 +0000 (11:36 +0000)]
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
Tony Mak [Fri, 16 Jun 2017 11:03:45 +0000 (11:03 +0000)]
Merge "Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce -s ours am:
a59e02fd58" into oc-dr1-dev-plus-aosp
am:
41a66cccc1 -s ours
Change-Id: I164ec412f672c397ec5dc79077690e2ec57a960f
Tony Mak [Fri, 16 Jun 2017 11:03:13 +0000 (11:03 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev-plus-aosp
am:
248cdec3e2 -s ours
Change-Id: Id990b4dd2af8fa724facf501f36b2d587a34d908
Android Build Merger (Role) [Fri, 16 Jun 2017 10:59:24 +0000 (10:59 +0000)]
Merge "Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce -s ours am:
a59e02fd58" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 16 Jun 2017 10:59:21 +0000 (10:59 +0000)]
Merge "Fix searching work app in settings" into oc-dr1-dev-plus-aosp
Tony Mak [Fri, 16 Jun 2017 10:59:13 +0000 (10:59 +0000)]
Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce am:
80cdf176e9 -s ours
am:
5d25a0c796 -s ours
Change-Id: I80bc94d6fff7eef72efb21392ce6c43ab0dd0ea6
Tony Mak [Fri, 16 Jun 2017 10:59:11 +0000 (10:59 +0000)]
Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce -s ours
am:
a59e02fd58
Change-Id: Idb771b9bca8e0e1d93dc9f9f8b9312bae33d9165
Tony Mak [Mon, 12 Jun 2017 17:02:53 +0000 (18:02 +0100)]
Fix searching work app in settings
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit
3bef8ce30a43d068aafd4756dc2db7eb9f869781)
Tony Mak [Mon, 12 Jun 2017 17:02:53 +0000 (18:02 +0100)]
Fix searching work app in settings
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit
3bef8ce30a43d068aafd4756dc2db7eb9f869781)
Tony Mak [Fri, 16 Jun 2017 10:55:11 +0000 (10:55 +0000)]
Fix searching work app in settings NO PARTIAL RERUN
am:
5651e0f2ce -s ours
Change-Id: I90afad3ac35c46c64e801631d36d24750a5858f4
Tony Mak [Fri, 16 Jun 2017 10:55:11 +0000 (10:55 +0000)]
Fix searching work app in settings NO PARTIAL RERUN am:
5651e0f2ce
am:
80cdf176e9 -s ours
Change-Id: Iea2c278565436cde6cd1fb8d5c58f7b972c7c2e7
TreeHugger Robot [Fri, 16 Jun 2017 02:19:42 +0000 (02:19 +0000)]
Merge "Remove some dead code"
Maurice Lam [Fri, 16 Jun 2017 01:37:46 +0000 (01:37 +0000)]
Allow skipping PIN setup screen am:
4c930fc2d5
am:
adb206fec5
Change-Id: I3ea2310633c0a01858a9f6d5cf04793bd40cd1b0
TreeHugger Robot [Fri, 16 Jun 2017 01:32:17 +0000 (01:32 +0000)]
Merge "May nfc_payments_how_it_works layout scrollable."
Maurice Lam [Fri, 16 Jun 2017 01:15:20 +0000 (01:15 +0000)]
Allow skipping PIN setup screen
am:
4c930fc2d5
Change-Id: I778a8a9d1d1ed98c91057357ec6ee9af6daa326c
TreeHugger Robot [Thu, 15 Jun 2017 23:09:27 +0000 (23:09 +0000)]
Merge "Add divider line below "see all apps" preference"
Tony Mak [Thu, 15 Jun 2017 22:29:04 +0000 (22:29 +0000)]
Fix searching work app in settings NO PARTIAL RERUN
am:
5651e0f2ce
Change-Id: Ib670fbde3997c8c6e984bb627bc305da7f235e2e
Fan Zhang [Thu, 15 Jun 2017 21:03:23 +0000 (14:03 -0700)]
Remove some dead code
DashboardCategory is no longer rendered in the dashboard ui
Bug:
33861822
Test: make RunSettingsRoboTests existing tests still pass
Change-Id: I0479967b0099f76f8c0c7894643d50b655de2892
Christine Franks [Thu, 15 Jun 2017 17:04:21 +0000 (10:04 -0700)]
Update Night display icon in Settings
Bug:
62658839
Test: Night display qs tile icon matches the icon used in the Night
display condition in Settings.
Change-Id: Ie319c9c94604dd630d5cf66f114a4de4397c2694
Maurice Lam [Sat, 3 Jun 2017 02:22:53 +0000 (19:22 -0700)]
Allow skipping PIN setup screen
So that setup wizard can show PIN option by default.
Test: Added Robolectric and instrumentation tests
Bug:
38509560
Change-Id: Id72744dd444b9b026ca5f28f230bae3bec254b2f
(cherry picked from commit
0f897d79f698920f1c0e0c102a7985704ffa196e)
Tony Mak [Mon, 12 Jun 2017 17:31:40 +0000 (18:31 +0100)]
Fix searching work app in settings NO PARTIAL RERUN
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I9c87345478f8df57b151927d8097cd8fd90fbe79
Fan Zhang [Thu, 15 Jun 2017 18:11:00 +0000 (11:11 -0700)]
Add divider line below "see all apps" preference
Change-Id: I94cbf47fd987a6ff4c4fabcc3124fae1f0438876
Fix:
62040104
Test: make RunSettingsRoboTests
jackqdyulei [Thu, 15 Jun 2017 17:18:00 +0000 (10:18 -0700)]
Update wakelock detector
1. Use new API: getSubTimer().getTotalDurationMsLocked(), which returns
the wakelock running time in the background.
2. Add code to detect whether app is currently holding wakelocks, by
using API: getCurrentDurationMsLocked
Bug:
38233034
Test: RunSettingsRoboTests
Change-Id: If69b751acf5741ff8df2c905642c008a0a2b32e6
TreeHugger Robot [Thu, 15 Jun 2017 18:21:29 +0000 (18:21 +0000)]
Merge "Fix searching work app in settings"
TreeHugger Robot [Thu, 15 Jun 2017 18:08:16 +0000 (18:08 +0000)]
Merge "Update category for AccountDetailDashboardFragment."
jackqdyulei [Tue, 13 Jun 2017 17:17:59 +0000 (10:17 -0700)]
Display anomaly in battery usage page
This cl adds a new parameter, mAnomalies, for
AdvancedPowerUsageDetail.
If it is null, fragment will start AnomalyLoader to detect anomaly.
If not null, just display the anomaly.
Bug:
36925180
Test: RunSettingsRoboTests
Change-Id: I572bc5954c1cdb210d18b6dbe1ab9dba25c0a61f
Alison Cichowlas [Thu, 15 Jun 2017 15:06:28 +0000 (11:06 -0400)]
Add separator line in notification settings,
above link to in-app settings.
Test: make RunSettingsRoboTests
Bug:
62543732
Change-Id: Ibf4f08c3d5feba90598d71f48c050e87ab9c3fdf
Charles He [Thu, 15 Jun 2017 09:57:23 +0000 (10:57 +0100)]
Escape apostrophes in ConfirmCredential strings.
Bug:
62648468
Test: none
Change-Id: Idbfa5c9fc1696e1145d2e33e3df89b5518a13c88
Sundeep Ghuman [Thu, 15 Jun 2017 06:53:40 +0000 (06:53 +0000)]
Merge "Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5 -s ours am:
ea46967c2e -s ours" into oc-dr1-dev-plus-aosp
am:
bb71287d3c -s ours
Change-Id: Ie95eb695e4e8453d5b0bd3785de0c0668e394149
Sundeep Ghuman [Thu, 15 Jun 2017 06:53:09 +0000 (06:53 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5 am:
0c02e22c99 -s ours
am:
51b31c5354 -s ours
Change-Id: Idcb397b3de44fc56c92340032171cb80f46e86e6
Android Build Merger (Role) [Thu, 15 Jun 2017 06:45:45 +0000 (06:45 +0000)]
Merge "Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5 -s ours am:
ea46967c2e -s ours" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Thu, 15 Jun 2017 06:45:21 +0000 (06:45 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5 -s ours
am:
ea46967c2e -s ours
Change-Id: I12005bef18a23f1aad2c1b5b9ee7982206426a5f
Sundeep Ghuman [Thu, 15 Jun 2017 06:45:20 +0000 (06:45 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:
683a7e2bf5
am:
0c02e22c99 -s ours
Change-Id: Iea1015089c955056d319f5365c1fb8d07e7acb93
Sundeep Ghuman [Thu, 15 Jun 2017 06:39:42 +0000 (06:39 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am:
683a7e2bf5 -s ours
Change-Id: I68959f0803cd714d540299ac916616a933594c00
Sundeep Ghuman [Thu, 15 Jun 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am:
683a7e2bf5
Change-Id: Id9ef9060ce76f96d36338e5ba4ddd0701b538a08
TreeHugger Robot [Thu, 15 Jun 2017 06:30:57 +0000 (06:30 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
Sundeep Ghuman [Thu, 15 Jun 2017 04:24:26 +0000 (04:24 +0000)]
Allow WifiSettings to show old APs on app resume. am:
4ae59dde43
am:
6ab460c354
Change-Id: I1f3b7d405ea6e98d4cfa0a69b4468494f7867d4a
Sundeep Ghuman [Thu, 15 Jun 2017 04:21:38 +0000 (04:21 +0000)]
Allow WifiSettings to show old APs on app resume.
am:
4ae59dde43
Change-Id: I57cb72fcdcbe98223ccda71f1ae6de2756b7ec08
Sundeep Ghuman [Tue, 13 Jun 2017 01:16:53 +0000 (18:16 -0700)]
Allow WifiSettings to show old APs on app resume.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.
Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/
2409026).
Bug: b/
38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.
Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Merged-In: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Sundeep Ghuman [Tue, 13 Jun 2017 01:16:53 +0000 (18:16 -0700)]
Allow WifiSettings to show old APs on app resume.
MANUAL MERGE of ag/
2398149 to avoid merge conflicts when trying to
submit to oc-dev.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.
Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/
2409026).
Bug: b/
38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.
Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
OSDN Git Service
