Commit Graph

43256 Commits

Author SHA1 Message Date
Android Build Merger (Role)
d923718d10 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49
Change-Id: I99c6271e133bffb2e78ba1fbfbf34a3e819411a7
2018-02-13 00:43:27 +00:00
Antony Sargent
0a7ae11c49 Import translations. DO NOT MERGE
Merge translations of Bluetooth confirmation text

This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I43db31f1495e6873b6905896e6fa75fd88b4cb8d
2018-02-13 00:43:21 +00:00
Lucas Dupin
8e490b4039 Disable "double tap to check" when "always on"
"Double tap to check" has no effect when AOD is enabled.
Double tapping will take you to the lock screen anyway.

Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DoubleTapScreenPreferenceControllerTest
Change-Id: Ia97b7ecb00a9d83b867959d83642d476841e2f13
Fixes: 73096311
2018-02-12 15:28:59 -08:00
Fan Zhang
4f6d667ac4 Merge "Fix intent launch flag" 2018-02-12 23:28:13 +00:00
Fan Zhang
2edbaa7062 Change print setting from a dynamic tile to static pref
...because dynamic tile is a lot harder to index correctly.

- Removed metadata that makes PrintSettings a dynamic tile.
- Added PrintSettings into connected_device xml.
- Added a new PreferenceController - all summary updating logic is
  copied from PrintSettingsFragment

Change-Id: I41e7c9d23e97ecd5a043ac7c33f2d404260c92e7
Fixes: 73128944
Test: robotests
2018-02-12 15:19:43 -08:00
Fan Zhang
d2e33e73a1 Fix instrumentation tests
Change-Id: I4f6891f095f4803e822b55a3f44d67ee4d173180
Fixes: 73242024
Test: atest
2018-02-12 14:26:47 -08:00
Leslie Watkins
29a2379b09 Merge "Remove all reference to SmsMirroring in Android Settings." 2018-02-12 22:13:48 +00:00
Leslie Watkins
58eb43a2e4 Remove all reference to SmsMirroring in Android Settings.
Test: Robotests

Change-Id: I3318c6915cae95522f09838f00a3c567fe9e5fc5
2018-02-12 22:05:56 +00:00
Fan Zhang
1987c8e562 Fix intent launch flag
Change-Id: I0cb744fcccc6fb9f6d0d338f726f3dd29dccc718
Fixes: 73224739
Test: manual
2018-02-12 13:37:40 -08:00
Bill Yi
107d6c3ffb Import translations. DO NOT MERGE
Change-Id: I6a013e90dc650b43bedc6ce823d9315a7ebcf3e3
Auto-generated-cl: translation import
2018-02-12 12:16:59 -08:00
Doris Ling
98a6b74291 Add content description to suggestion card close button.
Change-Id: I2354dd5a4b092ac24bbc0c197bd228b73d8ede64
Fixes: 72958040
Test: talkback, make RunSettingsRoboTests
2018-02-12 11:40:03 -08:00
Victor Chang
d4c1d5ee90 Merge "Use 24-hour settings for time formatting" 2018-02-12 10:38:40 +00:00
Pavlin Radoslavov
08addde8b5 Merge "Use proper string formatting for the "Active device" string" am: f5848d0f4d am: 8018f82e5a
am: ac8aed2ce8  -s ours

Change-Id: I282150ff2af7dbedd7e0199144ff7a282ffbff5f
2018-02-10 09:32:54 +00:00
Pavlin Radoslavov
ac8aed2ce8 Merge "Use proper string formatting for the "Active device" string" am: f5848d0f4d
am: 8018f82e5a

Change-Id: Iaf745544ca349cb5a0193b4dd0e46bcc89ff4e0c
2018-02-10 09:22:38 +00:00
Pavlin Radoslavov
8018f82e5a Merge "Use proper string formatting for the "Active device" string"
am: f5848d0f4d

Change-Id: Ic34959c5ca44ad6d0ac06dfb76b3b07cd4bee819
2018-02-10 09:12:16 +00:00
Treehugger Robot
f5848d0f4d Merge "Use proper string formatting for the "Active device" string" 2018-02-10 02:05:12 +00:00
TreeHugger Robot
aa27a344aa Merge "Add test to verify external account settings is shown." 2018-02-10 00:31:17 +00:00
Pavlin Radoslavov
576d4448a9 Use proper string formatting for the "Active device" string
Updated testContextMock() how it checks the bluetooth_connected string.

Bug: 72317067
Test: Unit test updated:
      make ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest \
                           RunSettingsRoboTests
      Manual: two headsets and switching the active device
Change-Id: I3db178d71543e4dfa437544350c58241860ae703
Merged-In: I3db178d71543e4dfa437544350c58241860ae703
(cherry picked from commit b58b006e44)
2018-02-09 14:53:14 -08:00
TreeHugger Robot
373a33bb87 Merge "Fix double search icon in wifi calling page" 2018-02-09 22:39:30 +00:00
Doris Ling
f2ecc4bf26 Add test to verify external account settings is shown.
- add a test service that provides a test authenticator and a test
preference screen. Creates corresponding test account and verifies that
the preferences defined in the authenticator is displayed from the
account detail page.

Change-Id: Iab87177ae500d0a36272cf8ecf464139a3dc07cd
Fixes: 35353708
Test: make SettingsUnitTests
2018-02-09 14:27:06 -08:00
TreeHugger Robot
9cc998d5aa Merge "Increase timeout waiting for suggestions" 2018-02-09 22:13:39 +00:00
Amith Yamasani
131363884b Merge "Update Inactive Apps screen to show buckets" 2018-02-09 20:41:59 +00:00
Fan Zhang
710ef64873 Increase timeout waiting for suggestions
- Experimenting timeout value to figure out what's most common
  end-to-end latency for loading suggestions

Change-Id: Icaa3d4d7a45a05380a9521c961e7213e020601a9
Fixes: 69068691
Test: visual
2018-02-09 12:24:04 -08:00
Fan Zhang
b91db42100 Fix double search icon in wifi calling page
- Moved fragments into wifi sub-package.
- Cleaned up inheritance for WifiCallingSettings
- Attach help and search action menu controller correctly.

Change-Id: I0bc8ab99df5d8c5ea64fb64de5ae70c2c9bd6f31
Fixes: 72958674
Test: robotest
2018-02-09 11:26:16 -08:00
Victor Chang
e226c9a8bf Use 24-hour settings for time formatting
Test: m RunSettingsRoboTests
Bug: 72311296
Change-Id: I7c1458dbc2e4e15765f703c35a0113341b912a2b
2018-02-09 18:35:14 +00:00
Sundeep Ghuman
0f711f86a6 Remove use of forceUpdate.
Now that WifiTracker correctly handles eviction of stale scan results
only after scanning has resumed, it is no longer necessary to
conditionally fetch APs on app resumption.

Fix broken test.

Bug: 68030053
Test: runtest --path
tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: Ib4c8d6e53cf760fcb5f00069da40c578171c09f4
2018-02-08 17:49:05 -08:00
TreeHugger Robot
e5020950f1 Merge changes Ib3d3df9f,Iae9096a1
* changes:
  Use BatterySaverReceiver in battery saver settings
  Add controller for battery saver button
2018-02-09 01:35:18 +00:00
TreeHugger Robot
7957d8125b Merge "Add test to verify Users settings shows in secondary user." 2018-02-09 00:11:41 +00:00
TreeHugger Robot
1a326b7ce1 Merge "Fix developer option not being enabled." 2018-02-08 23:24:49 +00:00
jackqdyulei
a2df26e9b3 Use BatterySaverReceiver in battery saver settings
Use this receiver to listen to following updates:
1. Plug state: if it is plugged in, disable this two state
button, otherwise make it enabled
2. low power mode: If mode on, show "turn off" otherwise show
"turn on"

Bug: 72228477
Test: RunSettingsRoboTests
Change-Id: Ib3d3df9f9a5fbac8b1b876c9e193beb75f522ebd
2018-02-08 15:22:27 -08:00
jackqdyulei
92757b2454 Add controller for battery saver button
Bug: 72228477
Test: RunSettingsRoboTests
Change-Id: Iae9096a10553ea761d099e1e72c1de56b693bac0
2018-02-08 15:19:00 -08:00
TreeHugger Robot
1dd690198f Merge "Use proper string formatting for the "Active device" string" 2018-02-08 22:47:52 +00:00
Doris Ling
7459f40bfd Add test to verify Users settings shows in secondary user.
- also update launch sequence for Users settings tests as Users settings
has been moved inside system settings and the preference title has
changed.
- and change the test to run with AndroidJUnit4.

Change-Id: I049b83f9ae4b2724608af267e8900dd9e6749874
Fixes: 34774778
Test: make SettingsUnitTests
2018-02-08 14:06:23 -08:00
Fan Zhang
39a5eb5f20 Merge "Move restriction check for dev settings into controller" 2018-02-08 21:51:50 +00:00
Doris Ling
e0014e2234 Fix developer option not being enabled.
- when screen lock is set, we will start the activity to check user's
credential. Override onActivityResult() and call BuildNumberPreferenceController's
method accordingly, so that we will checks the password confirm result and enable
the developer options if it is success.

Change-Id: Ie2df644c53430ad4eb394480348d956177804ec3
Fixes: 73102865
Test: make RunSettingsRoboTests
2018-02-08 13:17:54 -08:00
TreeHugger Robot
ce21e7a978 Merge "Update task affinity and parent activity for all exported activities." 2018-02-08 20:43:50 +00:00
TreeHugger Robot
eab75df8fa Merge "Don't use debug data in app list controller" 2018-02-08 20:20:33 +00:00
TreeHugger Robot
f94f6d41d9 Merge "Add Toggle Controllers to XML" 2018-02-08 19:46:26 +00:00
Pavlin Radoslavov
b58b006e44 Use proper string formatting for the "Active device" string
Updated testContextMock() how it checks the bluetooth_connected string.

Bug: 72317067
Test: Unit test updated:
      make ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest \
                           RunSettingsRoboTests
      Manual: two headsets and switching the active device
Change-Id: I3db178d71543e4dfa437544350c58241860ae703
2018-02-08 11:14:10 -08:00
Fan Zhang
db26cfb847 Update task affinity and parent activity for all exported activities.
This is needed to fix nav-up button for these activities.

- Change taskAffinity for homepage to "com.android.settings.root".
- Change taskAffinity for many activities to "com.android.settings", and
  set partent to homepage.
  -- General rule: if activity has not been exported, don't set
     affinity or parent.
  -- If activity is exported and can be launched with an action, set
     affinity and parent to homepage
  -- If activity is exported but expects additional parameters, don't
     set affinity or parent.
  -- If the activity affinitiy is com.android.setupwizard, don't touch
     it.

With this change, when a setting page is launched via intent (eg, from
QS), nav up button will be able to find parentActivity, and launch it in
a different task affinity. If the acitivity is a launched within
settings, nav-up has no change, it just navigates back to where it came from.

Change-Id: I3a2b64ed13d437f6818f6c7374e994b4192b6fa0
Fixes: 72337421
Fixes: 72829142
Test: manual
Test: atest
2018-02-08 11:04:35 -08:00
jackqdyulei
88c86f73bb Don't use debug data in app list controller
This is a bug, USE_FAKE_DATA should never be true in build

Change-Id: I14059cd243380c754ca0cff09f088d62828ec755
Fixes: 73117246
Test: Build
2018-02-08 10:25:24 -08:00
Jan Nordqvist
4fbe0f8354 Update DataUsageSummary to include carrier provided information.
This CL augments the existing data usage display with carrier provided
information about data usage and plans when available from the new
frameworks API.

Test: manual
Test: make RunSettingsRoboTests
Bug: 70950124

Change-Id: Idde1ff786e8c5dbc04e58ffbcc0fd18789682699
2018-02-08 10:13:42 -08:00
TreeHugger Robot
525d757c09 Merge "Apply checkbox enable state on viewholder bind" 2018-02-08 17:00:59 +00:00
Lei Yu
2c93b07168 Merge "Make ConnectedDevice page handles bt intent" 2018-02-08 07:54:25 +00:00
Fan Zhang
155d6829e9 Move restriction check for dev settings into controller
Change-Id: I99dae6e82aca40b92e1965ba7db2c54f3c59d33f
Fixes: 72815875
Test: robotests
2018-02-07 22:33:10 -08:00
TreeHugger Robot
c9f1d89dd3 Merge "Remove dead code for DataPlanUsageSummary" 2018-02-08 06:21:11 +00:00
TreeHugger Robot
a0ee8ad070 Merge "Remove some dead code from search" 2018-02-08 06:13:36 +00:00
TreeHugger Robot
682bb3e8e5 Merge "Add feature flag for new DataUsageSummary fragment." 2018-02-08 04:55:56 +00:00
TreeHugger Robot
547e9403dc Merge "Move old battery settings page to dev options" 2018-02-08 04:48:22 +00:00
Fan Zhang
3ed55b1450 Remove dead code for DataPlanUsageSummary
This is an unfinished feature, no longer needed.

Change-Id: I358dcc8865184117d49e35b3e8dfcd84403261d0
Fixes: 73073608
Test: rebuild
2018-02-07 20:35:56 -08:00