Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,050 Commits 1 Branch 0 Tags
802b2f85614e28ab99952dba64f744e4e1daa912
Commit Graph

13375 Commits

Author SHA1 Message Date
gaochong
802b2f8561 Merge "Handle SubSettings instance leaks in Index.java" am: 527b2b220a am: bf4a67ec0f 
am: 28688c3ba3

Change-Id: I31cd7f083c529342ac2b07f054d82b4a9191937b
 2016-12-28 19:03:46 +00:00
gaochong
28688c3ba3 Merge "Handle SubSettings instance leaks in Index.java" am: 527b2b220a 
am: bf4a67ec0f

Change-Id: I89d30398cfe13e72ccbcbb92d5d4e0eda5f350ae
 2016-12-28 18:55:47 +00:00
gaochong
bf4a67ec0f Merge "Handle SubSettings instance leaks in Index.java" 
am: 527b2b220a

Change-Id: Iccfeef38ca133bb63708b9f6ce90c457aadf62f6
 2016-12-28 18:48:16 +00:00
Treehugger Robot
527b2b220a Merge "Handle SubSettings instance leaks in Index.java" 2016-12-28 18:43:26 +00:00
gaochong
e4395bd751 Handle SubSettings instance leaks in Index.java 
Index's constructor will hold context of caller.
context.getApplicationContext() instead of context to prevent activity
leaks.

Bug: https://code.google.com/p/android/issues/detail?id=223322

Test: manual-start a new activity call Index constructor ,then pressed
back.

Change-Id: Ic12af62f9b718d328610a57985f64ca4629bab99
Signed-off-by: gaochong <gaochong@xiaomi.com>
 2016-12-28 09:18:15 +08:00
Robin Lee
6446d2f0d8 Merge "Update VPN preference state after disallow configuring VPN policy has changed." am: 601d339868 am: 4395176792 
am: 7779d9ee91

Change-Id: I7d7b4c181ba94d662f4d1946513fdaf6bdb6e9dd
 2016-12-23 10:45:23 +00:00
Robin Lee
7779d9ee91 Merge "Update VPN preference state after disallow configuring VPN policy has changed." am: 601d339868 
am: 4395176792

Change-Id: Ie71a58c50fde7c5ecc4f80dfe5eb854428044480
 2016-12-23 10:39:24 +00:00
Robin Lee
4395176792 Merge "Update VPN preference state after disallow configuring VPN policy has changed." 
am: 601d339868

Change-Id: I94666d5f7812b15432b44ed50d8d396b373d3e69
 2016-12-23 10:33:22 +00:00
insight.lee
7c4d52c570 Update VPN preference state after disallow configuring VPN policy has changed. 
1. When Settings > More and change disallow configuring VPN policy
   and resume Settings, update VPN preference state.

2. When Settings > More > VPN and change disallow configuring VPN policy
   and resume VPN Settings, update its state.

Test: manual

Signed-off-by : Sungmin Lee <insight.lee@lge.com>

Change-Id: I4f3c85733ca6ba05cba46e2f4854f54a42b10c21
 2016-12-22 16:14:48 +09:00
nharold
5e322a0e4c Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am: c98ca3da26 am: 9b0c6a525d 
am: f44fd8d98d

Change-Id: I6845ff460b0b2d7c1960568b920685673dcba6fc
 2016-12-21 21:59:18 +00:00
nharold
f44fd8d98d Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am: c98ca3da26 
am: 9b0c6a525d

Change-Id: I94f2d7b9234e4fb6a2bfe15171a5145f446a0233
 2016-12-21 21:53:18 +00:00
nharold
9b0c6a525d Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" 
am: c98ca3da26

Change-Id: Ic7b16572aab3a3d10ee06d1810ce0aa05a9e5b1d
 2016-12-21 21:49:04 +00:00
nharold
c98ca3da26 Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" 2016-12-21 21:40:21 +00:00
Youhan Wang
70b47859fa DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu. 
am: d9b3709fc1

Change-Id: I4f10d79d7dcd29a59c1ac0823f394cbb3e76256d
 2016-12-21 00:37:24 +00:00
Youhan Wang
d9b3709fc1 DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu. 
Failed Treehugger automerge to master, will be cherry-picked to master
manually.

Bug:32874442
Change-Id: Ie64eb28671ec4afafd352d1f86b61c4ce1108338
 2016-12-20 12:37:12 -08:00
Nathan Harold
f8555e4812 Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List 
To facilitate user recovery from issues where the band mode
list is incomplete and may not report the full list of bands,
the user should *always* have the ability to set the band mode
selection to AUTOMATIC.

Bug: 28124606
Test: compilation, UI check
Change-Id: Ib961d9b058ade5a51dfec0777971c8c98dee2033
 2016-12-19 18:04:52 -08:00
Jeremy Joslin
1fed0c6ae7 Merge "New pref toggle for network recommendations." am: a5249906ab am: 2b03ffb264 
am: 6061ca1b1a

Change-Id: I05753f7a5d54cd7707531c0a6cd9491c081454b3
 2016-12-19 22:09:52 +00:00
Jeremy Joslin
6061ca1b1a Merge "New pref toggle for network recommendations." am: a5249906ab 
am: 2b03ffb264

Change-Id: Ie4f4255740559a3018ba84df0084ff94995aa87d
 2016-12-19 22:06:22 +00:00
Jeremy Joslin
2b03ffb264 Merge "New pref toggle for network recommendations." 
am: a5249906ab

Change-Id: I7f39f341077bcc403c06d08a87d394f0f25f6356
 2016-12-19 22:02:23 +00:00
Jeremy Joslin
fbcff7a6b2 New pref toggle for network recommendations. 
Adding a new toggle to control whether network
recommendations are enabled.

Removed the "Use open networks" pref and its associated strings
and components as it's no longer needed.

Test: Built and ran.
BUG: 33549591
BUG: 33270391
Change-Id: I03069ca30d06089600ca958f8da117564189f839
Merged-In: I7248ac32e0598d82107c150372c1fe4e9e2243a5
Merged-In: I82eed6dc7daef1c622ea4e33ce42c331e0cd786d
 2016-12-18 10:33:28 -08:00
Zhendong Yang
8c9e3db8d9 Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d 
am: 8711f4055d

Change-Id: Idb2d601fa627dcb8268228435192392c760787d0
 2016-12-14 05:53:04 +00:00
Zhendong Yang
8711f4055d Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 
am: 7598c6201d

Change-Id: I97e9ef07df912e7bac3c4657272feab943bcb84e
 2016-12-14 05:46:08 +00:00
Zhendong Yang
7598c6201d Merge "Fix crash when rotating HighPowerDetail dialog" 
am: 783ff43769

Change-Id: Ie4f4856f6e4b1bb4970013b2425bb39d34383859
 2016-12-14 05:38:34 +00:00
Treehugger Robot
783ff43769 Merge "Fix crash when rotating HighPowerDetail dialog" 2016-12-14 05:30:16 +00:00
Tony Mak
2d45ef14e5 DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD 
am: 8a2f28a629

Change-Id: I1c8cdfe6e4c052a0bee1391c9c1166868da5f6ac
 2016-12-14 02:19:22 +00:00
TreeHugger Robot
0e7405fc17 Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev 2016-12-14 02:08:37 +00:00
Svetoslav Ganov
c6a074c80d DO NOT MERGE Add Bluetooth toggle prompts - settings 
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749
Change-Id: I0b9065446f9d0cfb819065eaf2dc160eb1c1f7ec
 2016-12-12 09:44:39 -08:00
Zhendong Yang
cb911e3402 Fix crash when rotating HighPowerDetail dialog 
When rotating the device, the Activity of the target
Fragment become null. So NullPointerException occurs.
The dialog should check if the Activity is null
before calling onActivityResult().

Bug: 28333723
Test: manual - go to Settings > Apps > Clock,
               click Battery optimization and rotate device

Change-Id: I7f68d6ece7d169fd96d04c1788e55ee506aae1ae
 2016-12-12 20:55:40 +09:00
Tony Mak
8a2f28a629 DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD 
This is a cherry-pick of ag/1640561.

1. Context.getActivityToken is not available in n mr2, passed the token
   from the activity to the controller instead.

2. Haven't pick the tests from master to mr2 branch because robotest
   is not set up in mr2 branch.

Fix: 32959373

Change-Id: I2f73d01ab11e91b337beb90c05bbcb857dfd40dc
 2016-12-12 02:35:42 +00:00
Nathan Harold
70ab95ee63 Add Ims Registration Info to RadioInfo 
am: 839b9f9733

Change-Id: I18a64c82bf853b86da4fe99981b1b8d6f5955643
 2016-12-09 22:23:33 +00:00
Nathan Harold
cc140412a5 Enable and Disable IMS Provisioning Based on Platform Capability 
am: c137050588

Change-Id: If618e69ebc504e55ab5a8eda874104f471ae44fc
 2016-12-09 22:23:26 +00:00
Youhan Wang
f6b8321654 Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev 
* changes:
  Add Ims Registration Info to RadioInfo
  Enable and Disable IMS Provisioning Based on Platform Capability
 2016-12-09 22:17:09 +00:00
xiaocheng.x.wang
b4624dceda Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a 
am: 2366d4dcfd

Change-Id: If27c734d231abbc76d21ac6efcab3933fe34f460
 2016-12-09 21:08:45 +00:00
xiaocheng.x.wang
2366d4dcfd Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 
am: 2d38abb49a

Change-Id: Ic105a97e7ee4d56f16dc8f67d2b09a6ebd55b3ba
 2016-12-09 21:02:45 +00:00
Treehugger Robot
5c6e7a2116 Merge "Fix apn can't be updated when pressing back key" 2016-12-09 20:50:39 +00:00
Daniel Nishi
edf31e2e38 Move private volume storage calculations into a shared lib. 
am: c04f8b9ecd

Change-Id: If2822dfcebf95546c0fa2ee96d3e689e104f3d59
 2016-12-08 00:50:11 +00:00
Nathan Harold
839b9f9733 Add Ims Registration Info to RadioInfo 
Replaced not used pdp list.

Bug:32874442
Change-Id: Iadb21a3108aaaa3afcde3972e6f98bfbbd5413f1
 2016-12-06 14:54:56 -08:00
Nathan Harold
c137050588 Enable and Disable IMS Provisioning Based on Platform Capability 
Bug:32874442
Change-Id: I4be301864a3d48ef14834caa707e9d64536fd836
 2016-12-06 14:25:51 -08:00
Amin Shaikh
409f09b15a Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e am: 3140bb5ace 
am: 7c8af0aedc

Change-Id: I08804d0672ee723f0e6b1278972613a4f11f479d
 2016-12-01 02:27:02 +00:00
Amin Shaikh
7c8af0aedc Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e 
am: 3140bb5ace

Change-Id: I61fa13f1537465bf61ec65183d3844b2a2ffd001
 2016-12-01 02:21:13 +00:00
Amin Shaikh
3140bb5ace Merge "Refactor NetworkScoreAppManager for testing." 
am: 512368a22e

Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb
 2016-12-01 02:11:06 +00:00
Amin Shaikh
f91ac62756 Refactor NetworkScoreAppManager for testing. 
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
 2016-11-29 10:17:34 -08:00
Daniel Nishi
c04f8b9ecd Move private volume storage calculations into a shared lib. 
Bug: 30895163
Test: m RunStorageManagerRoboTests
Change-Id: I3e464c8b721373ebc1527eb5411622c69bf587d1
 2016-11-28 11:00:48 -08:00
Fan Zhang
b69ec294c2 Fix crash when opening account sync detail for external app am: c9cdc25f41 
am: f3e86ca481

Change-Id: I1ba3f6f34e010b95e1a86d6272c82adcee72117a
 2016-11-23 23:29:22 +00:00
Steven Ng
26a3c28735 Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495 
am: 046a63450f

Change-Id: I7cbb27a7aa4a1d42dce52ef998ffe79aaa322ab4
 2016-11-23 23:28:38 +00:00
Jerry Zhang
f8ed07fc64 Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f am: a75fa91247 
am: fd764ac0e3

Change-Id: Iee63263785e80cb1a893dc99204bb2fb225a497a
 2016-11-17 00:39:22 +00:00
Jerry Zhang
fd764ac0e3 Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f 
am: a75fa91247

Change-Id: I70fdc7a2d4bfa40e315a4de172dbcee22d666cc6
 2016-11-17 00:24:50 +00:00
Jerry Zhang
a75fa91247 Refactor setCurrentFunction and setUsbDataUnlocked into one method 
am: a1b60e629f

Change-Id: I0ed28df5f24e7fe545f968c4d65cfc0494b57ebd
 2016-11-17 00:09:38 +00:00
Jerry Zhang
89a055aa9d Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" 2016-11-16 23:59:33 +00:00
Sohani Rao
7fd676ee26 Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43 am: 6f126a8f5c 
am: 6cebca2599

Change-Id: I8cfaadb7dd8df6d81695dea8530a25de69fcce3d
 2016-11-14 21:28:16 +00:00