Commit Graph

33929 Commits

Author SHA1 Message Date
Maurice Lam
ce4a5ade9b Use regular preference theme for setup wizard
Use the regular preference theme rather than the settings specific
one, because setup wizard doesn't want the space reserved for icon
done in the settings theme.

Also minor changes to Espresso FirstIdViewMatcher for a more
descriptive message.

Test: runtest --path tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java
Bug: 33922083
Change-Id: Ic878ccf7b01cfa090ca4587b160e1f9dedfb8d3a
2016-12-29 15:59:29 -08:00
jackqdyulei
0fd7190fdd Refine animation to remove strange reshuffling animation
The issue happens mainly because two animations(move + change) running
on the same view interrupt with each other. When ItemAnimator runs the
move animation, it will change the translationX&Y in a time period.
When the change animation occurs in this period, it gets this translation
value and calculates a non-zero deta, then it would run an unnecessary
move animation, which causes the strange reshuffling.

In this cl, I skip the translation value only for the tile view when
there is pending animation.

I also add scroll operation for conditions view to make it scroll to
top after condition change.

Bug: 33839777
Bug: 33839780
Test: make -j40 RunSettingsRoboTests

Change-Id: I2152f93f756ae20cf754d6fca3525119cb4ceb1f
2016-12-29 14:18:16 -08:00
Shahriyar Amini
4774b58b4c Dynamically update injected security preferences.
Bug: 31002801
Test: make RunSettingsRoboTests

onResume will dynamically update injected security preferences with data
from the associated tiles.

Change-Id: Ibf46abdfcff27bd1b00729fe815c3cf3ace64e26
2016-12-29 12:04:47 -08:00
Geoffrey Pitsch
db380fa9cb DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
When an app was blocked in the past, don't hide the controls
so the user is able to unblock the app.  After unblocking, the
controls will be hidden the next time settings is visited.

Bug:32557897
Change-Id: I7ab17f647b197162932b131c41bb18cf5c18917d
2016-12-29 09:29:52 -05:00
Lei Yu
3a21de9349 Merge "Add NPE check for method assignDefaultPhoto in Utils.java" 2016-12-28 22:28:10 +00:00
TreeHugger Robot
56340d4306 Merge "Remove System Updates in Phone status." 2016-12-28 21:26:28 +00:00
TreeHugger Robot
61fef6051c Merge "Dump the default broswer in SettingsDumpService" 2016-12-28 21:02:14 +00:00
Doris Ling
e3751a1a73 Remove System Updates in Phone status.
If new IA is enabled, System updates is shown under System, so
Phone status page should not show it.

Change-Id: Ied857a28d27eae2782920d4cee38777fae40e7b6
Fix: 33839778
Test: make RunSettingsRoboTests
2016-12-28 11:51:16 -08:00
jackqdyulei
8164c64edc Add NPE check for method assignDefaultPhoto in Utils.java
When user press back button while adding user, app may crash because
of null context. In this cl, I add NPE check for context in method
assignDefaultPhoto and change this method to return boolean value.
If the return value is false, then stop the following steps(e.g.
creating a dialog after pressing button may also cause crash.)

Bug: 33829308
Test: make -j40 RunSettingsRoboTests
Change-Id: I811b92c268fb20f8c43ab3b0a9ceebe76f5d83be
2016-12-28 11:30:54 -08:00
jackqdyulei
a9eb4a0ee2 Dump the default broswer in SettingsDumpService
In SettingsDumpService, add the feature to dump the default
broswer. When there is no default broswer, dump nothing.

Bug: 27043208
Test: make -j40 RunSettingsRoboTests
Change-Id: I5ce8180d419f8a0e921da72da28eccb36a523668
2016-12-28 11:19:47 -08:00
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
Robin Lee
b04fbc334e Clarify meaning of vpn_lockdown_{active,inactive}
Change-Id: I7ea1c91c800717ba5f8349a064ad94e24b87afdb
Fix: 33837714
2016-12-28 11:47:25 +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
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