OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Disable SetupRedactionInterstitial when complete" into oc-dev
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

7 years agoMerge "Disable SetupRedactionInterstitial when complete" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 19:43:13 +0000 (19:43 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev

7 years agoMerge "Add summary to special app access." 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

7 years agoMerge "Add summary to special app access." 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

7 years agoMerge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev
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

7 years agoUpdate action bar style in app header UI.
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

7 years agoMerge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" 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

7 years agoAdd summary to special app access.
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

7 years agoAdd test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS
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

7 years agoUpdate action bar style in app header UI.
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

7 years agoMerge "Update subtext for Security settings." into oc-dev
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

7 years agoMerge "Update subtext for Security settings." into oc-dev
Doris Ling [Sun, 16 Apr 2017 00:50:58 +0000 (00:50 +0000)]
Merge "Update subtext for Security settings." into oc-dev

7 years agoUpdate subtext for Security settings.
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

7 years agoMerge "Fix setting crash when removing screenlock with fp" into oc-dev
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

7 years agoMerge "Fix setting crash when removing screenlock with fp" into oc-dev
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

7 years agoMerge "API for notification listener for Companioon apps" into oc-dev
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

7 years agoMerge "API for notification listener for Companioon apps" 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

7 years agoAPI for notification listener for Companioon apps
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

7 years agoMerge "Jostle the elements around in app storage settings." into oc-dev
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

7 years agoMerge "Jostle the elements around in app storage settings." into oc-dev
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

7 years agoMerge "Fix crash when Assist app does not have settings activity." into oc-dev
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

7 years agoMerge "Fix crash when Assist app does not have settings activity." 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

7 years agoMerge "Fix storage settings crash." into oc-dev
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

7 years agoMerge "Fix storage settings crash." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 22:34:53 +0000 (22:34 +0000)]
Merge "Fix storage settings crash." into oc-dev

7 years agoMerge "Apply admin restriction when network reset is disallowed" into oc-dev
Fan Zhang [Fri, 14 Apr 2017 21:07:45 +0000 (21:07 +0000)]
Merge "Apply admin restriction when network reset is disallowed" into oc-dev
am: 08575e1149

Change-Id: I315fecfdeea65b8e4a6c13e2ceb205357379a86a

7 years agoMerge "Apply admin restriction when network reset is disallowed" 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

7 years agoFix crash when Assist app does not have settings activity.
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

7 years agoMerge "Update some battery string comments" into oc-dev
Lei Yu [Fri, 14 Apr 2017 20:33:48 +0000 (20:33 +0000)]
Merge "Update some battery string comments" into oc-dev
am: 2721c8aa03

Change-Id: I4332f53b0c60367c832e68f95ee69f261b54c92f

7 years agoFix setting crash when removing screenlock with fp
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

7 years agoMerge "Update some battery string comments" into oc-dev
Lei Yu [Fri, 14 Apr 2017 20:26:26 +0000 (20:26 +0000)]
Merge "Update some battery string comments" into oc-dev

7 years agoMerge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev
jackqdyulei [Fri, 14 Apr 2017 20:23:00 +0000 (20:23 +0000)]
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev
am: b544d22b35

Change-Id: I4fd6c87fa396f7d03930a965ed793abe85613645

7 years agoMerge "Shrink the progress bar on storage items." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 20:22:46 +0000 (20:22 +0000)]
Merge "Shrink the progress bar on storage items." into oc-dev
am: 53ea5701f4

Change-Id: Ibd0a426630929dc3c5de7eb98fce692bd30d7729

7 years agoMerge "Hide summary for Cell in PowerUsageAdvanced" 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

7 years agoMerge "Shrink the progress bar on storage items." 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

7 years agoMerge "Use the music note icon for the music files pref." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 19:56:45 +0000 (19:56 +0000)]
Merge "Use the music note icon for the music files pref." into oc-dev
am: fbaa29a4b1

Change-Id: Ic1b0ad7ec4e260703a2cdafcefdc4209957e2561

7 years agoMerge "Use the music note icon for the music files pref." 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

7 years agoMerge "Get rid of the extra divider lines in memory usage UI" into oc-dev
Fan Zhang [Fri, 14 Apr 2017 18:43:09 +0000 (18:43 +0000)]
Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
am: c8c066dedf

Change-Id: Icf250ff46ddfd48d3d213c86f0c5001547a1a4ec

7 years agoMerge "Get rid of the extra divider lines in memory usage UI" 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

7 years agoUse the music note icon for the music files pref.
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

7 years agoMerge "Search Icon persists through screen rotation" into oc-dev
Matthew Fritze [Fri, 14 Apr 2017 05:36:27 +0000 (05:36 +0000)]
Merge "Search Icon persists through screen rotation" into oc-dev
am: 190b560c9a

Change-Id: I0542aa05a20d637ced618e68a84e53e73b3f70a0

7 years agoMerge "Search Icon persists through screen rotation" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 05:25:56 +0000 (05:25 +0000)]
Merge "Search Icon persists through screen rotation" into oc-dev

7 years agoMerge "Update summary when toggle background activity" into oc-dev
jackqdyulei [Fri, 14 Apr 2017 01:25:47 +0000 (01:25 +0000)]
Merge "Update summary when toggle background activity" into oc-dev
am: 8d519f8281

Change-Id: I5e135d0cb4d4d6457e05b8c91ef69323cab57a33

7 years agoMerge "Update summary when toggle background activity" 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

7 years agoApply admin restriction when network reset is disallowed
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

7 years agoUpdate some battery string comments
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

7 years agoMerge "Instant apps show supported links not open default" into oc-dev
Jesse Evans [Fri, 14 Apr 2017 00:48:56 +0000 (00:48 +0000)]
Merge "Instant apps show supported links not open default" into oc-dev
am: 0f34680fe0

Change-Id: Ib3df529beea9d610bc79512f6f50df5a4c41a640

7 years agoMerge "Instant apps show supported links not open default" into oc-dev
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

7 years agoUpdate summary when toggle background activity
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

7 years agoHide summary for Cell in PowerUsageAdvanced
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

7 years agoInstant apps show supported links not open default
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

7 years agoMerge "Revamp battery Ui in low battery mode" into oc-dev
Lei Yu [Thu, 13 Apr 2017 21:52:49 +0000 (21:52 +0000)]
Merge "Revamp battery Ui in low battery mode" into oc-dev
am: c4f08120b1

Change-Id: I98dd93c678a3c71e0c19cb8a2f3979606d7075af

7 years agoGet rid of the extra divider lines in memory usage UI
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

7 years agoMerge "Revamp battery Ui in low battery mode" into oc-dev
Lei Yu [Thu, 13 Apr 2017 21:43:32 +0000 (21:43 +0000)]
Merge "Revamp battery Ui in low battery mode" into oc-dev

7 years agoMerge "Use android:resource instead of :value for static summary" into oc-dev
Fan Zhang [Thu, 13 Apr 2017 21:15:44 +0000 (21:15 +0000)]
Merge "Use android:resource instead of :value for static summary" into oc-dev
am: 812819d48c

Change-Id: I1e910affc1333fbd752d0b38e8668c4d87c02188

7 years agoShrink the progress bar on storage items.
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

7 years agoMerge "Use android:resource instead of :value for static summary" into oc-dev
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

7 years agoFix storage settings crash.
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

7 years agoMerge "Update FakeUid to match ag/2099507" into oc-dev
Adam Lesinski [Thu, 13 Apr 2017 20:21:17 +0000 (20:21 +0000)]
Merge "Update FakeUid to match ag/2099507" into oc-dev
am: 8da75be811

Change-Id: I26423036695c3162c86ed1a7bed1b82867aa0b71

7 years agoJostle the elements around in app storage settings.
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

7 years agoMerge "Update FakeUid to match ag/2099507" into oc-dev
Adam Lesinski [Thu, 13 Apr 2017 20:09:41 +0000 (20:09 +0000)]
Merge "Update FakeUid to match ag/2099507" into oc-dev

7 years agoMerge "Add developer menu entry to enable Bluetooth inband ringing" into oc-dev
Jack He [Thu, 13 Apr 2017 20:08:11 +0000 (20:08 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing" into oc-dev
am: ee720c000a

Change-Id: Ic8374677c6ded3dc0843ca1326068a0678ba5d87

7 years agoMerge "Instant apps should not say App Installed by" into oc-dev
Jesse Evans [Thu, 13 Apr 2017 20:03:43 +0000 (20:03 +0000)]
Merge "Instant apps should not say App Installed by" into oc-dev
am: 28371d9c9e

Change-Id: I17c5ee53f16d26e9e01a54e717e1dcc10051650d

7 years agoMerge "Add developer menu entry to enable Bluetooth inband ringing" 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

7 years agoMerge "Instant apps should not say App Installed by" 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

7 years agoMerge "Added generic icon and magnification icon to a11y Settings." into oc-dev
Saige McVea [Thu, 13 Apr 2017 19:18:29 +0000 (19:18 +0000)]
Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev
am: ba7a4751a0

Change-Id: I9c9ca5d2584c923520f9d2d9986fdf28f7aae5d8

7 years agoMerge "Added generic icon and magnification icon to a11y Settings." 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

7 years agoUse android:resource instead of :value for static summary
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

7 years agoMerge "Add a movies & tv apps category to storage settings." into oc-dev
Daniel Nishi [Thu, 13 Apr 2017 18:45:04 +0000 (18:45 +0000)]
Merge "Add a movies & tv apps category to storage settings." into oc-dev
am: c365a8735c

Change-Id: I665759c8ce9c74d83a1167c5d04e5134ff697d08

7 years agoMerge "Add a movies & tv apps category to storage settings." into oc-dev
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

7 years agoMerge "Remove elevation from Apps detail info view to prevent NPE b/37286516 Test...
Hyunyoung Song [Thu, 13 Apr 2017 18:38:38 +0000 (18:38 +0000)]
Merge "Remove elevation from Apps detail info view to prevent NPE b/37286516 Test: manual" into oc-dev
am: 8399697520

Change-Id: Ie4fe4c452d99a47a6f29bd2a69f5dacd0f84f0e9

7 years agoMerge "Remove elevation from Apps detail info view to prevent NPE b/37286516 Test...
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

7 years agoMerge "Update Summary for Battery Optimization" into oc-dev
Lei Yu [Thu, 13 Apr 2017 17:46:34 +0000 (17:46 +0000)]
Merge "Update Summary for Battery Optimization" into oc-dev
am: d29cb7e7ea

Change-Id: Ibf37d1256ae71e6f404c660048c6a38278036a9d

7 years agoMerge "Add a broadcast receiver to WifiDetailsPreferenceController." into oc-dev
Sundeep Ghuman [Thu, 13 Apr 2017 17:46:19 +0000 (17:46 +0000)]
Merge "Add a broadcast receiver to WifiDetailsPreferenceController." into oc-dev
am: 028642e0a9

Change-Id: Ib0be7499de05209823f834c651cd8957ec3ce64c

7 years agoMerge "Update Wifi Preferences with custom icons." into oc-dev
Sundeep Ghuman [Thu, 13 Apr 2017 17:46:02 +0000 (17:46 +0000)]
Merge "Update Wifi Preferences with custom icons." into oc-dev
am: 43bd76d2d0

Change-Id: I3a37077a166051c85891904e154de2fbcfc3ef63

7 years agoMerge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913...
Anas Karbila [Thu, 13 Apr 2017 17:37:42 +0000 (17:37 +0000)]
Merge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913 am: 282a2317b9
am: 08cc4afc07

Change-Id: Ia99a4cb7fcb06612b26a050081e731a535449194

7 years agoMerge "Update Summary for Battery Optimization" 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

7 years agoMerge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913
Anas Karbila [Thu, 13 Apr 2017 17:27:36 +0000 (17:27 +0000)]
Merge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913
am: 282a2317b9

Change-Id: I7775df15acf1cb74cad94e3e23dd6faf5d98412e

7 years agoMerge "Settings: Fix wrong wifi drawable in screen zooming preview"
Anas Karbila [Thu, 13 Apr 2017 17:22:04 +0000 (17:22 +0000)]
Merge "Settings: Fix wrong wifi drawable in screen zooming preview"
am: 31ec85a913

Change-Id: Ibaa2a738d9f14570be88968cf340d474118358a4

7 years agoMerge "Settings: Fix wrong wifi drawable in screen zooming preview"
Treehugger Robot [Thu, 13 Apr 2017 17:14:21 +0000 (17:14 +0000)]
Merge "Settings: Fix wrong wifi drawable in screen zooming preview"

7 years agoMerge "Add a broadcast receiver to WifiDetailsPreferenceController." 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

7 years agoMerge "Update Wifi Preferences with custom icons." 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

7 years agoMerge "Save instance to avoid crash opon restore in onCreate." into oc-dev
Niels Egberts [Thu, 13 Apr 2017 16:30:56 +0000 (16:30 +0000)]
Merge "Save instance to avoid crash opon restore in onCreate." into oc-dev
am: dc322cf18b

Change-Id: I2644bd82b82b89f15548de58c76c751162122f7f

7 years agoMerge "Save instance to avoid crash opon restore in onCreate." 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

7 years agoRemove elevation from Apps detail info view to prevent NPE
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

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Thu, 13 Apr 2017 15:30:26 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 20099035ef  -s ours

Change-Id: I34f2a306df2fc2610a14f98df13aa87c808eb29c

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 15:24:24 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Notification sound field updates" into oc-dev
Julia Reynolds [Thu, 13 Apr 2017 13:13:18 +0000 (13:13 +0000)]
Merge "Notification sound field updates" into oc-dev
am: b40a459031

Change-Id: Ie8b98d89f477c0d5cfc46946ea1bc14735b07c16

7 years agoSettings: Fix wrong wifi drawable in screen zooming preview
Anas Karbila [Sat, 8 Apr 2017 10:48:43 +0000 (19:48 +0900)]
Settings: Fix wrong wifi drawable in screen zooming preview

We should use the same wifi drawable for the screen
zooming preview as the one the real settings menu
is using.

Change-Id: Ibb0d45b9f5aa431b52864aa826ea84c49b2d3fa0
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
7 years agoMerge "Notification sound field updates" into oc-dev
Julia Reynolds [Thu, 13 Apr 2017 13:01:51 +0000 (13:01 +0000)]
Merge "Notification sound field updates" into oc-dev

7 years agoMerge "Show RingtonePickerActivity in work user instead" into oc-dev
Tony Mak [Thu, 13 Apr 2017 12:36:47 +0000 (12:36 +0000)]
Merge "Show RingtonePickerActivity in work user instead" into oc-dev
am: 35f1e055d1

Change-Id: I2a93c30483c6d0bd3bb32b46034bc98f64a808b4

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Show RingtonePickerActivity in work user instead" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 12:13:00 +0000 (12:13 +0000)]
Merge "Show RingtonePickerActivity in work user instead" into oc-dev

7 years agoMerge "Prevent gaining audio focus when opening magnification screen." into oc-dev
Noah Wang [Thu, 13 Apr 2017 04:07:11 +0000 (04:07 +0000)]
Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev
am: 93799e8758

Change-Id: I53c70dcd4986588819f1d7a36337392c4c74748c

7 years agoMerge "Prevent gaining audio focus when opening magnification screen." 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

7 years agoMerge "Update the strings for the autofill enable dialog" into oc-dev
Svet Ganov [Thu, 13 Apr 2017 02:04:32 +0000 (02:04 +0000)]
Merge "Update the strings for the autofill enable dialog" into oc-dev
am: 0770f85cdc

Change-Id: Ia40ef434f7f67a8942496540360f5a5547eb8255

7 years agoMerge "Update the strings for the autofill enable dialog" 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

7 years agoAdd a broadcast receiver to WifiDetailsPreferenceController.
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

7 years agoUpdate Wifi Preferences with custom icons.
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

7 years agoAdd developer menu entry to enable Bluetooth inband ringing
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)

7 years agoUpdate the strings for the autofill enable dialog
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