Commit Graph

32704 Commits

Author SHA1 Message Date
Doris Ling
f1c4b4562d Add icon for new IA.
Add preference icon for System updates, Account sync, and App
permissions.

Bug: 33759208
Test: Visual
Change-Id: Icb0aff0e9c46d774d643b4b4262c6d3f939c791a
2017-01-05 16:44:05 -08:00
Ruchi Kandoi
f1efbcfcae Merge "Update Android Beam feature summary string" am: 27a59e1d2c am: abe9a41d19 am: 662975d861
am: e40f036ab3

Change-Id: Ife5792584ec8af1fc8decc83436c567e23ab62b8
2017-01-05 18:17:57 +00:00
Ruchi Kandoi
e40f036ab3 Merge "Update Android Beam feature summary string" am: 27a59e1d2c am: abe9a41d19
am: 662975d861

Change-Id: I6bad7c49519869dd60e130e5a31cf3514b0896c1
2017-01-05 18:14:58 +00:00
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
Bill Yi
ba4cc5613d Import translations. DO NOT MERGE am: cd3475f3d1 -s ours
am: 590ee0a9f5  -s ours

Change-Id: I79d0be529a02a53a8c5b9ed0c3beb13680952ff2
2017-01-05 10:24:49 +00:00
Bill Yi
590ee0a9f5 Import translations. DO NOT MERGE
am: cd3475f3d1  -s ours

Change-Id: I56384f858944a1607cadd5cea8f95a0e346b8a50
2017-01-05 10:16:47 +00:00
TreeHugger Robot
843a00cdc2 Merge "Import translations. DO NOT MERGE" 2017-01-05 10:11:23 +00:00
Bill Yi
cd3475f3d1 Import translations. DO NOT MERGE
Change-Id: I24410f77a5b2f4777bae8546e6709c47d971c992
Auto-generated-cl: translation import
2017-01-04 17:46:43 -08:00
Bill Yi
0ceb731065 Import translations. DO NOT MERGE
Change-Id: Ib216a7dd5eeb0dd2a22a07c83cfce2803dad5189
Auto-generated-cl: translation import
2017-01-04 17:41:14 -08: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
TreeHugger Robot
1b02e9b946 Merge "Check for text type before setting text span." 2017-01-04 23:31:36 +00:00
Shahriyar Amini
6b0a2abab0 Merge "Dynamically update injected security preferences." 2017-01-04 22:51:04 +00:00
Doris Ling
d3a32ed21b Check for text type before setting text span.
The text from the empty text view can be any CharSequence. Need to check
the actual type before trying to cast it to Spannable and setting the
text span.

Change-Id: Ib3ead0a0fe0b797e026c0c259591025fc9c94709
Fix: 34075068
Test: make RunSettingsRoboTests
2017-01-04 13:51:38 -08:00
Jeremy Klein
7dbad8ceb5 Exclude the TetherProvisioningActivity from recents.
This is just a proxy activity for launching the provisioning app.

Bug: 34067614
Test: manual
Change-Id: I8bdf75a7761199d026ef64d6671abc1165879e6b
2017-01-03 21:29:28 -08:00
Lei Yu
0f23bfcd7e Merge "Add suppressor text in SummaryProvider of Sound when it exists." 2017-01-03 21:11:15 +00:00
Lei Yu
d51b81d8c9 Merge "Refine animation to remove strange reshuffling animation" 2017-01-03 21:05:47 +00:00
Lei Yu
557d830502 Merge "Set statusBarColor to secondary_device_default_settings" 2017-01-03 19:10:08 +00:00
TreeHugger Robot
fa706049bf Merge "Use standard preference for mac/IP info in config wifi UI" 2017-01-03 19:02:18 +00:00
Maurice Lam
1168a7d794 Merge "Use regular preference theme for setup wizard" 2017-01-03 18:18:22 +00:00
Fan Zhang
93af75a611 Use standard preference for mac/IP info in config wifi UI
Change-Id: I3a611d9e4552b6c764e78daa54e9f504daec1cb9
Fixes: 33967401
Test: Visual
2017-01-03 09:42:12 -08:00
jackqdyulei
c3b0724c61 Set statusBarColor to secondary_device_default_settings
The SettingsDrawer has a translucent scrim on top of status bar,
which makes the color of status bar darker. By resetting the
statusBarColor we can make the real color of status bar to
"#242424" as close as possible.

Bug: 30811708
Test: Manual - Take a screenshot
Change-Id: I639ccac9d32aff9df5854c009da1fae15ba0e71f
2017-01-03 09:40:19 -08:00
jackqdyulei
d2c0eef222 Add suppressor text in SummaryProvider of Sound when it exists.
When suppressor exists for the sound effect, the sound summary
should show "muted by ...", not the "Ring volume at ..."

Bug: 31461022
Test: make -j40 RunSettingsRoboTests
Change-Id: I5d6895a7a330c993aac40bdca3bb1c79f8b7fbfe
2017-01-03 09:32:18 -08:00
Bill Yi
8a86de2c5f Import translations. DO NOT MERGE am: 0be5ccb7cd -s ours
am: 8678ee3d56  -s ours

Change-Id: I8ba7002bd34373b9a4b6bfba9b284a2e8015474b
2016-12-30 10:57:05 +00:00
Bill Yi
8678ee3d56 Import translations. DO NOT MERGE
am: 0be5ccb7cd  -s ours

Change-Id: I140febe4d647261616e2e3a186addac58a7a7064
2016-12-30 10:50:02 +00:00
Bill Yi
0be5ccb7cd Import translations. DO NOT MERGE
Change-Id: Id7a36307bc781734e2647f01af6b07b5ed3a600a
Auto-generated-cl: translation import
2016-12-30 00:59:18 -08:00
Bill Yi
5fe4222322 Import translations. DO NOT MERGE
Change-Id: I6ab2ff8df48768cf86bbddf6dfc5b592c86b1cd9
Auto-generated-cl: translation import
2016-12-30 00:54:08 -08:00
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
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