Commit Graph

35830 Commits

Author SHA1 Message Date
Bill Yi
07a57fc90b Import translations. DO NOT MERGE
am: 126ce95bc6  -s ours

Change-Id: I99cf4ac7ff9a9ae62df014c790a7af691e670cbc
2017-07-01 16:05:02 +00:00
Bill Yi
126ce95bc6 Import translations. DO NOT MERGE
Change-Id: Id991a5f419ccb85d8e25a5111b717a84e4de6184
Auto-generated-cl: translation import
2017-06-30 18:07:52 -07:00
Bill Yi
7c952faa77 Import translations. DO NOT MERGE
am: 8e132ce53c  -s ours

Change-Id: I4c3a65ee1c1bb82dacea7e874ef906cb08fce1ac
2017-06-27 20:08:19 +00:00
Bill Yi
8e132ce53c Import translations. DO NOT MERGE
Change-Id: I19a85ce3981e7aac6708b6aa2d78fd51c9d03141
Auto-generated-cl: translation import
2017-06-27 00:26:26 -07:00
daqi
96e566a68c Merge "Fix PremiumSmsAccess memory leak" am: 31a2f413f8 -s ours
am: 34fe9136c6

Change-Id: I01c8d25555d6a71e552137d74a0b500d79df7e87
2017-06-26 22:18:38 +00:00
daqi
34fe9136c6 Merge "Fix PremiumSmsAccess memory leak"
am: 31a2f413f8  -s ours

Change-Id: Ibaba7d54ce393f2212df3f05b8929b445ccba912
2017-06-26 22:05:13 +00:00
Treehugger Robot
31a2f413f8 Merge "Fix PremiumSmsAccess memory leak" 2017-06-26 21:13:49 +00:00
Bill Yi
5386943cf2 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6b1ff7073a  -s ours

Change-Id: Ic3856a964218fae0861218de0ca46f3d50820e5f
2017-06-23 12:29:05 +00:00
TreeHugger Robot
6b1ff7073a Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-23 12:23:16 +00:00
Bill Yi
8ec66e1f56 Import translations. DO NOT MERGE
Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
2017-06-23 01:39:20 -07:00
daqi
b279330c0a 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>
2017-06-23 14:17:49 +08:00
Daniel Nishi
b57a71fe08 Count cache in storage categories.
am: b22b85b593

Change-Id: Idf44c0cd337cbd9aefc12dce8adecf97b4dc2d99
2017-06-23 04:19:16 +00:00
Daniel Nishi
b22b85b593 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
2017-06-22 19:08:48 -07:00
Marie Janssen
0efa2b3427 Bluetooth: Make notifications local-only
am: 1138397336

Change-Id: Id287a1ba31898da57385a8e72cacbe03d7b78946
2017-06-23 00:22:23 +00:00
Marie Janssen
1138397336 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 426903d155)
2017-06-22 16:18:59 +00:00
Marie Janssen
3cc4522cbc Merge "Bluetooth: Make notifications local-only" am: 348a7085fa
am: 620fe71520

Change-Id: I3df0a009c7fc6184ea1176f6953748c5031d76cd
2017-06-22 15:41:55 +00:00
Marie Janssen
620fe71520 Merge "Bluetooth: Make notifications local-only"
am: 348a7085fa

Change-Id: I7de9c9c01f1f704399c1b594beafca5bc14ef8df
2017-06-22 15:37:28 +00:00
Treehugger Robot
348a7085fa Merge "Bluetooth: Make notifications local-only" 2017-06-22 15:31:39 +00:00
Bill Yi
a3821d019a Import translations. DO NOT MERGE
am: ae5a31e55c  -s ours

Change-Id: Ic37588db9f8b69ef7fa7d69c27e717ac4f241383
2017-06-21 20:21:34 +00:00
Bill Yi
ae5a31e55c Import translations. DO NOT MERGE
Change-Id: Idfada62fcc0224d6bffd354ab140fd5300a5a8a3
Auto-generated-cl: translation import
2017-06-20 21:36:56 -07:00
jackqdyulei
7de9af3b8f Merge "Hide wifi and bt in battery settings" into oc-dev
am: 05777a7918

Change-Id: I2c12178379cfed44d6007533f420c7611038bfed
2017-06-20 23:03:00 +00:00
TreeHugger Robot
05777a7918 Merge "Hide wifi and bt in battery settings" into oc-dev 2017-06-20 22:35:59 +00:00
jackqdyulei
d10608dfbb 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
2017-06-20 13:44:52 -07:00
Marie Janssen
426903d155 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
2017-06-19 16:11:33 -07:00
Daniel Nishi
f2e4449f6f Merge "Add more sane multi-profile app attribution." into oc-dev
am: 4743423a82

Change-Id: Ia2c95906c0c526f426deaa243ff075ce70bee1fc
2017-06-19 17:55:30 +00:00
Alison Cichowlas
7cdc518674 Merge "Notification settings update." into oc-dev
am: e5493808fd

Change-Id: I0d1b48669d85b6c1289c50a2a84aaa2dc292ea2a
2017-06-19 17:49:20 +00:00
Daniel Nishi
4743423a82 Merge "Add more sane multi-profile app attribution." into oc-dev 2017-06-19 17:45:31 +00:00
TreeHugger Robot
e5493808fd Merge "Notification settings update." into oc-dev 2017-06-19 17:34:41 +00:00
gaochong
dd3945eca5 Merge "Fix Screen Magnification recursive draw" am: 4e7846fbe4
am: db233c6e88

Change-Id: If8a23a012e0b7a82dc0c6a7d349a15310b4eb43e
2017-06-19 17:12:41 +00:00
gaochong
db233c6e88 Merge "Fix Screen Magnification recursive draw"
am: 4e7846fbe4

Change-Id: I4890ba0d33dd9245f1393c59c77531f0597ff6ff
2017-06-19 17:07:37 +00:00
Treehugger Robot
4e7846fbe4 Merge "Fix Screen Magnification recursive draw" 2017-06-19 17:00:09 +00:00
Alison Cichowlas
04f77b3a6f 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
2017-06-19 15:15:50 +00:00
Fan Zhang
8d62516e89 Merge "Misc fixes for notification" into oc-dev
am: e3f322dfc7

Change-Id: I0847813623ad35b38eafc73a69f02d45208e8d32
2017-06-19 14:47:34 +00:00
TreeHugger Robot
e3f322dfc7 Merge "Misc fixes for notification" into oc-dev 2017-06-19 14:39:21 +00:00
gaochong
f4372d914e 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>
2017-06-19 17:26:18 +08:00
Bill Yi
a09c96c1a5 Import translations. DO NOT MERGE
am: 251cbcbcc5  -s ours

Change-Id: I068211d35ea2f411c996daa834d09c49db78b80a
2017-06-17 06:14:14 +00:00
Fan Zhang
470e79a286 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
2017-06-16 15:27:51 -07:00
Shinji Sogo
879fd4b406 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146
am: 27ca1272a5

Change-Id: I70f81796a7c29c416729cc7fd7b4fd8150fdc981
2017-06-16 19:00:18 +00:00
Shinji Sogo
27ca1272a5 Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
am: cd1f7a3146

Change-Id: I18adec05022abe4d96f3aac2e893a5b5cbc7f2dc
2017-06-16 18:53:50 +00:00
Treehugger Robot
cd1f7a3146 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" 2017-06-16 18:41:42 +00:00
Bill Yi
251cbcbcc5 Import translations. DO NOT MERGE
Change-Id: I3f7cec1865c8447d601b0d369de105da3fc7afa1
Auto-generated-cl: translation import
2017-06-16 07:12:33 -07:00
Daniel Nishi
b088010d12 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
2017-06-15 17:25:10 -07:00
Tony Mak
80cdf176e9 Fix searching work app in settings NO PARTIAL RERUN
am: 5651e0f2ce

Change-Id: Ib670fbde3997c8c6e984bb627bc305da7f235e2e
2017-06-15 22:29:04 +00:00
Tony Mak
5651e0f2ce 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
2017-06-15 19:48:44 +00:00
Sundeep Ghuman
0c02e22c99 Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am: 683a7e2bf5

Change-Id: Id9ef9060ce76f96d36338e5ba4ddd0701b538a08
2017-06-15 06:39:40 +00:00
TreeHugger Robot
683a7e2bf5 Merge "Allow WifiSettings to show old APs on app resume." into oc-dev 2017-06-15 06:30:58 +00:00
Sundeep Ghuman
60b814ba43 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
2017-06-14 19:07:05 -07:00
Bill Yi
e637b663e8 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 327b9119d7  -s ours

Change-Id: I894b154c6d428d8ff35098dcee354892d89cdca4
2017-06-13 08:11:23 +00:00
TreeHugger Robot
327b9119d7 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-13 08:07:08 +00:00
Alison Cichowlas
0320d4e69f Limit unconfigurability to specified channels.
am: 80fa6b5833

Change-Id: I259952cbd22ef6a98d45cb3e077e07d5eb797b67
2017-06-13 01:41:39 +00:00