Commit Graph

33360 Commits

Author SHA1 Message Date
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
Robin Lee
601d339868 Merge "Update VPN preference state after disallow configuring VPN policy has changed." 2016-12-23 10:29:03 +00:00
Tadashi G. Takaoka
8a005f90ce Merge "Refactor DynamicIndexableContentMonitor" 2016-12-23 06:05:04 +00:00
Nathan Harold
6a7d1ed6ac Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev am: 94dee56f8d
am: 4bf8e85005

Change-Id: I5ab9d8f8808e2a35da59b330271a081a0102eec7
2016-12-23 01:26:43 +00:00
Nathan Harold
0ad40bee4f Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List am: d18b9fcde0
am: edb79b6222

Change-Id: Ic070095efab29f077050622fb519be7a30c447d3
2016-12-23 01:26:25 +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
61893815a4 Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev am: 642e48e527
am: fbb870c94e  -s ours

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

Change-Id: I4470aabef829cc4c4e389e11d6bbac356f8d0728
2016-12-22 21:06:34 +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
TreeHugger Robot
5bc617bd67 Merge "Update typo in string" 2016-12-22 18:36:48 +00:00
Maurice Lam
60f271f6e1 Merge "Depend on gingerbread variant of SuwLib" 2016-12-22 18:15:54 +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
Fan Zhang
cd23122aab Update typo in string
Change-Id: If3be29b785a05198984b0f990629499befcaed88
Fixes: 33738394
Test: compiles
2016-12-22 09:14:04 -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
Bill Yi
68220c6d74 Import translations. DO NOT MERGE am: 54e5382136 -s ours
am: e41df7b27c  -s ours

Change-Id: Id860b3f8409ba4d7bc810ab41d9e1c0a1e95d880
2016-12-22 08:33:22 +00:00
Bill Yi
e41df7b27c Import translations. DO NOT MERGE
am: 54e5382136  -s ours

Change-Id: Ie55ae75412f7a8e89763679c2e179d1bae2c7619
2016-12-22 07:57:23 +00:00
TreeHugger Robot
1df45999a3 Merge "Import translations. DO NOT MERGE" 2016-12-22 07:54:20 +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
Bill Yi
4df844564a Import translations. DO NOT MERGE
Change-Id: Ia651171b7f07833e707c6c81dc6045d9650ea7a2
Auto-generated-cl: translation import
2016-12-21 21:54:11 -08:00
TreeHugger Robot
3a1fae3ba9 Merge "Change Network & Internet to Network & internet." 2016-12-22 01:01:42 +00: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
41fa24b9df Merge "Changed string to notify user of effects" 2016-12-21 22:42:02 +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
Doris Ling
e71fa39118 Change Network & Internet to Network & internet.
Make "Internet" lowercase to be consistent with other settings title and
match the UI spec.

Bug: 33677629
Test: make SettingsFunctionalTests
Change-Id: I76d20c15e65db3c43e208ab8a48b7626c2103961
2016-12-21 13:44:46 -08: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