Phil Weaver
cc395469bc
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-17 16:38:07 -07:00
Phil Weaver
1d21738bd6
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-13 00:03:49 +00:00
Phil Weaver
9e63322457
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a
...
am: 23a6d1d953 -s ours
Change-Id: Ic4747be59996146ac76509581e390afc99ebe876
2017-07-12 23:15:51 +00:00
Phil Weaver
23a6d1d953
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3
...
am: 8870bd7c5a
Change-Id: I4a9a2124db4e45793d969be6c3e33479524e01c9
2017-07-12 23:08:49 +00:00
Phil Weaver
8870bd7c5a
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6
...
am: 254bbe84a3
Change-Id: I87ffde2e35401e7d027ddae59bbbeddbe6ed91dc
2017-07-12 23:02:11 +00:00
Phil Weaver
254bbe84a3
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380
...
am: 8bf67896d6
Change-Id: If3df05ce2112fb26b53651f51d47987d4f8582ca
2017-07-12 22:56:17 +00:00
Phil Weaver
8bf67896d6
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours
...
am: e9d2bdc380
Change-Id: I568b19d74265138d2f5cb563491c379bcfbb18aa
2017-07-12 22:50:05 +00:00
Phil Weaver
e9d2bdc380
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c
...
am: 24aaf4d7ad -s ours
Change-Id: Ibf0c76ba5e9059cd87282cefa9b0c7724ed64128
2017-07-12 22:41:40 +00:00
Phil Weaver
24aaf4d7ad
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688
...
am: a486c82d9c
Change-Id: Ib92175b78417bda6e58da2b93e37143a428852c0
2017-07-12 22:35:43 +00:00
Phil Weaver
a486c82d9c
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9
...
am: 4a40ef7688
Change-Id: I6d627519091040c4d64841210003de8aa1471f53
2017-07-12 22:29:09 +00:00
Phil Weaver
4a40ef7688
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours
...
am: bb12830bf9
Change-Id: I51e797becf12a2c21e04eb5e701b44cad5f8045f
2017-07-12 22:23:16 +00:00
Phil Weaver
bb12830bf9
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4
...
am: b72ffa47a4 -s ours
Change-Id: Idc84d1fbeb9e6bcb219c231af4565b666d2d1f00
2017-07-12 22:19:08 +00:00
Phil Weaver
b72ffa47a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours
...
am: df045253a4
Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c
2017-07-12 22:13:16 +00:00
Phil Weaver
df045253a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours
...
am: 98e0930394 -s ours
Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb
2017-07-12 22:06:35 +00:00
Phil Weaver
98e0930394
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e
...
am: bebc9f9f3c -s ours
Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c
2017-07-12 21:59:38 +00:00
Phil Weaver
bebc9f9f3c
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
...
am: 840b78e19e
Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8
2017-07-12 21:55:38 +00:00
Phil Weaver
840b78e19e
DO NOT MERGE Back-port ag/2491664
...
am: 9a14484b38
Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96
2017-07-12 21:43:49 +00:00
Phil Weaver
485d94a7ef
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-12 14:07:07 -07:00
Phil Weaver
9a14484b38
DO NOT MERGE Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
2017-07-12 20:50:13 +00:00
Bill Yi
750540ae48
Import translations. DO NOT MERGE
...
am: 7267438b58 -s ours
Change-Id: Id5933547a1b04477e00dbef1fd88382a01e02891
2017-07-11 03:47:35 +00:00
Bill Yi
7267438b58
Import translations. DO NOT MERGE
...
Change-Id: Ifbee1421f45d2cb6f3d5c533e5c4e9a2735afa10
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 17:16:10 -07:00
Bill Yi
f812f94216
Import translations. DO NOT MERGE
...
Change-Id: Ifb8d0e63a8150656a55bb1b2adf5748c75a10224
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 16:49:52 -07: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
8e132ce53c
Import translations. DO NOT MERGE
...
Change-Id: I19a85ce3981e7aac6708b6aa2d78fd51c9d03141
Auto-generated-cl: translation import
2017-06-27 00:26:26 -07: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
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
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
Bill Yi
ae5a31e55c
Import translations. DO NOT MERGE
...
Change-Id: Idfada62fcc0224d6bffd354ab140fd5300a5a8a3
Auto-generated-cl: translation import
2017-06-20 21:36:56 -07: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
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
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
TreeHugger Robot
e3f322dfc7
Merge "Misc fixes for notification" into oc-dev
2017-06-19 14:39:21 +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
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
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
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
TreeHugger Robot
327b9119d7
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-06-13 08:07:08 +00:00
Bill Yi
118be8a9d7
Import translations. DO NOT MERGE
...
Change-Id: I9e652a0921b8e6c0c084b4deeb2949ce84896319
Auto-generated-cl: translation import
2017-06-12 18:23:15 -07:00
Alison Cichowlas
80fa6b5833
Limit unconfigurability to specified channels.
...
Bug: 62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
2017-06-12 23:17:11 +00:00
Antony Sargent
d77b699e60
Merge "Set advanced battery usage items as non-selectable" into oc-dev
2017-06-09 15:41:27 +00:00
TreeHugger Robot
4f02eebab8
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
2017-06-09 08:29:57 +00:00
jackqdyulei
82fcadad65
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
2017-06-08 21:49:15 -07:00
TreeHugger Robot
031b90541f
Merge "Update subtitle for apps in battery settings" into oc-dev
2017-06-09 02:53:36 +00:00
TreeHugger Robot
2a32cb6a33
Merge "Search results always highlight proper results" into oc-dev
2017-06-09 01:19:38 +00:00
TreeHugger Robot
47c6afde7f
Merge "Update the music files icon." into oc-dev
2017-06-09 00:13:19 +00:00