OSDN Git Service
TreeHugger Robot [Mon, 17 Apr 2017 19:43:13 +0000 (19:43 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 19:37:06 +0000 (19:37 +0000)]
Merge "Add summary to special app access." into oc-dev
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: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
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: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 [Fri, 14 Apr 2017 23:52:07 +0000 (23:52 +0000)]
Merge "Jostle the elements around in app storage settings." into oc-dev
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:34:53 +0000 (22:34 +0000)]
Merge "Fix storage settings crash." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 20:57:29 +0000 (20:57 +0000)]
Merge "Apply admin restriction when network reset is disallowed" into oc-dev
Doris Ling [Fri, 14 Apr 2017 19:43:07 +0000 (12:43 -0700)]
Fix crash when Assist app does not have settings activity.
Check for null settings activity before trying to create settings
intent. If there is no settings activity, we will not show settings gear
for the preference.
Change-Id: I16f9d695cf9ef09ff65f4511d53d5778760125b5
Fix:
37161567
Test: make RunSettingsRoboTests
Kevin Chyn [Fri, 14 Apr 2017 20:33:21 +0000 (13:33 -0700)]
Fix setting crash when removing screenlock with fp
If a phone is operating slower than normal, when removing screen lock,
it's possible for the user to go back to settings page while removal
is still in progress. The removal callback will crash ChooseLockGeneric
Fixes:
37329856
Test: in fpc_tee_hal.c, make do_remove slow (5s). set up lockscreen, fingerprint,
then set lockscreen to none or swipe. do device rotations, go back to lock screen,
and then try to enroll fingerprint
Change-Id: I6da131a0001b22d06e359401f2ca1c6496c071ca
Lei Yu [Fri, 14 Apr 2017 20:26:26 +0000 (20:26 +0000)]
Merge "Update some battery string comments" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 20:19:46 +0000 (20:19 +0000)]
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 20:18:17 +0000 (20:18 +0000)]
Merge "Shrink the progress bar on storage items." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 19:50:30 +0000 (19:50 +0000)]
Merge "Use the music note icon for the music files pref." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 18:30:12 +0000 (18:30 +0000)]
Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
Daniel Nishi [Thu, 6 Apr 2017 21:29:03 +0000 (14:29 -0700)]
Use the music note icon for the music files pref.
Change-Id: I0e688321d7697aa4ad5b4ae16e7ca03f60e582cd
Fixes:
36900603
Test: Manual
TreeHugger Robot [Fri, 14 Apr 2017 05:25:56 +0000 (05:25 +0000)]
Merge "Search Icon persists through screen rotation" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 01:13:56 +0000 (01:13 +0000)]
Merge "Update summary when toggle background activity" into oc-dev
Fan Zhang [Fri, 14 Apr 2017 01:03:45 +0000 (18:03 -0700)]
Apply admin restriction when network reset is disallowed
- Refactored network restriction checking logic into a checker class to
share across different places
- Added test
Test: make RunSettingsRoboTests
Change-Id: I6b7ea78f28fd1b61aacb070c377821150e441a74
Fix:
37134598
jackqdyulei [Fri, 14 Apr 2017 00:53:02 +0000 (17:53 -0700)]
Update some battery string comments
1. battery_detail_foreground
2. battery_detail_background
Fix:
36874567
Test: Build
Change-Id: I955023ff8919b7019d459bd75a8baccf69a46355
TreeHugger Robot [Fri, 14 Apr 2017 00:41:00 +0000 (00:41 +0000)]
Merge "Instant apps show supported links not open default" into oc-dev
jackqdyulei [Mon, 10 Apr 2017 21:23:04 +0000 (14:23 -0700)]
Update summary when toggle background activity
In previous code, it didn't update summary when preference is changed.
This cl adds it and also updates the title for Battery Optimization.
Bug:
37163617
Test: RunSettingsRoboTests
Change-Id: I276d9a267379104794998a605a8e258660dcf350
jackqdyulei [Thu, 13 Apr 2017 22:56:13 +0000 (15:56 -0700)]
Hide summary for Cell in PowerUsageAdvanced
1. Add method "shouldHideSummary" to check it
2. Also change method "shouldHide" to "shouldHideCategory",
to distinguish it from shouldHideSummary
Fix:
37293815
Test: RunSettingsRoboTests
Change-Id: I4364d0331f3aac143fad9ebdeab52207f5cb98bf
Jesse Evans [Wed, 12 Apr 2017 15:57:27 +0000 (08:57 -0700)]
Instant apps show supported links not open default
On the app info page, instant apps show only the supported links
dialog rather than Open by default which opens in a secondary page
where the user can control things that aren't relevant to instant
apps.
Test: make RunSettingsRoboTests
Bug:
36497697
Change-Id: If4eba7c11c5490cbda1ef617002121fe108c4085
Fan Zhang [Thu, 13 Apr 2017 18:34:45 +0000 (11:34 -0700)]
Get rid of the extra divider lines in memory usage UI
Change-Id: I991f74ed3139f6119188a446fbf12bef23189988
Fix:
37211922
Test: visual
Lei Yu [Thu, 13 Apr 2017 21:43:32 +0000 (21:43 +0000)]
Merge "Revamp battery Ui in low battery mode" into oc-dev
Daniel Nishi [Thu, 13 Apr 2017 21:15:29 +0000 (14:15 -0700)]
Shrink the progress bar on storage items.
Change-Id: I4c9161de01236f7ac7ab633162a806888006fc1f
Fixes:
37283130
Test: Manual
TreeHugger Robot [Thu, 13 Apr 2017 21:09:42 +0000 (21:09 +0000)]
Merge "Use android:resource instead of :value for static summary" into oc-dev
Daniel Nishi [Fri, 31 Mar 2017 01:02:16 +0000 (18:02 -0700)]
Fix storage settings crash.
It may crash if opened during the uninstall of an app. By catching
the exception which may occur, we can just skip the uninstalled app
and avoid crashing.
Change-Id: I1b96b0697f4041be356260d6c675593affc1cb69
Merged-In: If556db7b5a299ba53a29baefbbe9709ba6d12190
Fixes:
36793223
Fixes:
36793372
Test: Settings unit test
Daniel Nishi [Thu, 2 Mar 2017 00:19:53 +0000 (16:19 -0800)]
Jostle the elements around in app storage settings.
This much more closely resembles the later mocks for
this page. The spacing, fonts, and colors are still off
and will be corrected once the final mocks land.
Bug:
34766830
Test: Manual
Change-Id: Ifbb8511d624cd06422025beee943fdead3faf53b
Merged-In: Id131e3596a0d08cb43c924a9f5cd9eb25329d7de
Adam Lesinski [Thu, 13 Apr 2017 20:09:41 +0000 (20:09 +0000)]
Merge "Update FakeUid to match ag/
2099507" into oc-dev
Jack He [Thu, 13 Apr 2017 19:43:49 +0000 (19:43 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 19:36:52 +0000 (19:36 +0000)]
Merge "Instant apps should not say App Installed by" into oc-dev
Saige McVea [Thu, 13 Apr 2017 19:07:32 +0000 (19:07 +0000)]
Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev
Fan Zhang [Thu, 13 Apr 2017 18:35:35 +0000 (11:35 -0700)]
Use android:resource instead of :value for static summary
android:resource is locale aware, but android:value is not.
Change-Id: I9eb0ff6b86036d769878e530cdca8779ee8b233f
Fix:
37248453
Test: manual
Daniel Nishi [Thu, 13 Apr 2017 18:39:53 +0000 (18:39 +0000)]
Merge "Add a movies & tv apps category to storage settings." into oc-dev
Hyunyoung Song [Thu, 13 Apr 2017 18:11:50 +0000 (18:11 +0000)]
Merge "Remove elevation from Apps detail info view to prevent NPE b/
37286516 Test: manual" into oc-dev
Lei Yu [Thu, 13 Apr 2017 17:33:03 +0000 (17:33 +0000)]
Merge "Update Summary for Battery Optimization" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 17:08:39 +0000 (17:08 +0000)]
Merge "Add a broadcast receiver to WifiDetailsPreferenceController." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 17:08:24 +0000 (17:08 +0000)]
Merge "Update Wifi Preferences with custom icons." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Save instance to avoid crash opon restore in onCreate." into oc-dev
Hyunyoung Song [Thu, 13 Apr 2017 15:33:32 +0000 (08:33 -0700)]
Remove elevation from Apps detail info view to prevent NPE
b/
37286516
Test: manual
Change-Id: Ie3a10c94e79cd11eefafef25ac4ecd244cf67ea9
TreeHugger Robot [Thu, 13 Apr 2017 15:24:24 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Julia Reynolds [Thu, 13 Apr 2017 13:01:51 +0000 (13:01 +0000)]
Merge "Notification sound field updates" into oc-dev
Bill Yi [Thu, 13 Apr 2017 12:36:35 +0000 (05:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia49d34f5f431aad5bed7ecbdbda5fed2adf95534
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 13 Apr 2017 12:13:00 +0000 (12:13 +0000)]
Merge "Show RingtonePickerActivity in work user instead" into oc-dev
Noah Wang [Thu, 13 Apr 2017 03:58:47 +0000 (03:58 +0000)]
Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 01:56:05 +0000 (01:56 +0000)]
Merge "Update the strings for the autofill enable dialog" into oc-dev
Sundeep Ghuman [Fri, 7 Apr 2017 00:56:09 +0000 (17:56 -0700)]
Add a broadcast receiver to WifiDetailsPreferenceController.
This allows the WifiNetworkDetailsFragment to update dynamically based
on network and connection changes.
Bug: b/
36278407
Test: make RunSettingsRoboTests
Change-Id: I388cf9842a144e45b68f2d173c7b29f347226b78
Sundeep Ghuman [Thu, 13 Apr 2017 00:17:49 +0000 (17:17 -0700)]
Update Wifi Preferences with custom icons.
Bug: b/
37281159
Test: Visual inspection of resource change only, see screenshot.
Change-Id: I1fb11667d9fe81873cc8e0a01db98890f106f1be
Jack He [Fri, 31 Mar 2017 17:51:22 +0000 (10:51 -0700)]
Add developer menu entry to enable Bluetooth inband ringing
Bug:
19171297
Test: Make, HFP regression test, testplans/82144
Change-Id: Ib24463347323f83daf8b4d9f1d38bb9c3071fb95
(cherry picked from commit
8d64a93c6a41e2f85d0435a6c8c070d931da45c9)
Svet Ganov [Wed, 12 Apr 2017 19:14:28 +0000 (12:14 -0700)]
Update the strings for the autofill enable dialog
Test: manual
bug:
37244333
Change-Id: I6dfac8826d5a817567116ef2f57d646d92b54b4e
Dmitry Dementyev [Wed, 12 Apr 2017 20:32:11 +0000 (20:32 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours am:
704c02db08 -s ours am:
89657550ac -s ours am:
ed6872b3d5 -s ours am:
43e154604a -s ours am:
d4d2b47d48 -s ours
am:
521e705eaf -s ours
Change-Id: Ia5298253f9349ccb3819f5f4eea1c217aef0b326
Dmitry Dementyev [Wed, 12 Apr 2017 20:26:40 +0000 (20:26 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours am:
704c02db08 -s ours am:
89657550ac -s ours am:
ed6872b3d5 -s ours am:
43e154604a -s ours
am:
d4d2b47d48 -s ours
Change-Id: Ib983d50a3e079c1cf72fddae475d10a441def7dd
TreeHugger Robot [Wed, 12 Apr 2017 20:24:21 +0000 (20:24 +0000)]
Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev
Dmitry Dementyev [Wed, 12 Apr 2017 20:21:39 +0000 (20:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours am:
704c02db08 -s ours am:
89657550ac -s ours am:
ed6872b3d5 -s ours
am:
43e154604a -s ours
Change-Id: I5d559b468d1d6165162d78cbde84b45e05e7b5ec
Dmitry Dementyev [Wed, 12 Apr 2017 20:15:40 +0000 (20:15 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours am:
704c02db08 -s ours am:
89657550ac -s ours
am:
ed6872b3d5 -s ours
Change-Id: I0aafd94271cab6fd2fb9acebca3c41299ec9550f
Dmitry Dementyev [Wed, 12 Apr 2017 20:10:07 +0000 (20:10 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours am:
704c02db08 -s ours
am:
89657550ac -s ours
Change-Id: I3bb7c6e6f2a8abcad3304c43e611df855e79dad9
jackqdyulei [Tue, 11 Apr 2017 00:55:43 +0000 (17:55 -0700)]
Update Summary for Battery Optimization
Bug:
37221696
Test: RunSettingsRoboTests
Change-Id: I7dc24879521a1375e0ad4b4b73e9a40633b93c3f
Dmitry Dementyev [Wed, 12 Apr 2017 20:04:11 +0000 (20:04 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours
am:
704c02db08 -s ours
Change-Id: I29ab4a6fb0dfbd3f03b9be71f28ff9f36893bc59
Dmitry Dementyev [Wed, 12 Apr 2017 20:00:05 +0000 (20:00 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours
am:
b23bdee761 -s ours
Change-Id: Ie66bdaba9900b112cee1d9503a332b7bbe203283
Dmitry Dementyev [Wed, 12 Apr 2017 19:54:06 +0000 (19:54 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours
am:
56dc835f3c -s ours
Change-Id: Iafcd0d4116683e0b40a9f98ef9ccf3d176ec0b32
Saige McVea [Sat, 8 Apr 2017 02:28:57 +0000 (19:28 -0700)]
Added generic icon and magnification icon to a11y Settings.
Test: Manual
Bug:
36895362
Change-Id: I85281c0904bd6f562f9ebd39dd35b1eeb79108e6
Dmitry Dementyev [Wed, 12 Apr 2017 19:49:07 +0000 (19:49 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours
am:
5f32a5b5f3 -s ours
Change-Id: I608a98d05d77b2e755f516ec60c64484c81437da
jackqdyulei [Tue, 4 Apr 2017 17:03:14 +0000 (10:03 -0700)]
Revamp battery Ui in low battery mode
This cl refine battery icon ui in low battery mode:
1. Should show indicator(fixed in ag/
2035178)
2. Show bolt icon when charging
3. When battery is low, set battery background as red and indicator
as white.
This cl also includes the field updates for battery.
Bug:
36862496
Test: RunSettingsRoboTests
Change-Id: Ifb2ed339742119bbff78712df09288b895756b1f
Dmitry Dementyev [Wed, 12 Apr 2017 19:44:05 +0000 (19:44 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours
am:
2d9593f8f1 -s ours
Change-Id: Id5ccadb538d8986e86b614d9303a637d6661c482
TreeHugger Robot [Wed, 12 Apr 2017 19:39:12 +0000 (19:39 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
Lei Yu [Wed, 12 Apr 2017 19:39:08 +0000 (19:39 +0000)]
Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev
Dmitry Dementyev [Wed, 12 Apr 2017 19:37:33 +0000 (19:37 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours
am:
13b12fd61d -s ours
Change-Id: I20df71c6318262d701b6cb75aff56e9e99c6eaf5
Dmitry Dementyev [Wed, 12 Apr 2017 19:32:36 +0000 (19:32 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours
am:
22db6274bf -s ours
Change-Id: Ieeeb4f1677f835787098dd75c4131be5960d6855
Adam Lesinski [Wed, 12 Apr 2017 19:32:24 +0000 (12:32 -0700)]
Update FakeUid to match ag/
2099507
Bug:
36002715
Change-Id: I6c2a92bee1a9931e08e11596d9a31844a3bc6bfc
Test: builds
Dmitry Dementyev [Wed, 12 Apr 2017 19:26:32 +0000 (19:26 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a
am:
0c07b38054 -s ours
Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047
Dmitry Dementyev [Wed, 12 Apr 2017 19:21:36 +0000 (19:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e
am:
bac5163a9a
Change-Id: Ib70241c596aca047a096318eb2026634692f8620
Dmitry Dementyev [Wed, 12 Apr 2017 19:16:01 +0000 (19:16 +0000)]
Add permission check to Intents used by Authenticator Settings.
am:
ea55e6331e
Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232
Chris Tate [Wed, 12 Apr 2017 18:58:26 +0000 (18:58 +0000)]
Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev
Daniel Nishi [Wed, 12 Apr 2017 18:57:47 +0000 (18:57 +0000)]
Merge "Don't crash in SecondaryUserController." into oc-dev
Noah Wang [Wed, 12 Apr 2017 00:22:52 +0000 (17:22 -0700)]
Prevent gaining audio focus when opening magnification screen.
bug:
30521125
Change-Id: I22fe63ed2b0529c2a08b7be03c12753f3f060c1a
TreeHugger Robot [Wed, 12 Apr 2017 18:37:22 +0000 (18:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 17:57:27 +0000 (17:57 +0000)]
Merge "Allow settings preference title to span over multiple lines." into oc-dev
Chad Brubaker [Wed, 12 Apr 2017 17:21:09 +0000 (17:21 +0000)]
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
Christine Franks [Wed, 12 Apr 2017 17:19:40 +0000 (17:19 +0000)]
Merge "Use correct title when opening from notification" into oc-dev
jackqdyulei [Tue, 4 Apr 2017 21:34:05 +0000 (14:34 -0700)]
Move bunch of battery methods to BatteryUtils.java
This cl moves following methods to BatteryUtils:
1. shouldHideSipper
2. removeHiddenBatterySippers
3. calculateBatteryPercent
As a result, we could use these methods in battery page as well
as app info page.
This cl also move bunch of tests to new file and add test for
method calculateBatteryPercent
Bug:
36816681
Test: RunSettingsRoboTests
Change-Id: Ic32700fe9741fbb96363db4af2d4fccb3ee8e317
Daniel Nishi [Tue, 11 Apr 2017 21:30:33 +0000 (14:30 -0700)]
Don't crash in SecondaryUserController.
If icons were fetched before displayPreference() is called, it can
cause a NPE. This adds a null check to ensure that it never
attempts to set an icon without both the icon and preference being
non-null.
Change-Id: Ib4269428e64545c9e255f7e3292fb6c046c1f307
Fixes:
37248158
Test: Settings Robotest
Tony Mak [Tue, 11 Apr 2017 19:07:39 +0000 (20:07 +0100)]
Show RingtonePickerActivity in work user instead
Test: make RunSettingsRoboTests
Test: Try to import custom ringtone in work profile, no crash observed
Test: Set the custom ringtone as default. Tested both work gmail and
calendar can play that ringtone.
Test: Try to import the peresonal ringtone, it is still working.
Bug:
37197930
Change-Id: I2b662247d7e70b59bae08e082e9682d74d797484
Jesse Evans [Sat, 8 Apr 2017 00:04:44 +0000 (17:04 -0700)]
Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED
Test: make RunSettingsRoboTests
Change-Id: Iee3a279be6a33932797a5e9378c451feb9b3df1a
Jesse Evans [Wed, 12 Apr 2017 00:17:44 +0000 (17:17 -0700)]
Instant apps should not say App Installed by
Changes the text on the app installer details to say
"More info on {App Store Name}".
Test: make RunSettingsRoboTests
Bug:
36512295
Change-Id: I8629f840e9f4e5ce12ba91e9cb9def0db0471162
TreeHugger Robot [Wed, 12 Apr 2017 11:20:08 +0000 (11:20 +0000)]
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
Niels Egberts [Wed, 12 Apr 2017 09:08:23 +0000 (10:08 +0100)]
Save instance to avoid crash opon restore in onCreate.
Bug:
37110223
Test: mmma packages/apps/Settings
Change-Id: I82457880bf310efbb7e999a5776858e47b0660c9
Niels Egberts [Thu, 30 Mar 2017 10:06:37 +0000 (11:06 +0100)]
Remove unused xml file.
Bug:
36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
(cherry picked from commit
ecb613bd8d485b6c0eed1b7ec10a8dae8d1da08f)
TreeHugger Robot [Wed, 12 Apr 2017 08:20:05 +0000 (08:20 +0000)]
Merge "Remove hotspot receiver from manifest." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 04:40:10 +0000 (04:40 +0000)]
Merge "Wi-Fi network details page fixes." into oc-dev
Suprabh Shukla [Wed, 12 Apr 2017 04:32:45 +0000 (04:32 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 02:36:11 +0000 (02:36 +0000)]
Merge "Add placeholder summary to stablize app info pref height" into oc-dev