PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,981 Commits 1 Branch 0 Tags
662975d8611a21a1e6626e8221471eba1abcc515
Commit Graph

29981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruchi Kandoi
662975d861 Merge "Update Android Beam feature summary string" am: 27a59e1d2c 
am: abe9a41d19

Change-Id: I0a2cf7b82818102adc857cd38007a6e3ba7b4dd9
 2017-01-05 18:11:54 +00:00
Ruchi Kandoi
abe9a41d19 Merge "Update Android Beam feature summary string" 
am: 27a59e1d2c

Change-Id: I6edef06c6e0c94dc8c5d27003f19b60b2f6c5f4c
 2017-01-05 18:08:22 +00:00
Treehugger Robot
27a59e1d2c Merge "Update Android Beam feature summary string" 2017-01-05 18:04:12 +00:00
Ruchi Kandoi
de2f8e7cc1 Update Android Beam feature summary string 
Bug: 32183480
Test: compiles
Change-Id: I750e998ea73b10645666c7d080afe7320b705d47
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2017-01-04 23:44:40 +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
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
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
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
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
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
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
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
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
xiaocheng.x.wang
2d38abb49a Merge "Fix apn can't be updated when pressing back key" 
am: 5c6e7a2116

Change-Id: I5f7cf29476e88c3603c902c5e501bef08fad5c8c
 2016-12-09 20:57:46 +00:00
Treehugger Robot
5c6e7a2116 Merge "Fix apn can't be updated when pressing back key" 2016-12-09 20:50:39 +00:00
Bill Yi
f131815859 Import translations. DO NOT MERGE 
am: 5a05a8a4ea  -s ours

Change-Id: Ia227c18a81391b0609518b9a68001598bd389191
 2016-12-01 19:07:44 +00:00
Bill Yi
5a05a8a4ea Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ib08dd2e3c6b87cc0fbdc16bb167f4e167e52b020
 2016-12-01 10:11:25 -08: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
Treehugger Robot
512368a22e Merge "Refactor NetworkScoreAppManager for testing." 2016-12-01 01:59:14 +00:00
Stephen Chen
701e558586 Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5 
am: 539eaa34d5

Change-Id: I32a45ccc9a08d8f90e8801f727853fc320db9dc5
 2016-12-01 00:09:32 +00:00
Stephen Chen
539eaa34d5 Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." 
am: 666c9d7ea5

Change-Id: I1b193660453cbc492d83501f8e9fe3b544e6e4b2
 2016-11-30 23:59:43 +00:00
Treehugger Robot
666c9d7ea5 Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." 2016-11-30 20:25:13 +00:00
Amin Shaikh
f91ac62756 Refactor NetworkScoreAppManager for testing. 
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
 2016-11-29 10:17:34 -08:00
Stephen Chen
e365aa8cd9 Link WIFI_SAVED_NETWORK_SETTINGS action with activity. 
Bug: 32738882
Test: gts test
Change-Id: Ie92e55fd1b0fbb7ba90b3f378a888b098dcf3287
 2016-11-28 16:29:31 -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
Bill Yi
5cca5a64e8 Import translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours 
am: 4666b50754  -s ours

Change-Id: I1aaca58936606507f763770e65dace147da5153a
 2016-11-23 23:29:07 +00:00
Bill Yi
57b56329f3 Import translations. DO NOT MERGE am: e7f9b0b30b -s ours 
am: f8b4927683  -s ours

Change-Id: I4be07f881fd515c3668c12ecab6d2af8452d1ec0
 2016-11-23 23:28:53 +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
Bill Yi
71a0bb85a5 Import translations. DO NOT MERGE am: a6d9842695 -s ours am: c027907edc -s ours 
am: f8032d0b15  -s ours

Change-Id: I0c7f588a8868df3a7235dbbac1eff725dc591070
 2016-11-23 23:28:25 +00:00
Bill Yi
88b043714b Import translations. DO NOT MERGE am: 475763d01c -s ours 
am: 9a22968ff8  -s ours

Change-Id: Ic98ab45a4b2e31007a18e7018ad5f31c2b82d2ae
 2016-11-23 23:28:12 +00:00
Bill Yi
9e17133192 Import translations. DO NOT MERGE 
am: 001632d55c  -s ours

Change-Id: Ib267ac961a6ef99c9c1401e8967725b0f7914bac
 2016-11-21 01:28:26 +00:00
Bill Yi
001632d55c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Id8af490796464cb8422fa4be023af34baee73002
 2016-11-20 16:12:14 -08:00
Jerry Zhang
3473bc219e Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055aa9d 
am: 1451a4af78

Change-Id: I90048a233d80ee023e9f775b540248b62aa5e4ea
 2016-11-17 00:24:57 +00:00