PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,196 Commits 1 Branch 0 Tags
40046d43168a38d0f69fa41a80c52b0c6794c86c
Commit Graph

30196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robin Lee
601d339868 Merge "Update VPN preference state after disallow configuring VPN policy has changed." 2016-12-23 10:29:03 +00:00
Nathan Harold
4bf8e85005 Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev 
am: 94dee56f8d

Change-Id: I001ddbd12794ce1cb09826cf07c7d1993adf5c65
 2016-12-23 01:19:55 +00:00
Nathan Harold
edb79b6222 Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List 
am: d18b9fcde0

Change-Id: I37594a773398fea40a4aeb1a7611bf424624f075
 2016-12-23 01:19:54 +00:00
Nathan Harold
94dee56f8d Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev 2016-12-23 01:11:39 +00:00
Pankaj Kanwar
fbb870c94e Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev 
am: 642e48e527

Change-Id: I70ce7b3276eeb2be9f79b427a72d6fdb66e0ff74
 2016-12-22 20:57:57 +00:00
pkanwar
7c4809a9c3 DO NOT MERGE: Add UI toggle to control connections to carrier networks. 
am: 675122ad51  -s ours

Change-Id: I3a78730b1af0d4e6eaa221cc0ccfbf28daeb57a6
 2016-12-22 20:54:05 +00:00
Pankaj Kanwar
642e48e527 Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev 2016-12-22 20:41:55 +00:00
pkanwar
675122ad51 DO NOT MERGE: Add UI toggle to control connections to carrier networks. 
Bug: 31003437
Change-Id: Ieb6dfc0dc989068e151a1d0e376f56f67c9790b2
 2016-12-22 09:39:12 -08:00
Bill Yi
e41df7b27c Import translations. DO NOT MERGE 
am: 54e5382136  -s ours

Change-Id: Ie55ae75412f7a8e89763679c2e179d1bae2c7619
 2016-12-22 07:57:23 +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
Bill Yi
54e5382136 Import translations. DO NOT MERGE 
Change-Id: Id3458a153f2db98b0035caac52eb1933cb9fd18f
Auto-generated-cl: translation import
 2016-12-21 21:59:21 -08: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
d18b9fcde0 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
(cherry picked from commit f8555e4812)
 2016-12-20 11:34:05 -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
Treehugger Robot
a5249906ab Merge "New pref toggle for network recommendations." 2016-12-19 21:54:53 +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
Bill Yi
e6c8409112 Import translations. DO NOT MERGE 
am: a48002a65a  -s ours

Change-Id: I21d68ceafcfb4fa08a5e9ad6f8d6c66e4a238787
 2016-12-15 08:05:57 +00:00
Bill Yi
a48002a65a Import translations. DO NOT MERGE 
Change-Id: If6787baad938f8184b5b6ddb2c59317b0d6144bd
Auto-generated-cl: translation import
 2016-12-14 21:03: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
4cce4c5170 Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev 
am: 0e7405fc17

Change-Id: Ie336a58e84b889d8700ab64b56248f0c4933c5fa
 2016-12-14 02:19:24 +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
Bill Yi
a379685253 Import translations. DO NOT MERGE 
am: a4e78d242d  -s ours

Change-Id: Ie0ee095783da15c15ba64fd736a175bb1600287a
 2016-12-13 03:55:17 +00:00
Bill Yi
a4e78d242d Import translations. DO NOT MERGE 
Change-Id: Ia4641aa6b6dc9907ede180fa2d7d0cb4f1c258f0
Auto-generated-cl: translation import
 2016-12-12 17:30:02 -08:00
Marie Janssen
1c4f12c6db Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours am: 0d60028669 -s ours 
am: f1342adb86

Change-Id: Ib7b4cb112fcde7e8286f24e59aa31befef56a068
 2016-12-12 21:46:12 +00:00
Marie Janssen
f1342adb86 Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours 
am: 0d60028669  -s ours

Change-Id: I38c9941c8a7102c6e987fda1d7d1d1b0155ccde9
 2016-12-12 21:40:16 +00:00
Marie Janssen
0d60028669 Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" 
am: 8c11340b0c  -s ours

Change-Id: I60f481691445aeb4926b177d83f39077b9a72921
 2016-12-12 21:34:45 +00:00
Marie Janssen
8c11340b0c Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" 2016-12-12 21:27:23 +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
Youhan Wang
9706936945 Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev 
am: f6b8321654

Change-Id: Icc7bbc20943c224bfb6cc0131480cf394b1e1124
 2016-12-09 22:24:30 +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