OSDN Git Service
Alison Cichowlas [Tue, 18 Apr 2017 20:54:59 +0000 (20:54 +0000)]
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev am:
cf172040a9
am:
2d8a676b47
Change-Id: I25d7f8ad2a4acca731aa29b9a97bb64feb8e3a98
Alison Cichowlas [Tue, 18 Apr 2017 20:49:52 +0000 (20:49 +0000)]
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
am:
cf172040a9
Change-Id: I590ad5b3f2ef6fd5b578e9bdc37d1999d3091a77
Alison Cichowlas [Tue, 18 Apr 2017 20:36:53 +0000 (20:36 +0000)]
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
Anna Galusza [Tue, 18 Apr 2017 19:48:03 +0000 (19:48 +0000)]
Merge "Update Setup Wizard Vision Settings colors." into oc-dev am:
221f9245d6
am:
86d10d65ab
Change-Id: I2e1a87c187bf9182b028402ae01d3504e5a637de
TreeHugger Robot [Tue, 18 Apr 2017 19:47:35 +0000 (19:47 +0000)]
Merge "Listen to brigtness updates to update brightness summary."
Anna Galusza [Tue, 18 Apr 2017 19:42:39 +0000 (19:42 +0000)]
Merge "Update Setup Wizard Vision Settings colors." into oc-dev
am:
221f9245d6
Change-Id: If4075343e65cf000452324ad04ed6fb5f26ab774
Anna Galusza [Tue, 18 Apr 2017 19:35:05 +0000 (19:35 +0000)]
Merge "Update Setup Wizard Vision Settings colors." into oc-dev
Alison Cichowlas [Mon, 17 Apr 2017 19:50:29 +0000 (15:50 -0400)]
In apps with no channels, provide settings for misc channel in top level.
Test: robolectric tests pass, plus manual verification
Bug:
36561295
Change-Id: I58872a41fab562787d85bade0552c7735d716e5b
Doris Ling [Thu, 13 Apr 2017 22:06:36 +0000 (15:06 -0700)]
Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.
Bug:
37227609
Test: make RunSettingsRoboTests
Change-Id: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
Matthew Fritze [Tue, 18 Apr 2017 17:51:26 +0000 (17:51 +0000)]
Merge "Revert "Add summary to special app access."" into oc-dev am:
4fa0a617ec
am:
d9997261dd
Change-Id: Ie13c5b63e82edff9f0d442a29ebcc626c7e37f79
Matthew Fritze [Tue, 18 Apr 2017 17:44:57 +0000 (17:44 +0000)]
Merge "Revert "Add summary to special app access."" into oc-dev
am:
4fa0a617ec
Change-Id: I7353685f51f4ff287b58e382bd87e9ad22f16783
Matthew Fritze [Tue, 18 Apr 2017 17:39:12 +0000 (17:39 +0000)]
Merge "Revert "Add summary to special app access."" into oc-dev
Matthew Fritze [Tue, 18 Apr 2017 17:35:07 +0000 (17:35 +0000)]
Revert "Add summary to special app access."
This reverts commit
0e1b53fa6fda4382e4430492679cb7543f1cb510.
Change-Id: Ica5a9f7f40be3a4c2ae0e999d9832717dc44f3b5
Julia Reynolds [Tue, 18 Apr 2017 15:16:56 +0000 (15:16 +0000)]
Merge "Channel settings updates" into oc-dev am:
526185c89b
am:
41b21fd2d5
Change-Id: I6199301c1de2fb0f4e2229a9dcc745b4efe3a576
Julia Reynolds [Tue, 18 Apr 2017 15:11:27 +0000 (15:11 +0000)]
Merge "Channel settings updates" into oc-dev
am:
526185c89b
Change-Id: Ibb9cb726d26579ce94f26e18d00bcca73061b9e6
TreeHugger Robot [Tue, 18 Apr 2017 15:03:54 +0000 (15:03 +0000)]
Merge "Channel settings updates" into oc-dev
jackqdyulei [Tue, 18 Apr 2017 03:37:20 +0000 (03:37 +0000)]
Merge "Hide User category if only one user in device" into oc-dev am:
55a3944dbf
am:
b5dafb6c10
Change-Id: I9dd993c03395565cf5b3355e60a568eed08c7857
jackqdyulei [Tue, 18 Apr 2017 03:31:44 +0000 (03:31 +0000)]
Merge "Hide User category if only one user in device" into oc-dev
am:
55a3944dbf
Change-Id: I8a799188f0fe64952386c178eb3f303615fa13ef
Lei Yu [Tue, 18 Apr 2017 03:31:34 +0000 (03:31 +0000)]
Merge "Don't show Screen as Apps in advanced battery page" into oc-dev am:
89bc5b2bff
am:
4f016eeb6b
Change-Id: I6524ea22d71d4d7acd6186ebdb62de3cdd89a87d
Maurice Lam [Tue, 18 Apr 2017 03:31:16 +0000 (03:31 +0000)]
Sticky footer for GLIF theme am:
667d694220
am:
1b852af477
Change-Id: I7f0803649ff42bba2edbf606f69e935662674b31
Maurice Lam [Tue, 18 Apr 2017 03:30:59 +0000 (03:30 +0000)]
Merge "Use buttons for EncryptionInterstitial" into oc-dev am:
b6a0360a92
am:
62c5a2c357 -s ours
Change-Id: I37dc909344499be84f5cd3018e2aee092547066c
TreeHugger Robot [Tue, 18 Apr 2017 03:21:54 +0000 (03:21 +0000)]
Merge "Hide User category if only one user in device" into oc-dev
Casey Burkhardt [Tue, 18 Apr 2017 02:50:09 +0000 (02:50 +0000)]
Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev am:
65523b9cb0
am:
855391b66f
Change-Id: Id976a6a4c502dbe8624e810587555869588f3264
Julia Reynolds [Tue, 18 Apr 2017 02:03:01 +0000 (02:03 +0000)]
Merge "Consolidate notification settings." into oc-dev am:
6adf04c741
am:
bcaa8ecb24
Change-Id: Id632a07d66080acb4368c1789ce829ff8898b378
Lei Yu [Tue, 18 Apr 2017 01:08:19 +0000 (01:08 +0000)]
Merge "Don't show Screen as Apps in advanced battery page" into oc-dev
am:
89bc5b2bff
Change-Id: I1058418e9df7965046a6387594c60fb3e8fad629
Maurice Lam [Tue, 18 Apr 2017 01:02:00 +0000 (01:02 +0000)]
Sticky footer for GLIF theme
am:
667d694220
Change-Id: I9c91b27cc38fbb9839f62cac91901dac2dd2698d
Maurice Lam [Tue, 18 Apr 2017 01:01:43 +0000 (01:01 +0000)]
Merge "Use buttons for EncryptionInterstitial" into oc-dev
am:
b6a0360a92
Change-Id: I07ac891f736ba3707b01b629732df4a963ab64cc
jackqdyulei [Mon, 17 Apr 2017 21:54:29 +0000 (14:54 -0700)]
Hide User category if only one user in device
Fix:
37293124
Test: RunSettingsRoboTests
Change-Id: If50548396614672b05811d37a719f8f08df3165d
Lei Yu [Tue, 18 Apr 2017 00:56:10 +0000 (00:56 +0000)]
Merge "Don't show Screen as Apps in advanced battery page" into oc-dev
Maurice Lam [Thu, 30 Mar 2017 04:10:15 +0000 (21:10 -0700)]
Sticky footer for GLIF theme
For settings screens using GLIF theme, update to sticky footers.
Test: Existing tests pass
Bug:
35448201
Change-Id: If26e7e25f7f02b4c24979503e0c9359b88ff16d1
(cherry picked from commit
a857c8da4fcac98e70ea0d8d5b108aff24561341)
TreeHugger Robot [Tue, 18 Apr 2017 00:32:55 +0000 (00:32 +0000)]
Merge "Use buttons for EncryptionInterstitial" into oc-dev
Casey Burkhardt [Tue, 18 Apr 2017 00:21:04 +0000 (00:21 +0000)]
Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev
am:
65523b9cb0
Change-Id: I981cbc677a5b1b000c6734fc8f12d4af681f4268
Sundeep Ghuman [Tue, 18 Apr 2017 00:13:51 +0000 (00:13 +0000)]
Merge "Fix startup jank in the Wifi Picker." into oc-dev am:
ceedf2b9bf
am:
8b8f65828b
Change-Id: I19dcf41102818c59c1976b48082e02c1f57099e7
Casey Burkhardt [Tue, 18 Apr 2017 00:06:52 +0000 (00:06 +0000)]
Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev
Jeff Sharkey [Mon, 17 Apr 2017 23:58:17 +0000 (23:58 +0000)]
Merge "Follow storage API polishing." into oc-dev am:
e398a84199
am:
4ecbc32b48
Change-Id: Ie47474e46fa6ebfffdddad04ab8c99b332c4f8cc
Julia Reynolds [Mon, 17 Apr 2017 23:24:54 +0000 (23:24 +0000)]
Merge "Consolidate notification settings." into oc-dev
am:
6adf04c741
Change-Id: I255c258c6defed91fea42ab70ed8ff2019f271f1
TreeHugger Robot [Mon, 17 Apr 2017 23:16:31 +0000 (23:16 +0000)]
Merge "Consolidate notification settings." into oc-dev
Sundeep Ghuman [Mon, 17 Apr 2017 22:52:47 +0000 (22:52 +0000)]
Merge "Fix startup jank in the Wifi Picker." into oc-dev
am:
ceedf2b9bf
Change-Id: I231adc5f06c20bf6b95db63a8e2ee145d23b9403
Daniel Nishi [Mon, 17 Apr 2017 22:50:07 +0000 (22:50 +0000)]
Merge "Update the old Storage view to look better." into oc-dev am:
427f976ff4
am:
c99803bba4
Change-Id: Ibe8619a285effba38e89e2fada0887c57be54108
Daniel Nishi [Mon, 17 Apr 2017 22:49:45 +0000 (22:49 +0000)]
Merge "Fix a bug where options menu was not showing." into oc-dev am:
4f2f6bcad9
am:
e69e9d74c5
Change-Id: Ica70e9cc82bdb8eb745583a3558f6fbb1f7c1b18
TreeHugger Robot [Mon, 17 Apr 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Fix startup jank in the Wifi Picker." into oc-dev
Maurice Lam [Thu, 23 Feb 2017 22:43:48 +0000 (14:43 -0800)]
Use buttons for EncryptionInterstitial
Bug:
30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
(cherry picked from commit
9be96e06bb1e12e5068f2672dfbb9baa0051d604)
Jeff Sharkey [Mon, 17 Apr 2017 22:40:20 +0000 (22:40 +0000)]
Merge "Follow storage API polishing." into oc-dev
am:
e398a84199
Change-Id: Iad89fac67061de273b88f5d3e384de0349577e57
Daniel Nishi [Mon, 17 Apr 2017 22:39:52 +0000 (22:39 +0000)]
Merge "Update the old Storage view to look better." into oc-dev
am:
427f976ff4
Change-Id: Ice0e3cb73a4d0b3ea81e83107f3f6084e83b5554
Daniel Nishi [Mon, 17 Apr 2017 22:39:31 +0000 (22:39 +0000)]
Merge "Fix a bug where options menu was not showing." into oc-dev
am:
4f2f6bcad9
Change-Id: I9bfa738b7d7010955ea26b162573bdb68dbbcef5
jackqdyulei [Mon, 17 Apr 2017 22:33:26 +0000 (22:33 +0000)]
Merge "Make battery status refresh in SettingsActivity" into oc-dev am:
3a156f5509
am:
d5178f2bf0
Change-Id: I5dcae2cec079ba86f2052cd95bc0fb08e39b12a7
Fan Zhang [Mon, 17 Apr 2017 22:33:08 +0000 (22:33 +0000)]
Merge "Use standard preference layout for wallpaper picker" into oc-dev am:
8e1d588cdf
am:
d96ce57713
Change-Id: I50bb90a53c74960465c73aafc8ae5ee0e8021b50
Sarah Fortune [Mon, 17 Apr 2017 22:32:52 +0000 (22:32 +0000)]
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev am:
f7896f491a
am:
9827007c5e
Change-Id: Ib5db637dd6a7a79f622a11f737bbae08a3d557e1
Maurice Lam [Mon, 17 Apr 2017 22:32:35 +0000 (22:32 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev am:
3265c25861
am:
cd22ea50ca
Change-Id: I1423175ee2027939f67f9d33c22a9c4a8ea57da8
Doris Ling [Mon, 17 Apr 2017 22:32:18 +0000 (22:32 +0000)]
Merge "Add summary to special app access." into oc-dev am:
43458f0249
am:
edbcea5a14
Change-Id: I902bb0bf99198fe922268222c20dfa34d5e49433
Christine Franks [Mon, 17 Apr 2017 22:32:01 +0000 (22:32 +0000)]
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev am:
c2d56691fe
am:
f0320dd7aa
Change-Id: I7f4624486a8299c7e36b3eb97167795a2f5da380
Jeff Sharkey [Mon, 17 Apr 2017 22:26:35 +0000 (22:26 +0000)]
Merge "Follow storage API polishing." into oc-dev
Daniel Nishi [Mon, 17 Apr 2017 22:26:10 +0000 (22:26 +0000)]
Merge "Update the old Storage view to look better." into oc-dev
Daniel Nishi [Mon, 17 Apr 2017 22:25:52 +0000 (22:25 +0000)]
Merge "Fix a bug where options menu was not showing." into oc-dev
jackqdyulei [Mon, 17 Apr 2017 22:00:25 +0000 (22:00 +0000)]
Merge "Make battery status refresh in SettingsActivity" into oc-dev
am:
3a156f5509
Change-Id: I4706f49e9f8cce14fd98da167a8d05b4ba4a4519
TreeHugger Robot [Mon, 17 Apr 2017 21:53:56 +0000 (21:53 +0000)]
Merge "Make battery status refresh in SettingsActivity" into oc-dev
Fan Zhang [Mon, 17 Apr 2017 21:37:24 +0000 (21:37 +0000)]
Update action bar style in app header UI. am:
be6fab0135
am:
00a0978293
Change-Id: I4d4029d732602dd515249d344e5edc597b858a54
Julia Reynolds [Mon, 17 Apr 2017 21:22:09 +0000 (17:22 -0400)]
Consolidate notification settings.
App notifications now appears under configure notifications.
Bug:
36562211
Test: functional test, NotificationsSettingsTests
Change-Id: If6a5fd062b7983fc97621b9e7240e6bdad04ee86
Fan Zhang [Mon, 17 Apr 2017 21:18:14 +0000 (21:18 +0000)]
Merge "Use standard preference layout for wallpaper picker" into oc-dev
am:
8e1d588cdf
Change-Id: If8d1c3c3f8dd318e5c85393bf430a22fc07a8a89
TreeHugger Robot [Mon, 17 Apr 2017 21:10:30 +0000 (21:10 +0000)]
Merge "Use standard preference layout for wallpaper picker" into oc-dev
Sundeep Ghuman [Thu, 13 Apr 2017 23:11:18 +0000 (16:11 -0700)]
Fix startup jank in the Wifi Picker.
Synchronously fetch the latest APs during onResume and show these before
displaying the other wifi preferences. This fixes a visibile shuffling
issue. Additional Setting preferences are now programatically added
during onStart and hidden during onStop in order to avoid the animation
delay which causes a shuffling effect.
Bug: b/
36406983
Test: Visual inspection. Animation jank is difficult to programatically
test.
Change-Id: I34b2d737a8e72e1dc296c170f753975fafce7a3e
Jeff Sharkey [Mon, 17 Apr 2017 15:31:33 +0000 (09:31 -0600)]
Follow storage API polishing.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug:
37325923,
35812899,
35806020
Change-Id: I4965b7391018354157f0683a643a14c5e9cd338d
Sarah Fortune [Mon, 17 Apr 2017 20:15:45 +0000 (20:15 +0000)]
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
am:
f7896f491a
Change-Id: I66a108fd9b767a9060c22feb39c928a196fdfe07
Sarah Fortune [Mon, 17 Apr 2017 20:07:31 +0000 (20:07 +0000)]
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 19:50:14 +0000 (19:50 +0000)]
Merge "Finalize the string for eSIM factory reset."
Maurice Lam [Mon, 17 Apr 2017 19:46:44 +0000 (19:46 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
am:
3265c25861
Change-Id: I0a9554576451b4f217fe8180ffe6812c9b4ac7c4
TreeHugger Robot [Mon, 17 Apr 2017 19:43:13 +0000 (19:43 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
Doris Ling [Mon, 17 Apr 2017 19:42:15 +0000 (19:42 +0000)]
Merge "Add summary to special app access." into oc-dev
am:
43458f0249
Change-Id: I7e02ef17fb3b0defb7e3d048e680c8fb7872912c
TreeHugger Robot [Mon, 17 Apr 2017 19:37:06 +0000 (19:37 +0000)]
Merge "Add summary to special app access." into oc-dev
Fan Zhang [Mon, 17 Apr 2017 18:19:27 +0000 (11:19 -0700)]
Use standard preference layout for wallpaper picker
Change-Id: I7c76a9af5e64af4ac8641227289a94ab00f923f2
Fix:
37351626
Test: visual
jackqdyulei [Sat, 15 Apr 2017 00:04:49 +0000 (17:04 -0700)]
Don't show Screen as Apps in advanced battery page
Bug:
37293020
Test: RunSettngsRoboTests
Change-Id: I9a6259e1eb3a2d3451b0479bfe20be735825cd64
Julia Reynolds [Fri, 14 Apr 2017 13:30:30 +0000 (09:30 -0400)]
Channel settings updates
- Update master switch preference to store enabled state in case
it's set before the view holder is bound
- Update master switch preference to prevent disabled switches
from being toggled
- Show an importance summary for max importance
- properly handle null notification sounds
Change-Id: I395b95b76d2a3c1c94b41d1c2720bb0cf1cae917
Fixes:
36920159
Fixes:
37421928
Fixes:
36939825
Test: RunSettingsRoboTests & manual
Christine Franks [Mon, 17 Apr 2017 18:40:45 +0000 (18:40 +0000)]
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev
am:
c2d56691fe
Change-Id: Ic794afd6f8a957b7ab0d708aab8e24cb50bc8400
Fan Zhang [Mon, 17 Apr 2017 18:38:01 +0000 (18:38 +0000)]
Update action bar style in app header UI.
am:
be6fab0135
Change-Id: I51f4b7900fb1be6631b686915e02333db2df2e9f
Sarah Fortune [Wed, 12 Apr 2017 23:36:34 +0000 (16:36 -0700)]
Disable the wifi wakeup preference when wifi scanning is disabled
Bug:
36033488
Test: Manual testing on the device, make RunSettingsRoboTests
Change-Id: I0abfe69a8a84dc9c5e78f1debce7748c92b47e04
Christine Franks [Mon, 17 Apr 2017 18:30:26 +0000 (18:30 +0000)]
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev
Doris Ling [Tue, 11 Apr 2017 22:35:49 +0000 (15:35 -0700)]
Add summary to special app access.
Get the count of apps that has unrestricted data access and add that to
the summary for Apps & notifications -> Special app access.
Bug:
36376411
Test: make RunSettingsRoboTests
Change-Id: Ic72cd165da9a91e18e1982d2696830f3f5a0987c
Christine Franks [Thu, 13 Apr 2017 23:34:55 +0000 (16:34 -0700)]
Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS
Bug:
35356645
Test: Verify for both config_nightDisplayAvailable true and false,
adb shell am instrument -e class
com.android.settings.display.NightDisplayTest -w
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7de3eddf62428d75bef621d3387fa33a76205fe7
Fan Zhang [Fri, 14 Apr 2017 19:31:02 +0000 (12:31 -0700)]
Update action bar style in app header UI.
- Update background color of actionbar
- Remove elevation of actionbar so it appears to be the same entity as
app header.
- Add a shadow below app header view. We can't set elevation on app
header unfortunately because that will add shadow all round the view,
but we only want shadow below it.
- Updated app icon size/text size per to match UI spec.
Change-Id: I63d7fa42b859a008fa662aaf19848cd40529c2ff
Fix:
37207527
Fix:
37079248
Test: visual && make RunSettingsRoboTests
Doris Ling [Sun, 16 Apr 2017 00:58:43 +0000 (00:58 +0000)]
Merge "Update subtext for Security settings." into oc-dev am:
a0e617f96d
am:
8b182839a5
Change-Id: Ia3d158eb681c12c7c6cf21eb475835d36664afee
Doris Ling [Sun, 16 Apr 2017 00:54:09 +0000 (00:54 +0000)]
Merge "Update subtext for Security settings." into oc-dev
am:
a0e617f96d
Change-Id: I4ca0f307c5fdedb46ffd98bc85d5774c3ef74238
Doris Ling [Sun, 16 Apr 2017 00:50:58 +0000 (00:50 +0000)]
Merge "Update subtext for Security settings." into oc-dev
Doris Ling [Mon, 10 Apr 2017 22:14:22 +0000 (15:14 -0700)]
Update subtext for Security settings.
Instead of using summary for verifer, change the security setting
summary to a static text.
Bug:
36889582
Test: make RunSettingsRoboTests
Change-Id: Ia3e2c7c595f403965751bacf2239c70070408e49
Kevin Chyn [Sat, 15 Apr 2017 09:29:44 +0000 (09:29 +0000)]
Merge "Fix setting crash when removing screenlock with fp" into oc-dev am:
339d117b46
am:
c27f924e0e
Change-Id: Ia661bdeafcb3f8beffb5214b4adbb3602e30fca8
Kevin Chyn [Sat, 15 Apr 2017 09:26:12 +0000 (09:26 +0000)]
Merge "Fix setting crash when removing screenlock with fp" into oc-dev
am:
339d117b46
Change-Id: I2fa18ac32053f3390d6cb821042ea0c63e6f4e86
TreeHugger Robot [Sat, 15 Apr 2017 09:20:49 +0000 (09:20 +0000)]
Merge "Fix setting crash when removing screenlock with fp" into oc-dev
Eugene Susla [Sat, 15 Apr 2017 04:31:55 +0000 (04:31 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev am:
01c0630e81
am:
ab2bb40659
Change-Id: Iee1cbda7eb4cee9b34e7d9cb4577f3cf8902aa69
Eugene Susla [Sat, 15 Apr 2017 04:27:14 +0000 (04:27 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev
am:
01c0630e81
Change-Id: I5aab5f6760b327fec244ea8ebe10fccc3e3bbbf1
Eugene Susla [Sat, 15 Apr 2017 04:17:21 +0000 (04:17 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev
Eugene Susla [Fri, 14 Apr 2017 17:42:59 +0000 (10:42 -0700)]
API for notification listener for Companioon apps
Test: 1. Trigger the confitrmation dialog.
Ensure it looks exactly like the one from settings.
2. Call an API without associating the appa first
Ensure exception is thrown with a message mentioning the need to associate 1st
Change-Id: I0b280e9bcef7f9d21ce7c9dfeaf2703945481efd
Daniel Nishi [Sat, 15 Apr 2017 00:15:12 +0000 (00:15 +0000)]
Merge "Jostle the elements around in app storage settings." into oc-dev am:
bea96cfb65
am:
e90e746046 -s ours
Change-Id: I944cb72c3c1f0b639d277bb034f10fbb604c2fcb
Daniel Nishi [Sat, 15 Apr 2017 00:04:52 +0000 (00:04 +0000)]
Merge "Jostle the elements around in app storage settings." into oc-dev
am:
bea96cfb65
Change-Id: Ib4a8bf827266d5fbb015fb5d4c71cd7a7f19b617
qingxi [Sat, 15 Apr 2017 00:03:12 +0000 (17:03 -0700)]
Finalize the string for eSIM factory reset.
Bug:
37255419
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I6fe5d09bc58021fe196dc8ee739280d70f9d0017
Daniel Nishi [Fri, 14 Apr 2017 23:52:07 +0000 (23:52 +0000)]
Merge "Jostle the elements around in app storage settings." into oc-dev
Doris Ling [Fri, 14 Apr 2017 23:05:47 +0000 (23:05 +0000)]
Merge "Fix crash when Assist app does not have settings activity." into oc-dev am:
0b7e3e056a
am:
6210546942
Change-Id: I19a813bbd56e9cb5ffefe680ad11efdd52c7503a
Doris Ling [Fri, 14 Apr 2017 23:00:11 +0000 (23:00 +0000)]
Merge "Fix crash when Assist app does not have settings activity." into oc-dev
am:
0b7e3e056a
Change-Id: Ia0327dc5d11921debd3b4ced10467aebde5d486d
TreeHugger Robot [Fri, 14 Apr 2017 22:54:07 +0000 (22:54 +0000)]
Merge "Fix crash when Assist app does not have settings activity." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 22:44:03 +0000 (22:44 +0000)]
Merge "Fix storage settings crash." into oc-dev am:
496fb93060
am:
188dfe238f -s ours
Change-Id: Ied3bae27f505f3206756359a1a769c7e1e419bf0
Daniel Nishi [Fri, 14 Apr 2017 22:41:30 +0000 (22:41 +0000)]
Merge "Fix storage settings crash." into oc-dev
am:
496fb93060
Change-Id: I76354ceb7c6e87bc3b0ee845a2c95e46c3569f21
Daniel Nishi [Fri, 14 Apr 2017 22:34:53 +0000 (22:34 +0000)]
Merge "Fix storage settings crash." into oc-dev
OSDN Git Service
