Commit Graph

15016 Commits

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

Change-Id: I3bab1fcdd3ce7de7cbc6015011ec12a86ab76dca
2016-12-28 19:11:25 +00:00
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
TreeHugger Robot
93995549a7 Merge "Removed emergency info and add user when locked from Users settings." 2016-12-28 02:16:48 +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
Doris Ling
34a4c804f8 Removed emergency info and add user when locked from Users settings.
If new IA is enabled,  Emergency Info and Add user when locked has been moved to
Users & accounts page, so Users page should not show them.

Also fix the issue that update for the add user when locked switch does
not persist correctly.

Change-Id: I26d9f59d0f4bf3fd36a7d07d13f95127b40a8a3e
Fix: 33703736
Test: make RunSettingsRoboTests
2016-12-27 16:35:22 -08:00
TreeHugger Robot
8ad489000e Merge "Update bluetooth summary text when state changes." 2016-12-28 00:02:53 +00:00
Fan Zhang
00d617df0b Update bluetooth summary text when state changes.
- Refresh connected state before setting summary text.
- Detect inconsistent state (BT manager says connected but doesn't
  provide a connected device)

(This basically syncs implementation between settings and QS tile)

Change-Id: Id23138f8432b9aecd194f5016bf2576e33e8ca98
Fixes: 33341275
Test: RunSettingsRoboTests
2016-12-27 14:18:58 -08:00
TreeHugger Robot
44f2ad1c9a Merge "Align seek bar type preferences to reserve icon space" 2016-12-27 20:06:41 +00:00
TreeHugger Robot
8b664ed96f Merge "Add the key extraction method in PowerUsageSummary" 2016-12-27 19:54:03 +00:00
Fan Zhang
0f79feaa93 Align seek bar type preferences to reserve icon space
Bug: 33775510
Fixes: 33787883
Test: visual

Change-Id: I886e75551f3510d85b6047cc55c26dd21c5c55df
2016-12-27 10:30:01 -08:00
Robin Lee
d5afb5a60c resolve merge conflicts of 6446d2f to master
Change-Id: Ibf37d7fed8f8fbb32a601944f504494101c21a3e
2016-12-23 12:16:19 +00: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
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
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
jackqdyulei
717838d3b0 Add the key extraction method in PowerUsageSummary
This cl is to fix the preference flicker issue. The main reason is
that we cannot find cached preference because of the inconsistent
search key. The search key is calculated without considering
uidObj, but the key in preference(aka changed preference) maybe
changed later based on the existence of uidObj. So when we search
the changed preference using the wrong key, we won't get it even
though it exists in the cache.

In my cl, I group two parts(search key calc + considering uidObj)
together in a method to extract the key.

Bug: 33663705
Test: make RunSettingsRoboTests
Change-Id: I2ca0c558ffc0d49ed9576321ecbc02542b568d65
2016-12-22 09:43:34 -08: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
Tadashi G. Takaoka
a034fa5407 Refactor DynamicIndexableContentMonitor
Refactor content monitoring code into a few singletons to keep alive
while Settings app is running.

Bug: 32995210
Test: Manually installing/uninstalling AOSP LatinIME.apk while
      Settings app is/isn't running, then search AOSP.
Test: Connecting/Disconnecting Anker bluetooth keyboard while Settings
      app is/isn't running, then search Anker.
Test: Added Robolectric test for DynamicIndexableContentMonitor.
Change-Id: I588e33be169fc9677d41c3daa59ab400f04f6419
2016-12-22 17:53:07 +09: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
TreeHugger Robot
2f97111d8a Merge "Align more prefs for icon space." 2016-12-22 00:29:06 +00:00
TreeHugger Robot
627c811c11 Merge "Expose signals being sent to support in a fragment to the user" 2016-12-22 00:28:22 +00:00
Jaewoong Jung
bdd0f0f66c Merge "Implements additional battery info menu behavior." 2016-12-21 22:57:32 +00:00
TreeHugger Robot
e59100ab9e Merge "Removed fake data" 2016-12-21 22:19:18 +00:00
nharold
2fdcea0fa3 Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am: c98ca3da26 am: 9b0c6a525d am: f44fd8d98d
am: 5e322a0e4c

Change-Id: I1783f994c13db62fca8dd16061ea97d0f569500b
2016-12-21 22:16:28 +00:00
TreeHugger Robot
9ccd30f167 Merge "Add first inline switch result." 2016-12-21 22:11:59 +00:00
TreeHugger Robot
92f5a4844d Merge "Use MetricsEvent to log page views for new IA pages." 2016-12-21 22:05:35 +00: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
Julia Reynolds
b42ac40b5f Merge "Support showing notifications as badges." 2016-12-21 21:15:47 +00:00
Fan Zhang
8f057ca3d4 Use MetricsEvent to log page views for new IA pages.
Bug: 33812754
Test: RunSettingsRoboTests
Change-Id: Ib49daa1078df44f50ecfa351c061d36849708fd7
2016-12-21 12:12:32 -08:00
Fan Zhang
ac81f26e30 Align more prefs for icon space.
Bug: 33775510
Fixes: 33798492
Test: Visual
Test: RunSettingsRoboTests

Change-Id: I9b296e4148be8c1ae537b6418b4f384bbc63a8db
2016-12-21 11:20:24 -08:00
Matthew Fritze
65fb01b520 Add first inline switch result.
Adds gestures as Inline switch results to Settings Search.

Change-Id: Ie9b69ac2a54756d5b756401e348cae0a02c907c9
Fixes: 33669037
Test: make RunSettingsRoboTests
2016-12-21 10:52:59 -08:00
Fan Zhang
d65ab0e63f Merge "Revert "Align more prefs for icon space."" 2016-12-21 17:04:04 +00:00
Fan Zhang
8af4c10476 Revert "Align more prefs for icon space."
Bug: 33798492
This reverts commit ded9fc9b07.

Change-Id: I9831858ffda263496617dff29249e243c007fa12
2016-12-21 17:03:00 +00:00
Jaewoong Jung
6a43a06cac Implements additional battery info menu behavior.
Bug: 33352540
Test: Updated existing tests.
Change-Id: I990029d2ea9032301362d614959259965b8ecb10
2016-12-20 19:17:16 -08: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
Salvador Martinez
779bfe2659 Expose signals being sent to support in a fragment to the user
The signals we are sending to support when a user
requests for support can now be accessed by clicking
on "system information" in the disclaimer.

Test: robotests
Bug: 32462840
Change-Id: Ibc941d51af117ec0e31d77972ac60d67fd1cecf1
2016-12-20 16:04:08 -08:00
TreeHugger Robot
da7292ac27 Merge "Refresh support screen more often" 2016-12-21 00:02:29 +00:00
TreeHugger Robot
8d5f29d386 Merge "Don't convert string to lower case in zen mode pref summary" 2016-12-20 23:59:39 +00:00
TreeHugger Robot
20730384a8 Merge "Align more prefs for icon space." 2016-12-20 23:04:54 +00:00
Fan Zhang
43ce3c0a57 Don't convert string to lower case in zen mode pref summary
Change-Id: Ibddf6d70b71cfd88b9de70feb12c2a3f01e31b18
Fixes: 32195605
Test: RunSettingsRoboTests
2016-12-20 14:32:26 -08:00
Fan Zhang
ded9fc9b07 Align more prefs for icon space.
- Extend preference_category to support summary text
- Removed work_profile_category, used by account list
- align prefs in storage settings
- Use Preference instead of PrefScreen in xmls
- Use proper footer preference in NightDisplaySettings, BatterySaver,
  DataSaver, AutomaticStorageManage
- Remove WallOfTextPreference

Bug: 33775510
Test: visual
Change-Id: I28156b857ff5acac8746c42384dc03d5997ebd9d
2016-12-20 13:24:31 -08: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
Matthew Fritze
9955db6360 SearchFeatureProvider's context field is removed
SearchFeatureProvider was holding on to a context and
outlived the SettingsActivity, thus leaking the activity.
The context was passed into most methods, and thus it
makes more sense to pass it in to every method.

Bug: 33677967
Test: Run MakeSettingsRoboTests
Change-Id: Ia82f30e7e0b83587b4baeef28e81da6b8e4303fe
2016-12-20 11:39:10 -08:00