Commit Graph

73 Commits

Author SHA1 Message Date
Sudheer Shanka
1bd1d8dabb Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity.
Bug: 37672383
Change-Id: I63adcafc6e8dced173d52f25e8a6521ae897c9aa
Test: builds
2017-04-26 17:37:16 -07:00
Sundeep Ghuman
87bf49a436 Force update APs when enabling wifi in WifiSettings.
This reverts commit b2bdc8f17b
and fixes a broken Espresso test case.

Reason for revert: Rolling forward after fix in ag/2133493, to fix b/37324736

Bug: b/37324736
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: I9cdf8cb1043af5d527eccbd9cc56d3b02419d7ac
2017-04-25 15:12:00 -07:00
TreeHugger Robot
b6a0360a92 Merge "Use buttons for EncryptionInterstitial" into oc-dev 2017-04-18 00:32:55 +00:00
Maurice Lam
88df6f4407 Use buttons for EncryptionInterstitial
Bug: 30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
(cherry picked from commit 9be96e06bb)
2017-04-17 15:42:21 -07:00
Suprabh Shukla
3fa963b28e Merge "Renaming intent action for unknown sources" into oc-dev 2017-04-12 04:32:51 +00:00
Fan Zhang
00d8ff5d6e Revert "Revert "Convert BT preference to use TwoTargetPreference""
This reverts commit 457c3cbec2.

Revert with fix/test.
The fix is that we removed DevicePickerFragment#initDevicePreference(),
which incorrectly set a useless widget on preference, and removes the
gear icon from preference, preventing bind() call to go through

Change-Id: Ia70cdb51d13cca6035a4e7fe8008d195f7f00c6e
Fix: 36511169
Test: runtest --path tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
2017-04-11 09:45:27 -07:00
TreeHugger Robot
43146c4972 Merge "Add test to verify no crash on selecting brightness level." into oc-dev 2017-04-07 02:28:47 +00:00
Suprabh Shukla
aa9fe03dfa Renaming intent action for unknown sources
Renaming action MANAGE_EXTERNAL_SOURCES to MANAGE_UNKNOWN_APP_SOURCES to
be clearer about its purpose

Test: adb shell am instrument -w -e class \
com.android.settings.applications.ExternalSourcesSettingsTest \
com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner

cts-tradefed run singleCommand cts -m ExternalSources

Bug: 35812498
Change-Id: Ic6db5b3446c1890a358f5b5225d38409d1bd2c7c
2017-04-06 18:05:32 -07:00
Doris Ling
de03809396 Add test to verify no crash on selecting brightness level.
Add UI test to launch Settings->Display->Brightness level and Settings
app does not crash.

Change-Id: I526f44961bd0efbcacde334affbe2b7a93da0ce3
Fix: 36647069
Test: make SettingsTests
2017-04-06 15:10:29 -07:00
jackqdyulei
fefdd5d47f Fix crash when clicking item in Battery screen
"last full charge/Screen usage since full charge" goes crash when
clicking on it. This is because The default behaviour for
PowerGaugePreference is to start detail page and the above two items
are PowerGaugePreference.

This cl set these two items as non-selectable.

Bug: 37080048
Test: make -j40 SettingsTest
Change-Id: Ide4e151dcd0b44fb795a5753c91f2197b2a24a56
2017-04-06 12:52:50 -07:00
Sundeep Ghuman
d2831c31c1 Create Espresso test class for WifiSettings.
Bug: b/36403696
Test:  runtest --path
packages/apps/Settings/tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: I91306880f620c4a05bfdce35360a1edbcd8a15b7
2017-04-03 12:28:40 -07:00
Maurice Lam
f8fb4806cf Revert choose lock header file to non-setup theme
The activity ChooseLockGeneric which inflates the layout file
choose_lock_generic_fingerprint_header is not setup themed, and
therefore should not use setup resources.

Test: Run ChooseLockGenericTest via `am instrument`
Bug: 36688431
Change-Id: I7286958345d1762d4a93176afe300d1e4d168f6d
2017-03-28 20:24:12 -07:00
Julia Reynolds
e17590271f Move automatic rules to main DND settings page.
Change-Id: I32b103714d4864ab32e2c85d86106dc118f9c338
Fixes: 31050255
Test: manual
2017-03-27 15:57:39 -04:00
Maurice Lam
daaf8f8bc9 Use GLIF theme for screen lock confirmation
Theme the confirm password screen similar to setup wizard and screen
lock enrollment flow, so that we can start showing it during setup
wizard.
The new layouts are called "internal" because it's supposed to be
used only when another settings screen starts it. For external
intents from CONFIRM_DEVICE_CREDENTIAL, the existing theme and layout
are unchanged.

Bug: 32373672
Test: Run ConfirmLockPasswordTest with `am instrument`
Change-Id: Ib887a763a073e6e4b96264d08846827b2e5cbf52
2017-03-15 13:26:54 -07:00
Maurice Lam
019593072b Update fingerprint enrolling flow
1. Make FingerprintEnrollFinish stay on the back stack during "add
   another"
2. Remove skip button from the enrolling screen, since the user can
   now back out of the enrollment flow, or back to
   FingerprintEnrollFinish and press "done" there.

Test: Run FingerprintEnrollFinishTest with `am instrument`
Bug: 32054268
Change-Id: Icaf017952d6582a14b4d0904b7ee67ad22e5280d
2017-03-13 10:22:06 -07:00
TreeHugger Robot
a2a09c9ce2 Merge "Adding app specific screen for "External Sources"" 2017-03-09 01:22:01 +00:00
Suprabh Shukla
f59d2115ed Adding app specific screen for "External Sources"
Adding app specific screen so that third party apps and package
installer can directly intent there to direct users to change the
setting. Also added automater tests.

Test: adb shell am instrument -w -e class \
'com.android.settings.applications.ExternalSourcesSettingsTest' \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'

Bug: 33792674
Bug: 35487166

Change-Id: I5a481ee7032979df94a9e267ea74aa90da6a0906
2017-03-07 23:44:51 -08:00
Steven Ng
436256c36d Fix phishing attack in ChooseLockGeneric
Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
2017-03-07 19:48:35 +00:00
Fan Zhang
2a376723ae Fix a NPE when clicking encryption interstitial header
Pref tree handler cannot assume preference has non-null key.

Change-Id: I790e75f3b4c888e2a48b297bea89cda0b8dbaabd
Fix: 35855587
Test: runtest --path tests/app/src/com/android/settings/EncryptionInterstitialTest.java
2017-03-02 17:02:22 -08:00
TreeHugger Robot
6c146f2ab5 Merge "Remove old code relating to SystemSettings not used in new IA." 2017-03-01 20:44:48 +00:00
Doris Ling
d299b03f28 Remove old code relating to SystemSettings not used in new IA.
- remove activity alias: DevelopmentSettingsDashboardAlias,
DateTimeDashboardAlias, AboutDeviceDashboardAlias,
BackupResetDashboardAlias, EnterprisePrivacyDashboardAlias, and
AccessibilityDashboardAlias and updated the corresponding target
activities with the alias metadata.

- remove InputMethodAndLanguageSettingsActivity and
GestureSettingsActivity and the associated xml.

Bug: 35764802
Test: make RunSettingsRoboTests
Change-Id: I7d4922f8dfaac40e8ad077a68008185cd9fe3304
2017-02-28 17:46:24 -08:00
Fan Zhang
78ab9f98de Remove drawer from settings
Change-Id: Ib11376206cf8366c86c427104c47740c3ca8b0d0
Fix: 35809663
Test: make RunSettingsRoboTests
2017-02-27 17:45:05 -08:00
Doris Ling
ed0fc506a3 Removed emergency info and add user when locked from Users settings.
In new IA, Emergency Info and Add user when locked has been moved to
Users & accounts page.

Change-Id: I1a1e4bd801936b654d8a4ede7cfc64e2ac285019
Fix: 33703736
Test: make SettingsTests
2017-02-24 12:38:57 -08:00
TreeHugger Robot
f1c80deab0 Merge "SearchView keyboard opens and closes appropriately" 2017-02-18 01:41:36 +00:00
Matthew Fritze
592e4d739b SearchView keyboard opens and closes appropriately
- Keyboard opens when Search View opens
- Keyboard closes on query text submit
- Keyboard closes when user scrolls through results

Change-Id: I7cef383a2799eeb456fbaa07b8577c88cd35a997
Fixes: 34723251, 35164545
Test: SearchFragmentEspressoTest, manual test requested from QA
2017-02-17 23:37:26 +00:00
Salvador Martinez
2f0bee5032 Replace footer with regular preference
Replaced the "Manage Storage" footer preference
with a regular preference because the footer type
is not meant to be a touch target. This should fix
the bug with not being able to click on specific
parts of the preference.

Test: run settings espresso tests
Bug: 34349518
Change-Id: I36ada2a6a537a68d9fcbe7e10773896225ecc6b2
2017-02-14 14:12:56 -08:00
Doris Ling
7a76e9493f Specify the fragment to launch when default home is clicked.
Add the fragment attribute to the default home preference so that it
will launch the DefaultHomePicker when it is clicked.

Change-Id: I6a06dc2fab6a4a5b8bae4e9ec0144e18d2934666
Fixes: 34795157
Test: make SettingsTests and run test
2017-01-31 13:35:47 -08:00
Sunny Goyal
115e114032 Merge "Updating CreateShortcut activity to use the new ShortcutManager APIs for creating shortcuts" 2017-01-19 23:10:34 +00:00
Sunny Goyal
9a6b675096 Updating CreateShortcut activity to use the new ShortcutManager APIs
for creating shortcuts

Test:  adb shell am instrument -e class com.android.settings.CreateShortcutTest \
 -w com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I09fb73ae2a0687a3269f3714bdb2c5d92c99ea87
2017-01-19 13:39:13 -08:00
Paul Duffin
1250371b6b Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Change-Id: I5d2c0685b74ea5ba368c777d9646b9d3ac24dca9
2017-01-18 16:39:34 +00:00
Roozbeh Pournader
a00723976e Rename language+country resources to just language
Bug: 26496609
Test: none
Change-Id: I0bb74df9d0a56e24ab689cd1430e93ce3ad2713d
2017-01-10 21:24:59 -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
Fan Zhang
1c118b5f2a Always reserve space for preference icons.
This aligns text on preferences on the same screen when some of them
don't have icons.

- Use a custom layout for
  preference
  EditPreference
  switch preference
  VolumeSeekPreference
  DialogPreferencei
  Restricted*Preference
  DropdownPreference

- Moved related style defs into a new file styles_preference.xml,
  because current styles file is too large to read.
- Switch <PreferenceScreen ...> to <Preference ...> for a bunch of
  regular preferences.
- Also removed some dead style.

Bug: 33430928
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java

Change-Id: Ic9b75d3f133f2a83cd999297b8596253d4b10161
2016-12-12 16:02:45 -08:00
Fan Zhang
b95ff4ec31 Use a single layout for CreateShortcut activity.
The old layout is inherited from LauncherActivity, which uses a
inconsistent theme and UI between phone and tablet. It's more consistent
to just use a single layout that matches setting theme.

Fixes: 32220535
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/CreateShortcutTest.java
Change-Id: I769d1404c82c2057bf021e4cf557e7cf397d92a7
2016-12-07 16:11:42 -08:00
Bill Yi
b305ec6762 Revert "Import translations. DO NOT MERGE"
This reverts commit da32519ef4.

Change-Id: I5c1241a6bf00d73f3b877b2eaeaeabd774413401
2016-12-05 18:37:12 +00:00
Bill Yi
da32519ef4 Import translations. DO NOT MERGE
Change-Id: I13691a933f0c8c83859723b28329673fc2467e8d
Auto-generated-cl: translation import
2016-12-03 00:41:05 -08:00
Sudheer Shanka
acb1a61f3f Update usage of ActivityManagerNative.
Bug: 30977067
Test: N/A
Change-Id: I46e37a09cff059d2784a819bc2651d6973fbd268
2016-11-14 12:59:11 -08:00
Lei Yu
8109a0fb6b Merge "Show "uninstall for all users" when >1 users installed it." 2016-11-02 23:21:35 +00:00
jackqdyulei
e091cef862 Show "uninstall for all users" when >1 users installed it.
Bug: 32167081
Test: make SettingsTests

Change-Id: I407549838d40c160a84a36f2d9ebaa8dc73d6008
2016-10-25 15:57:31 -07:00
jackqdyulei
a44fdda438 Store Tile in view tag, not position
The position(used to find the tile) is not up-to-date when recyclerview
changes, so store tile instead.

Bug: 32370624
Test: make -j40 SettingsTests
Change-Id: I10d29b3137ecb1c37b6a8468c6f2709b8497caa6
2016-10-24 14:44:37 -07:00
jackqdyulei
b182ef3c77 Set stay awake while wireless charging.
Now if you select "stay awake" in Developer options, the screen
will keep on when wireless charging.

Bug:31696030
Test: make SettingsTests
Change-Id: If88bf559519c19654822c70d7684be583d907e00
2016-10-14 15:50:42 -07:00
jackqdyulei
0bfee2799d Add classloader for RtlCompatibleViewPager
To avoid BadParcelableException when reload the activity after it
is killed by OS.

Bug: 31707097
Test: make SettingsTests && adb install -r \
${OUT}/data/app/SettingsTests/SettingsTests.apk && \
adb shell am instrument -w \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'

Change-Id: Ic8f20d9e2d236f0bea96071a88fbc6e7ba856f54
2016-09-28 17:56:04 -07:00
jackqdyulei
0162daa651 Disable the control of draw over permission for SystemUI
Bug: 31077838
Test: make SettingsTests && adb install -r \
${OUT}/data/app/SettingsTests/SettingsTests.apk \
&& adb shell am instrument -w  \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'

Change-Id: I760590f5558f2d686ffbfe78234a8b08e13883fd
2016-09-26 13:22:04 -07:00
Doris Ling
430025c4d6 Split Ambient Display settings. am: 1ad58d0abf am: f89766dbab
am: 0dfe46fe58

Change-Id: I33ffaa71c09cff7a4df496c42371519367e1772c
2016-09-24 00:35:24 +00:00
Doris Ling
0dfe46fe58 Split Ambient Display settings. am: 1ad58d0abf
am: f89766dbab

Change-Id: If17ab5951a9b8a2a5b68a1fcc2492de8a72f0c08
2016-09-24 00:07:17 +00:00
Doris Ling
f89766dbab Split Ambient Display settings.
am: 1ad58d0abf

Change-Id: Ie47c7504728bb225214ee8c348af8a154cb5a1f2
2016-09-24 00:05:17 +00:00
Daniel Nishi
fee35492b8 Use a config flag instead of a RO flag for showing Manage Storage. am: c0b33f70ed
am: bfe5afc270

Change-Id: I159cb08e7ef25802562603d4f8e297ffdf8d0f30
2016-09-23 22:34:22 +00:00
Doris Ling
1ad58d0abf Split Ambient Display settings.
1. Reverting the changes for Display->Ambient Display; this setting
   will control incoming notification pulse.
2. Added 2 separate entries in gestures settings to control pick up
   and double tap gestures-triggered pulsing for Ambient Display.
3. Added automated tests to verify the preference initializes to the
   correct default value, and also verify that toggling the preference
   updates the corresponding settings correctly.

Test: make SettingsTests

Bug: 30595437
Change-Id: I125bf75fc4ccfea126a00ffae4207fcb789f487a
2016-09-23 15:33:37 -07:00
Daniel Nishi
c0b33f70ed Use a config flag instead of a RO flag for showing Manage Storage.
Bug: 30455784
Test: make SettingsTests; run the instrumentation.
Change-Id: I860192c1c20fcaec2a5cbcdc085ff01dafa7351a
(cherry picked from commit 7f075a3c41)
2016-09-19 20:39:33 +00:00
Daniel Nishi
7f075a3c41 Use a config flag instead of a RO flag for showing Manage Storage.
Bug: 30455784
Test: make SettingsTests; run the instrumentation.
Change-Id: I860192c1c20fcaec2a5cbcdc085ff01dafa7351a
2016-09-16 15:56:47 -07:00