OSDN Git Service
Bill Yi [Tue, 11 Jul 2017 03:55:18 +0000 (03:55 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours
am:
750540ae48 -s ours
Change-Id: If2ede8c90fef89686c2ea93765e7d7acab7e9c26
Bill Yi [Tue, 11 Jul 2017 03:47:35 +0000 (03:47 +0000)]
Import translations. DO NOT MERGE
am:
7267438b58 -s ours
Change-Id: Id5933547a1b04477e00dbef1fd88382a01e02891
Bill Yi [Tue, 11 Jul 2017 03:30:02 +0000 (03:30 +0000)]
Import translations. DO NOT MERGE
am:
f812f94216 -s ours
Change-Id: If3bc9ec99810524fde2cf69d6a43f4995ed9306a
Bill Yi [Tue, 11 Jul 2017 00:16:10 +0000 (17:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifbee1421f45d2cb6f3d5c533e5c4e9a2735afa10
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Mon, 10 Jul 2017 23:49:52 +0000 (16:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb8d0e63a8150656a55bb1b2adf5748c75a10224
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
kun.tang [Mon, 10 Jul 2017 19:20:58 +0000 (19:20 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus." am:
3cbae7d6b5
am:
d34ce65e22
Change-Id: Ic806452e621c14431576fe4c5ed848ae005122c1
kun.tang [Mon, 10 Jul 2017 19:17:03 +0000 (19:17 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus."
am:
3cbae7d6b5
Change-Id: I3c968a9bbd7bb687aae53d5d74a9a2b3e38bcbae
Treehugger Robot [Mon, 10 Jul 2017 19:08:11 +0000 (19:08 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus."
kun.tang [Sat, 8 Jul 2017 03:09:02 +0000 (11:09 +0800)]
Fix Phone crash when rorate screen on SimStatus.
When rorate screen on SimStatus, Fragment not attached to Activity, phone crash.
Solution: use mRes to getString
Test: build
07-07 13:20:27.237 696 696 E AndroidRuntime: Process: com.android.phone, PID: 696
07-07 13:20:27.237 696 696 E AndroidRuntime: java.lang.IllegalStateException: Fragment SimStatus{
d1e4bb3} not attached to Activity
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.app.Fragment.getResources(Fragment.java:861)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.settings.deviceinfo.SimStatus.updateSignalStrength(SimStatus.java:359)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.settings.deviceinfo.SimStatus$4.onSignalStrengthsChanged(SimStatus.java:444)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.telephony.PhoneStateListener$1.handleMessage(PhoneStateListener.java:334)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:105)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.os.Looper.loop(Looper.java:164)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:6558)
07-07 13:20:27.237 696 696 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.internal.os.Zygote$MethodAndArgsCaller.run(Zygot
Change-Id: Ife8f2e3ed8c4fe6db0fe784a43910768ff3ff4d1
Bill Yi [Sat, 1 Jul 2017 16:05:02 +0000 (16:05 +0000)]
Import translations. DO NOT MERGE
am:
126ce95bc6 -s ours
Change-Id: I99cf4ac7ff9a9ae62df014c790a7af691e670cbc
Bill Yi [Sat, 1 Jul 2017 01:07:52 +0000 (18:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id991a5f419ccb85d8e25a5111b717a84e4de6184
Auto-generated-cl: translation import
Bill Yi [Tue, 27 Jun 2017 20:08:19 +0000 (20:08 +0000)]
Import translations. DO NOT MERGE
am:
8e132ce53c -s ours
Change-Id: I4c3a65ee1c1bb82dacea7e874ef906cb08fce1ac
Bill Yi [Tue, 27 Jun 2017 07:26:26 +0000 (00:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19a85ce3981e7aac6708b6aa2d78fd51c9d03141
Auto-generated-cl: translation import
daqi [Mon, 26 Jun 2017 22:18:38 +0000 (22:18 +0000)]
Merge "Fix PremiumSmsAccess memory leak" am:
31a2f413f8 -s ours
am:
34fe9136c6
Change-Id: I01c8d25555d6a71e552137d74a0b500d79df7e87
daqi [Mon, 26 Jun 2017 22:05:13 +0000 (22:05 +0000)]
Merge "Fix PremiumSmsAccess memory leak"
am:
31a2f413f8 -s ours
Change-Id: Ibaba7d54ce393f2212df3f05b8929b445ccba912
Treehugger Robot [Mon, 26 Jun 2017 21:13:47 +0000 (21:13 +0000)]
Merge "Fix PremiumSmsAccess memory leak"
Bill Yi [Fri, 23 Jun 2017 12:29:05 +0000 (12:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
6b1ff7073a -s ours
Change-Id: Ic3856a964218fae0861218de0ca46f3d50820e5f
TreeHugger Robot [Fri, 23 Jun 2017 12:23:14 +0000 (12:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 23 Jun 2017 08:39:20 +0000 (01:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
daqi [Sat, 17 Jun 2017 07:24:44 +0000 (15:24 +0800)]
Fix PremiumSmsAccess memory leak
[Cause of Defect]
PremiumSmsAccess forget to invoke Session and AppStateSmsPremBridge
release method in the onDestroy callback.
And that would lead to the leak of activity context.
Test: 1. Settings - Apps - Advanced - Special access - Premium SMS access
2. adb shell dumpsys meminfo com.android.settings
3. observe activity object number
4. back to the last page
5. use AS trigger Settings gc several times
6. adb shell dumpsys meminfo com.android.settings
7. observe activity object number to check if the activity number decrease
Change-Id: I359900c16fa866fba94d187a61cf6bebbdd1ed0b
Signed-off-by: daqi <daqi@xiaomi.com>
Daniel Nishi [Fri, 23 Jun 2017 04:19:16 +0000 (04:19 +0000)]
Count cache in storage categories.
am:
b22b85b593
Change-Id: Idf44c0cd337cbd9aefc12dce8adecf97b4dc2d99
Daniel Nishi [Fri, 23 Jun 2017 00:09:59 +0000 (17:09 -0700)]
Count cache in storage categories.
This makes the System size more consistent because cache is not
attributed to the system (when the cache is under quota).
Change-Id: I680e70daf5e98b9a205023a218dfd1dcc8ee8334
Fixes:
62623731
Test: Settings Unit Test
Marie Janssen [Fri, 23 Jun 2017 00:22:23 +0000 (00:22 +0000)]
Bluetooth: Make notifications local-only
am:
1138397336
Change-Id: Id287a1ba31898da57385a8e72cacbe03d7b78946
Marie Janssen [Fri, 16 Jun 2017 00:19:36 +0000 (17:19 -0700)]
Bluetooth: Make notifications local-only
This will prevent them from showing up on external devices where they
would be less than useful.
Test: connect to watch and pair a device
Bug:
34612389
Change-Id: I8b02c20200ce78a73967b8121cf7d5653b68f356
(cherry picked from commit
426903d155a0e9089666736e784d498e6a016845)
Marie Janssen [Thu, 22 Jun 2017 15:41:55 +0000 (15:41 +0000)]
Merge "Bluetooth: Make notifications local-only" am:
348a7085fa
am:
620fe71520
Change-Id: I3df0a009c7fc6184ea1176f6953748c5031d76cd
Marie Janssen [Thu, 22 Jun 2017 15:37:28 +0000 (15:37 +0000)]
Merge "Bluetooth: Make notifications local-only"
am:
348a7085fa
Change-Id: I7de9c9c01f1f704399c1b594beafca5bc14ef8df
Treehugger Robot [Thu, 22 Jun 2017 15:31:37 +0000 (15:31 +0000)]
Merge "Bluetooth: Make notifications local-only"
Bill Yi [Wed, 21 Jun 2017 20:21:34 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE
am:
ae5a31e55c -s ours
Change-Id: Ic37588db9f8b69ef7fa7d69c27e717ac4f241383
Bill Yi [Wed, 21 Jun 2017 04:36:56 +0000 (21:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idfada62fcc0224d6bffd354ab140fd5300a5a8a3
Auto-generated-cl: translation import
jackqdyulei [Tue, 20 Jun 2017 23:03:00 +0000 (23:03 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev
am:
05777a7918
Change-Id: I2c12178379cfed44d6007533f420c7611038bfed
TreeHugger Robot [Tue, 20 Jun 2017 22:35:57 +0000 (22:35 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev
jackqdyulei [Tue, 20 Jun 2017 20:34:51 +0000 (13:34 -0700)]
Hide wifi and bt in battery settings
Hide them in app usage list but don't smear them
Bug:
62787787
Test: RunSettingsRoboTests
Change-Id: I43c15ea8a2b32f293eb859f3fead8666e45674ef
Marie Janssen [Fri, 16 Jun 2017 00:19:36 +0000 (17:19 -0700)]
Bluetooth: Make notifications local-only
This will prevent them from showing up on external devices where they
would be less than useful.
Test: connect to watch and pair a device
Bug:
34612389
Change-Id: I8b02c20200ce78a73967b8121cf7d5653b68f356
Daniel Nishi [Mon, 19 Jun 2017 17:55:30 +0000 (17:55 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev
am:
4743423a82
Change-Id: Ia2c95906c0c526f426deaa243ff075ce70bee1fc
Alison Cichowlas [Mon, 19 Jun 2017 17:49:20 +0000 (17:49 +0000)]
Merge "Notification settings update." into oc-dev
am:
e5493808fd
Change-Id: I0d1b48669d85b6c1289c50a2a84aaa2dc292ea2a
Daniel Nishi [Mon, 19 Jun 2017 17:45:30 +0000 (17:45 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 17:34:39 +0000 (17:34 +0000)]
Merge "Notification settings update." into oc-dev
gaochong [Mon, 19 Jun 2017 17:12:41 +0000 (17:12 +0000)]
Merge "Fix Screen Magnification recursive draw" am:
4e7846fbe4
am:
db233c6e88
Change-Id: If8a23a012e0b7a82dc0c6a7d349a15310b4eb43e
gaochong [Mon, 19 Jun 2017 17:07:37 +0000 (17:07 +0000)]
Merge "Fix Screen Magnification recursive draw"
am:
4e7846fbe4
Change-Id: I4890ba0d33dd9245f1393c59c77531f0597ff6ff
Treehugger Robot [Mon, 19 Jun 2017 17:00:07 +0000 (17:00 +0000)]
Merge "Fix Screen Magnification recursive draw"
Alison Cichowlas [Fri, 16 Jun 2017 17:56:56 +0000 (13:56 -0400)]
Notification settings update.
- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.
Bug:
62705435
Test: make RunSettingsRoboTests; manual verification
Merged-In: Iac31575d894d7f3532c8e631ee9d77ee21830b29
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
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
TreeHugger Robot [Mon, 19 Jun 2017 14:39:18 +0000 (14:39 +0000)]
Merge "Misc fixes for notification" into oc-dev
gaochong [Wed, 14 Jun 2017 13:51:11 +0000 (21:51 +0800)]
Fix Screen Magnification recursive draw
When invoke the method View#setLayoutParams(), ViewRootImpl
will run method ViewRootImpl#performTraversals(). And
OnGlobalLayoutListener#onGlobalLayout() will be invoked.
When the method View#setLayoutParams() is invoked in
OnGlobalLayoutListener#onGlobalLayout(), there will be recursive
call. The view will be draw on and on. This situation happen in
Screen Magnification. It should remove the listener after
work completion.
Bug: https://issuetracker.google.com/issues/
62613000
Test: use systrace when enter Screen Magnification,and view the
"traversal" times.
Change-Id: I01b1fcccb8b915ec436fb95f1d30c8ec0c0de0a9
Signed-off-by: gaochong <gaochong@xiaomi.com>
Bill Yi [Sat, 17 Jun 2017 06:14:14 +0000 (06:14 +0000)]
Import translations. DO NOT MERGE
am:
251cbcbcc5 -s ours
Change-Id: I068211d35ea2f411c996daa834d09c49db78b80a
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
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"
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
Daniel Nishi [Fri, 16 Jun 2017 00:19:31 +0000 (17:19 -0700)]
Add more sane multi-profile app attribution.
Due to issues w.r.t. attribution across multiple users, we originally
duplicated the previous implementation which zeroed out the sizes. This,
however, caused system bloat due to the change in how we calculate the
system size.
By attributing apps which do not exist in the primary profile to the
first user that shows up with it installed, we can avoid accidentally
attributing it to the system size.
Bug:
62623731
Test: Settings unittest & Settings robotest
Change-Id: I9514c9ecef62ea6270723f62e6bf27c69b75f180
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
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
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 [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
Bill Yi [Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
327b9119d7 -s ours
Change-Id: I894b154c6d428d8ff35098dcee354892d89cdca4
TreeHugger Robot [Tue, 13 Jun 2017 08:07:07 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Alison Cichowlas [Tue, 13 Jun 2017 01:41:39 +0000 (01:41 +0000)]
Limit unconfigurability to specified channels.
am:
80fa6b5833
Change-Id: I259952cbd22ef6a98d45cb3e077e07d5eb797b67
Bill Yi [Tue, 13 Jun 2017 01:23:15 +0000 (18:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e652a0921b8e6c0c084b4deeb2949ce84896319
Auto-generated-cl: translation import
Alison Cichowlas [Thu, 8 Jun 2017 20:17:23 +0000 (16:17 -0400)]
Limit unconfigurability to specified channels.
Bug:
62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
Antony Sargent [Fri, 9 Jun 2017 15:49:11 +0000 (15:49 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am:
d77b699e60
Change-Id: I2f7f524ee29224ee02a881c368bc058e55e98fec
Antony Sargent [Fri, 9 Jun 2017 15:41:25 +0000 (15:41 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
jackqdyulei [Fri, 9 Jun 2017 08:34:46 +0000 (08:34 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
am:
4f02eebab8
Change-Id: Id02583309a3e547855b7ffc69e065c2293fb172e
TreeHugger Robot [Fri, 9 Jun 2017 08:29:56 +0000 (08:29 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
jackqdyulei [Thu, 8 Jun 2017 21:26:39 +0000 (14:26 -0700)]
Make flag "showAllapps" persistent in PowerUsageSummary
This flag is used to decide whether to show all the apps
(including system app, service..) in battery settings
Handle it in onCreate() and onSaveInstanceState()
Bug:
62422948
Test: RunSettingsRoboTests
Change-Id: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
Merged-In: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
jackqdyulei [Fri, 9 Jun 2017 02:57:46 +0000 (02:57 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev
am:
031b90541f
Change-Id: I7ec1ee37eb42d5523502ae3a17694f61ea6197ba
TreeHugger Robot [Fri, 9 Jun 2017 02:53:35 +0000 (02:53 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev
Matthew Fritze [Fri, 9 Jun 2017 01:23:39 +0000 (01:23 +0000)]
Merge "Search results always highlight proper results" into oc-dev
am:
2a32cb6a33
Change-Id: I649a4122952a41b31ee66b0daab8607b683d3e19
TreeHugger Robot [Fri, 9 Jun 2017 01:19:37 +0000 (01:19 +0000)]
Merge "Search results always highlight proper results" into oc-dev
Daniel Nishi [Fri, 9 Jun 2017 00:19:03 +0000 (00:19 +0000)]
Merge "Update the music files icon." into oc-dev
am:
47c6afde7f
Change-Id: I78e6e1a16e25aff0e0374f5910fcbba0624f712b
TreeHugger Robot [Fri, 9 Jun 2017 00:13:18 +0000 (00:13 +0000)]
Merge "Update the music files icon." into oc-dev
Matthew Fritze [Wed, 7 Jun 2017 00:14:33 +0000 (17:14 -0700)]
Search results always highlight proper results
In fragments where preferences were being injected after
the super#onResume, the incorrect preference was
being highlighted as the selected result.
This is because the index of the preference is calculated
in SettingsPreferenceFragment#onResume, but the index is
not checked again before the item is highlighted.
Instead, we calculate index right before we highlight.
Change-Id: Idaa655f682a1a6186c1996fb51d352589bbeda0f
Fixes:
62179739
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
Bill Yi [Thu, 8 Jun 2017 22:48:47 +0000 (22:48 +0000)]
Import translations. DO NOT MERGE
am:
29a7bce4e5 -s ours
Change-Id: Iaec93787ba7a7e2eb885893842cea02932e16abe
jackqdyulei [Wed, 7 Jun 2017 22:56:03 +0000 (15:56 -0700)]
Update subtitle for apps in battery settings
1. If it is a normal app, show "Screen usage TIME"
2. If it is a hidden app, show "TIME"
Note that in this case the item screen will show "TIME"
Bug:
62422404
Test: RunSettingsRoboTests
Change-Id: Ie8d6caf998d18994ac158f0217109c0e5e9f92ba
Daniel Nishi [Mon, 5 Jun 2017 21:35:29 +0000 (14:35 -0700)]
Update the music files icon.
Change-Id: Id1c933e395131ca6e9e9268d7c42f7324aa6fdac
Fixes:
62291640
Test: Manual
Bill Yi [Thu, 8 Jun 2017 14:59:38 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I118bf54c3426f15db267545b83e9478177d13a06
Auto-generated-cl: translation import
Bartosz Fabianowski [Thu, 8 Jun 2017 05:55:40 +0000 (05:55 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
am:
9e94d80fa5
Change-Id: Ic9c510dac141664020567877d501da6289b633b4
TreeHugger Robot [Thu, 8 Jun 2017 05:51:14 +0000 (05:51 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
jackqdyulei [Thu, 8 Jun 2017 02:13:24 +0000 (02:13 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev
am:
f5f51c4cf2
Change-Id: Ifd36cd50e2f4528dae247e99aafb5e93d916351e
TreeHugger Robot [Thu, 8 Jun 2017 02:10:28 +0000 (02:10 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev
Shinji Sogo [Sat, 13 May 2017 07:33:02 +0000 (16:33 +0900)]
Cleanup unused WifiP2pSettings code in WifiSettings
Cleanup commented code giving access to WifiP2pSettings from option menu
is not needed anymore.
Bug:
38333540
Test: Manual test
Change-Id: I5884ec219ba09601d9602f026fa8ad89f765934f
Matthew Fritze [Wed, 7 Jun 2017 20:46:56 +0000 (20:46 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev
am:
9f2f9e331f
Change-Id: Ie3fe1e8a7d2ac0c4045209403966dd80b7c4b5fa
TreeHugger Robot [Wed, 7 Jun 2017 20:39:36 +0000 (20:39 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev
jackqdyulei [Wed, 7 Jun 2017 20:20:47 +0000 (13:20 -0700)]
Use default package in BatteryEntry
Before this cl, we use the first package name if there is a name
list in BatterySipper.
We should use BatteryEntry.defaultPackageName instead, which could
describle the batterysipper more accurately.
Bug:
62417935
Test: RunSettingsRoboTests
Change-Id: I44fa151c0cf8f14cba305f179c7e94e5bc3ce434
Matthew Fritze [Wed, 7 Jun 2017 15:59:30 +0000 (08:59 -0700)]
Hide Display Theme from search results when not available
Test: make RunSettingsRoboTests
Fixes:
62377986
Change-Id: I5d0737034ef3f845e790934465b65a5415654822
Bartosz Fabianowski [Tue, 6 Jun 2017 15:33:30 +0000 (17:33 +0200)]
Add keys to all Preferences on the Managed device info page
In order to be able to hide the page from search results, all Preferences
(and PreferenceCategories) must have android:keys.
Bug:
62285529
Test: The Settings framework will have a test that ensure each Preference
Test: has a key from O-DR onward
Change-Id: I1e41ce6f8b9f90155ef92354b9268e9e720e1e73
Antony Sargent [Tue, 6 Jun 2017 23:04:56 +0000 (16:04 -0700)]
Set advanced battery usage items as non-selectable
The items in the ListView for the Advanced battery usage screen should
not ripple when touched, since these items don't do anything.
Bug:
38019330
Test: make RunSettingsRoboTests
Change-Id: I987a770f0f146b02bbf947238be7490e8a170feb
William Luh [Tue, 6 Jun 2017 23:57:31 +0000 (23:57 +0000)]
Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev
am:
f702e39156
Change-Id: I3e45e09f609428bd7abe46629d68adf54c5b357b
Alison Cichowlas [Tue, 6 Jun 2017 23:57:05 +0000 (23:57 +0000)]
Merge "If two groups are posted to settings, remove old group and log." into oc-dev
am:
9fa5e66a66
Change-Id: Iafb44eeb33fc626633ed885a2a18ed1cbe95ee48
William Luh [Tue, 6 Jun 2017 23:56:36 +0000 (23:56 +0000)]
Merge "Make icons colorful for Security settings." into oc-dev
am:
9f7e705426
Change-Id: I397599ce60a3a334aae17ad77dfa94c4e7b24398
TreeHugger Robot [Tue, 6 Jun 2017 23:52:47 +0000 (23:52 +0000)]
Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 23:34:42 +0000 (23:34 +0000)]
Merge "If two groups are posted to settings, remove old group and log." into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 23:31:07 +0000 (23:31 +0000)]
Merge "Make icons colorful for Security settings." into oc-dev
Lorenzo Colitti [Tue, 6 Jun 2017 22:35:42 +0000 (22:35 +0000)]
Merge "Wifi details: minor ordering fixes." into oc-dev
am:
85395155fb
Change-Id: Iae57ad27902d3dcb5406007ddc21bb03545bfcea
Lorenzo Colitti [Tue, 6 Jun 2017 22:24:42 +0000 (22:24 +0000)]
Merge "Wifi details: minor ordering fixes." into oc-dev
William Luh [Tue, 6 Jun 2017 17:27:26 +0000 (10:27 -0700)]
Make icons colorful for Security settings.
Bug:
37997112
Test: make RunSettingsRoboTests
Change-Id: I287b5321cab0d4432fae61cf5565251180f37f5f
Alison Cichowlas [Tue, 6 Jun 2017 19:06:14 +0000 (15:06 -0400)]
If two groups are posted to settings, remove old group and log.
Bug:
62136650
Test: manual: set debugger in asynctask at line 110 to force
race condition, triggered task twice then released both.
also ran existing tests with no new failures.
Change-Id: I8508fe9f191ca6cd0bb6dfbc62d884420d3fd747
Hiroki Yamamoto [Tue, 6 Jun 2017 19:34:49 +0000 (19:34 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am:
e990bf3041 am:
56a8267f59
am:
77452b8a57
Change-Id: I19237cb1f24dc1f0b127b2bd2476ee1f3a28b0bb
Hiroki Yamamoto [Tue, 6 Jun 2017 19:28:41 +0000 (19:28 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am:
e990bf3041
am:
56a8267f59
Change-Id: Idca7ade0068f390289c7c13d1765fead6e0e1d35