Commit Graph

35844 Commits

Author SHA1 Message Date
Maurice Lam
dbfde54fb6 Merge "Show help string when onEnrollmentHelp() is called"
am: 5a926705ef

Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
2017-08-08 22:56:38 +00:00
Maurice Lam
5a926705ef Merge "Show help string when onEnrollmentHelp() is called" 2017-08-08 22:02:20 +00:00
Bill Yi
c89d5b0093 Import translations. DO NOT MERGE
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 10:38:44 -07:00
Jian Zhou
3aee5e1ad0 Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
am: 41b4d908bb

Change-Id: If3c634811506bdc9f3de5501e60f6a662ac2873a
2017-07-27 18:22:21 +00:00
Ryusuke Sawa
b0e008841f Merge "Show Error dialog when WPS is interrupted"
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
2017-07-27 18:21:19 +00:00
Treehugger Robot
41b4d908bb Merge "Settings: Fix SparseArray null pointer issue in monkey issues" 2017-07-27 18:16:08 +00:00
Treehugger Robot
fd7dec5d4a Merge "Show Error dialog when WPS is interrupted" 2017-07-27 18:15:35 +00:00
Ryusuke Sawa
a15be47bd5 Show Error dialog when WPS is interrupted
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.

Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on

Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
2017-07-27 10:53:31 +09:00
Pengfei Zhao
dfe237f2cf Merge "Fix Settings crash when setting only decimal point to data usage warning"
am: 3a2e327741

Change-Id: Ic25c64da40b1accb9dce63a63462acd01664e054
2017-07-18 20:31:57 +00:00
Treehugger Robot
3a2e327741 Merge "Fix Settings crash when setting only decimal point to data usage warning" 2017-07-18 20:24:35 +00:00
Pengfei Zhao
c05a3a0227 Fix Settings crash when setting only decimal point to data usage warning
Settings app crashes when only decimal point (".") is set to
data usage warning because it is not a valid number.
To fix this issue, the decimal point should be converted to 0.

Fixes: 63787824
Test: manual - go to Settings > Data usage > Mobile data usage and then
               set only decimal point to data usage warning.

Change-Id: Iefb6a035ba6f17b8e0c89f79dbd397e2356fb19c
2017-07-18 06:50:18 +00:00
xiaocheng.x.wang
8ef6f6c839 Merge "Black screen appears after tapping the back key"
am: abcd256842

Change-Id: I2deeaed21b9452933e25a324e420c1cacfcfb395
2017-07-17 21:46:47 +00:00
Treehugger Robot
abcd256842 Merge "Black screen appears after tapping the back key" 2017-07-17 21:39:29 +00:00
Nobuyuki Nakamura
2c872109eb Show help string when onEnrollmentHelp() is called
The help string is not shown when onEnrollmentHelp() is called
between onEnrollmentProgressChange() and mTouchAgainRunnable#run().
To fix this issue, showError() should be called.

Bug: 30274453
Test: manual - start enrolling fingerprint and move finger fast on the sensor

Change-Id: Ie604532940e40cca66dc54b56c3cb4b828a07987
2017-07-12 05:42:37 +00:00
kun.tang
d34ce65e22 Merge "Fix Phone crash when rorate screen on SimStatus."
am: 3cbae7d6b5

Change-Id: I3c968a9bbd7bb687aae53d5d74a9a2b3e38bcbae
2017-07-10 19:17:03 +00:00
Treehugger Robot
3cbae7d6b5 Merge "Fix Phone crash when rorate screen on SimStatus." 2017-07-10 19:08:11 +00:00
kun.tang
0c06bab9cc 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
2017-07-08 11:09:02 +08: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