OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoChanged string to notify user of effects
Salvador Martinez [Wed, 21 Dec 2016 00:20:29 +0000 (16:20 -0800)]
Changed string to notify user of effects

Currently when a system app is removed we
only warn a user that other apps may stop working.
The two strings used for this have been modified to
inform the user that android itself may misbehave as
well if the app is uninstalled.

Test: Manual (string change)
Bug: 32789204
Change-Id: I2c1515ef078d7a96f20ed7db656d4769b02f4ecf

7 years agoUse junit instead of junit4-target
Paul Duffin [Mon, 19 Dec 2016 14:01:32 +0000 (14:01 +0000)]
Use junit instead of junit4-target

Bug: 30188076
Test: make checkbuild
Change-Id: Ic2bc905dd47d771630bb5a7047b0e290fb3dd04f

7 years agoMerge "Handle option menu click in support tab."
TreeHugger Robot [Sat, 17 Dec 2016 01:28:25 +0000 (01:28 +0000)]
Merge "Handle option menu click in support tab."

7 years agoMerge "Enable button only when scrollview reached the bottom"
TreeHugger Robot [Sat, 17 Dec 2016 00:43:49 +0000 (00:43 +0000)]
Merge "Enable button only when scrollview reached the bottom"

7 years agoHandle option menu click in support tab.
Fan Zhang [Fri, 16 Dec 2016 23:52:04 +0000 (15:52 -0800)]
Handle option menu click in support tab.

Change-Id: I47b52ae25200c9fd5b948f1f85199b45f50f6b43
Fixes: 33703324
Test: RunSettingsRoboTests

7 years agoEnable button only when scrollview reached the bottom
jackqdyulei [Wed, 14 Dec 2016 01:07:08 +0000 (17:07 -0800)]
Enable button only when scrollview reached the bottom

Bug: 28410288
Test: make RunSettingsRoboTests
Change-Id: I04653c377f7d419b6701b5589ff25961e0f5c077

7 years agoMerge "Adds a menu item for additional battery info to battery settings."
Jaewoong Jung [Fri, 16 Dec 2016 22:05:21 +0000 (22:05 +0000)]
Merge "Adds a menu item for additional battery info to battery settings."

7 years agoAdds a menu item for additional battery info to battery settings.
Jaewoong Jung [Tue, 13 Dec 2016 01:32:31 +0000 (17:32 -0800)]
Adds a menu item for additional battery info to battery settings.

Bug: 33352540
Test: No additional test failures.

Change-Id: Ibfc1a9463c93d3c087ed712fe45d3d0717472c6a

7 years agoMerge "Point to the new checkstyle location for packages/apps/Settings PREUPLOAD...
Aurimas Liutikas [Fri, 16 Dec 2016 17:44:48 +0000 (17:44 +0000)]
Merge "Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook."

7 years agoMerge "Refactor Work sounds in SoundSettings."
TreeHugger Robot [Fri, 16 Dec 2016 01:37:13 +0000 (01:37 +0000)]
Merge "Refactor Work sounds in SoundSettings."

7 years agoMerge "Added survey triggering mechanisms"
TreeHugger Robot [Thu, 15 Dec 2016 23:36:44 +0000 (23:36 +0000)]
Merge "Added survey triggering mechanisms"

7 years agoPoint to the new checkstyle location for packages/apps/Settings PREUPLOAD hook.
Aurimas Liutikas [Thu, 15 Dec 2016 23:06:04 +0000 (15:06 -0800)]
Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook.

This change depends on r.android.com/314437

Bug: 33666900
Test: None
Change-Id: Ibcf177186e64e7e34493301f109ea9d4454fa3a2

7 years agoMerge "Hide next button when max fingerprints enrolled"
TreeHugger Robot [Thu, 15 Dec 2016 22:57:26 +0000 (22:57 +0000)]
Merge "Hide next button when max fingerprints enrolled"

7 years agoRefactor Work sounds in SoundSettings.
Doris Ling [Fri, 9 Dec 2016 22:57:48 +0000 (14:57 -0800)]
Refactor Work sounds in SoundSettings.

- final round of refactoring SoundSettings to use preference
  controller.
- add work sound controller to control all the work profile sound
  settings.

Change-Id: Ifa9f9c1f717ca292576f077311fe284325e12651
Fixes: 32276590
Test: make RunSettingsRoboTests

7 years agoMerge "Update the Settings database to enable Payloads"
TreeHugger Robot [Thu, 15 Dec 2016 22:51:32 +0000 (22:51 +0000)]
Merge "Update the Settings database to enable Payloads"

7 years agoMerge "Removing the ActiveNetworkScorerDialog."
TreeHugger Robot [Thu, 15 Dec 2016 21:38:46 +0000 (21:38 +0000)]
Merge "Removing the ActiveNetworkScorerDialog."

7 years agoAdded survey triggering mechanisms
Salvador Martinez [Thu, 8 Dec 2016 20:44:47 +0000 (12:44 -0800)]
Added survey triggering mechanisms

Surveys can now be triggered on a subset of Settings screens.
Surveys can also be modified/created for this subset of
screens remotely.

Test: RoboTests && JUnitTests
Bug: 27823357
Change-Id: I1534af5573bef6f6c65c9c99b6f5a2917c3325b9

7 years agoUpdate the Settings database to enable Payloads
Matthew Fritze [Fri, 9 Dec 2016 22:28:59 +0000 (14:28 -0800)]
Update the Settings database to enable Payloads

Add Payload and Payload type columns to the settings
database. This includes extending preference controllers
to map their settings to UI components so that the
payload results can be consumed by a front end.

Change-Id: I889dcc4ff7793306718d12e1e5993386b58f21cc
Fixes: 3345185133390556
Test: RunSettingsRoboTests

7 years agoMerge "Remove divider lines from all PreferenceFragments."
TreeHugger Robot [Thu, 15 Dec 2016 18:54:33 +0000 (18:54 +0000)]
Merge "Remove divider lines from all PreferenceFragments."

7 years agoMerge "Move a11y entry point to top level menu."
TreeHugger Robot [Thu, 15 Dec 2016 18:14:26 +0000 (18:14 +0000)]
Merge "Move a11y entry point to top level menu."

7 years agoMerge "Build a new FooterPreference UI."
TreeHugger Robot [Thu, 15 Dec 2016 17:56:27 +0000 (17:56 +0000)]
Merge "Build a new FooterPreference UI."

7 years agoImport translations. DO NOT MERGE am: a48002a65a -s ours
Bill Yi [Thu, 15 Dec 2016 08:12:03 +0000 (08:12 +0000)]
Import translations. DO NOT MERGE am: a48002a65a  -s ours
am: e6c8409112  -s ours

Change-Id: I1e1c318f936aa9df381e86d38505a40c37ed745e

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 15 Dec 2016 08:05:57 +0000 (08:05 +0000)]
Import translations. DO NOT MERGE
am: a48002a65a  -s ours

Change-Id: I21d68ceafcfb4fa08a5e9ad6f8d6c66e4a238787

7 years agoMerge "Use Activity.getActivityToken to align with mr2"
TreeHugger Robot [Thu, 15 Dec 2016 06:19:11 +0000 (06:19 +0000)]
Merge "Use Activity.getActivityToken to align with mr2"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 15 Dec 2016 05:03:28 +0000 (21:03 -0800)]
Import translations. DO NOT MERGE

Change-Id: If6787baad938f8184b5b6ddb2c59317b0d6144bd
Auto-generated-cl: translation import

7 years agoMerge "Use new QueuedWork interface."
TreeHugger Robot [Thu, 15 Dec 2016 03:13:37 +0000 (03:13 +0000)]
Merge "Use new QueuedWork interface."

7 years agoRemoving the ActiveNetworkScorerDialog.
Jeremy Joslin [Thu, 15 Dec 2016 01:52:22 +0000 (17:52 -0800)]
Removing the ActiveNetworkScorerDialog.

It should have been removed as part of ag/1707023.

Test: Still builds.
BUG: 33549591
BUG: 33270391
Change-Id: I82eed6dc7daef1c622ea4e33ce42c331e0cd786d

7 years agoMerge "New pref toggle for network recommendations."
TreeHugger Robot [Thu, 15 Dec 2016 01:43:55 +0000 (01:43 +0000)]
Merge "New pref toggle for network recommendations."

7 years agoRemove divider lines from all PreferenceFragments.
Fan Zhang [Wed, 14 Dec 2016 02:44:33 +0000 (18:44 -0800)]
Remove divider lines from all PreferenceFragments.

(this is partially revert of ag/I0ce486f7ac6)

- Only draw divider lines on top of PreferenceCategory and
  FooterPreference

Bug: 33601143
Test: make RunSettingsRoboTests
Change-Id: I26146dcae1603dc807e54ea431910685107be94c

7 years agoBuild a new FooterPreference UI.
Fan Zhang [Tue, 13 Dec 2016 20:42:50 +0000 (12:42 -0800)]
Build a new FooterPreference UI.

- Create a new layout for footer prefs.
- Create a new FooterPreference type to use the layout
- Create a Mixin to create and add the pref to screen
- Create a new lifecycle observer type to invoke mixin at right time
- Switch SettingsPreferenceFragment to use footer mixin.
- Switch FingerprintSettings to use the new footer pref.

Bug: 33579394
Test: RunSettingsRoboTests
Change-Id: I548ac39a0d120196a7ffed09b4f98bd9a80bae90

7 years agoMerge "Remove WifiSetupActivity"
Maurice Lam [Thu, 15 Dec 2016 00:36:32 +0000 (00:36 +0000)]
Merge "Remove WifiSetupActivity"

7 years agoUse new QueuedWork interface.
Philip P. Moltmann [Mon, 12 Dec 2016 23:29:55 +0000 (15:29 -0800)]
Use new QueuedWork interface.

Test: Ran SharedPreferences CTS tests
Bug: 33385963
Change-Id: I8025a087b43462324d0d45555094cbb54a671404

7 years agoRemove WifiSetupActivity
Maurice Lam [Wed, 14 Dec 2016 00:03:11 +0000 (16:03 -0800)]
Remove WifiSetupActivity

That activity was copied into setup wizard and is no longer used.

Also removed setup_illustration_lock_screen because that is also
not used in the current GLIF theme.

Test: Existing Robolectric tests pass
Bug: 33590605
Change-Id: Ib2ea02a5e4bce17a7ea829b854f73caf7d5c5f97

7 years agoMove a11y entry point to top level menu.
Fan Zhang [Wed, 14 Dec 2016 19:35:28 +0000 (11:35 -0800)]
Move a11y entry point to top level menu.

Bug: 31781480
Test: make RunSettingsRoboTests still pass
Change-Id: I4f50aa56603750728ce0f3c82c3da720b3e6f09f

7 years agoMerge "Check new user restriction for profile removal"
Esteban Talavera [Wed, 14 Dec 2016 19:16:23 +0000 (19:16 +0000)]
Merge "Check new user restriction for profile removal"

7 years agoMerge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d...
Zhendong Yang [Wed, 14 Dec 2016 06:00:07 +0000 (06:00 +0000)]
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d am: 8711f4055d
am: 8c9e3db8d9

Change-Id: Ib6d620f89225a8258b1671d206bb617e5d1bf56f

7 years agoMerge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d
Zhendong Yang [Wed, 14 Dec 2016 05:53:04 +0000 (05:53 +0000)]
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d
am: 8711f4055d

Change-Id: Idb2d601fa627dcb8268228435192392c760787d0

7 years agoMerge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769
Zhendong Yang [Wed, 14 Dec 2016 05:46:08 +0000 (05:46 +0000)]
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769
am: 7598c6201d

Change-Id: I97e9ef07df912e7bac3c4657272feab943bcb84e

7 years agoMerge "Fix crash when rotating HighPowerDetail dialog"
Zhendong Yang [Wed, 14 Dec 2016 05:38:34 +0000 (05:38 +0000)]
Merge "Fix crash when rotating HighPowerDetail dialog"
am: 783ff43769

Change-Id: Ie4f4856f6e4b1bb4970013b2425bb39d34383859

7 years agoMerge "Fix crash when rotating HighPowerDetail dialog"
Treehugger Robot [Wed, 14 Dec 2016 05:30:16 +0000 (05:30 +0000)]
Merge "Fix crash when rotating HighPowerDetail dialog"

7 years agoUse Activity.getActivityToken to align with mr2
Tony Mak [Wed, 14 Dec 2016 02:57:14 +0000 (02:57 +0000)]
Use Activity.getActivityToken to align with mr2

Context.getActivityToken is introduced since O.
To align with MR2 and avoid unnecessary merge conflict,
pass the activity token from activity to controller.

Test: 1. make RunSettingsRoboTests
      2. Manual Test
       a. Start SET_NEW_PASSWORD intent in user 0, set password.
          User 0 password is set.
       b. Start SET_NEW_PASSWORD intent in work profile, set password.
          work profile password is set.

Bug: 32959373
Change-Id: I8577752d446a7c395ad30417f8c0c832f951d7b3

7 years agoMerge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev am: 0e7405fc17
Tony Mak [Wed, 14 Dec 2016 02:27:31 +0000 (02:27 +0000)]
Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev am: 0e7405fc17
am: 4cce4c5170  -s ours

Change-Id: Ib636f0fe8401f3871ce2b37f86d36740367ba196

7 years agoDO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD am: 8a2f28a629
Tony Mak [Wed, 14 Dec 2016 02:27:15 +0000 (02:27 +0000)]
DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD am: 8a2f28a629
am: 2d45ef14e5  -s ours

Change-Id: I656993de99f93cc421590ea549bd7a20fc954643

7 years agoMerge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev
Tony Mak [Wed, 14 Dec 2016 02:19:24 +0000 (02:19 +0000)]
Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev
am: 0e7405fc17

Change-Id: Ie336a58e84b889d8700ab64b56248f0c4933c5fa

7 years agoDO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
Tony Mak [Wed, 14 Dec 2016 02:19:22 +0000 (02:19 +0000)]
DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
am: 8a2f28a629

Change-Id: I1c8cdfe6e4c052a0bee1391c9c1166868da5f6ac

7 years agoMerge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev
TreeHugger Robot [Wed, 14 Dec 2016 02:08:36 +0000 (02:08 +0000)]
Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev

7 years agoNew pref toggle for network recommendations.
Jeremy Joslin [Tue, 13 Dec 2016 22:14:45 +0000 (14:14 -0800)]
New pref toggle for network recommendations.

Adding a new toggle to control whether network
recommendations are enabled.

Removed the "Use open networks" pref and its associated strings
and components as it's no longer needed.

Test: Built and ran.
BUG: 33549591
BUG: 33270391
Change-Id: I7248ac32e0598d82107c150372c1fe4e9e2243a5

7 years agoMerge "Always reserve space for preference icons."
Fan Zhang [Tue, 13 Dec 2016 17:06:58 +0000 (17:06 +0000)]
Merge "Always reserve space for preference icons."

7 years agoImport translations. DO NOT MERGE am: a4e78d242d -s ours
Bill Yi [Tue, 13 Dec 2016 04:02:26 +0000 (04:02 +0000)]
Import translations. DO NOT MERGE am: a4e78d242d  -s ours
am: a379685253  -s ours

Change-Id: Icb5a3589fb6a0333a4a5c8a75e6c692943e1ada8

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 13 Dec 2016 03:55:17 +0000 (03:55 +0000)]
Import translations. DO NOT MERGE
am: a4e78d242d  -s ours

Change-Id: Ie0ee095783da15c15ba64fd736a175bb1600287a

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 13 Dec 2016 03:41:12 +0000 (03:41 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 13 Dec 2016 01:30:02 +0000 (17:30 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia4641aa6b6dc9907ede180fa2d7d0cb4f1c258f0
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 13 Dec 2016 01:24:44 +0000 (17:24 -0800)]
Import translations. DO NOT MERGE

Change-Id: I2531790f442ad46e6bff142af9b1694d93049021
Auto-generated-cl: translation import

7 years agoAlways reserve space for preference icons.
Fan Zhang [Fri, 9 Dec 2016 21:04:24 +0000 (13:04 -0800)]
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

7 years agoMerge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours...
Marie Janssen [Mon, 12 Dec 2016 21:51:56 +0000 (21:51 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c  -s ours am: 0d60028669  -s ours am: f1342adb86
am: 1c4f12c6db  -s ours

Change-Id: I63dce574c3f4f42a4d02d1e0105f02fd32e68ba3

7 years agoMerge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours...
Marie Janssen [Mon, 12 Dec 2016 21:46:12 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c  -s ours am: 0d60028669  -s ours
am: f1342adb86

Change-Id: Ib7b4cb112fcde7e8286f24e59aa31befef56a068

7 years agoMerge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours
Marie Janssen [Mon, 12 Dec 2016 21:40:16 +0000 (21:40 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c  -s ours
am: 0d60028669  -s ours

Change-Id: I38c9941c8a7102c6e987fda1d7d1d1b0155ccde9

7 years agoMerge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
Marie Janssen [Mon, 12 Dec 2016 21:34:45 +0000 (21:34 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
am: 8c11340b0c  -s ours

Change-Id: I60f481691445aeb4926b177d83f39077b9a72921

7 years agoMerge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
Marie Janssen [Mon, 12 Dec 2016 21:27:23 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"

7 years agoMerge "Fix account picker crash when there is no account before."
Lei Yu [Mon, 12 Dec 2016 21:06:11 +0000 (21:06 +0000)]
Merge "Fix account picker crash when there is no account before."

7 years agoDO NOT MERGE Add Bluetooth toggle prompts - settings
Svetoslav Ganov [Sat, 23 Jul 2016 03:08:41 +0000 (20:08 -0700)]
DO NOT MERGE Add Bluetooth toggle prompts - settings

If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749
Change-Id: I0b9065446f9d0cfb819065eaf2dc160eb1c1f7ec

7 years agoFix crash when rotating HighPowerDetail dialog
Zhendong Yang [Thu, 24 Mar 2016 02:54:49 +0000 (10:54 +0800)]
Fix crash when rotating HighPowerDetail dialog

When rotating the device, the Activity of the target
Fragment become null. So NullPointerException occurs.
The dialog should check if the Activity is null
before calling onActivityResult().

Bug: 28333723
Test: manual - go to Settings > Apps > Clock,
               click Battery optimization and rotate device

Change-Id: I7f68d6ece7d169fd96d04c1788e55ee506aae1ae

7 years agoDO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
Tony Mak [Mon, 12 Dec 2016 02:29:55 +0000 (02:29 +0000)]
DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD

This is a cherry-pick of ag/1640561.

1. Context.getActivityToken is not available in n mr2, passed the token
   from the activity to the controller instead.

2. Haven't pick the tests from master to mr2 branch because robotest
   is not set up in mr2 branch.

Fix: 32959373

Change-Id: I2f73d01ab11e91b337beb90c05bbcb857dfd40dc

7 years agoFix account picker crash when there is no account before.
jackqdyulei [Sun, 11 Dec 2016 20:32:35 +0000 (12:32 -0800)]
Fix account picker crash when there is no account before.

Bug: 33497222
Test: make RunSettingsRoboTests
Change-Id: I06adb4e0a4afcb359a4f7e8b15f13f67c28d5b46

7 years agoMerge "Handle tap on intent based search results."
TreeHugger Robot [Fri, 9 Dec 2016 23:04:02 +0000 (23:04 +0000)]
Merge "Handle tap on intent based search results."

7 years agoMerge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev am: f6b8321654
Youhan Wang [Fri, 9 Dec 2016 22:35:19 +0000 (22:35 +0000)]
Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev am: f6b8321654
am: 9706936945

Change-Id: Ie863e18d661c459c89c5b3f144e4d9f1b5ab3f52

7 years agoAdd Ims Registration Info to RadioInfo am: 839b9f9733
Nathan Harold [Fri, 9 Dec 2016 22:34:16 +0000 (22:34 +0000)]
Add Ims Registration Info to RadioInfo am: 839b9f9733
am: 70ab95ee63  -s ours

Change-Id: I11232ff4ff0dfd8f39437e6407f35f82fdd7aa11

7 years agoEnable and Disable IMS Provisioning Based on Platform Capability am: c137050588
Nathan Harold [Fri, 9 Dec 2016 22:34:09 +0000 (22:34 +0000)]
Enable and Disable IMS Provisioning Based on Platform Capability am: c137050588
am: cc140412a5

Change-Id: I7df9a79a42c8768354a6fa31e9123c0d0ccf736f

7 years agoMerge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
Youhan Wang [Fri, 9 Dec 2016 22:24:30 +0000 (22:24 +0000)]
Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
am: f6b8321654

Change-Id: Icc7bbc20943c224bfb6cc0131480cf394b1e1124

7 years agoAdd Ims Registration Info to RadioInfo
Nathan Harold [Fri, 9 Dec 2016 22:23:33 +0000 (22:23 +0000)]
Add Ims Registration Info to RadioInfo
am: 839b9f9733

Change-Id: I18a64c82bf853b86da4fe99981b1b8d6f5955643

7 years agoEnable and Disable IMS Provisioning Based on Platform Capability
Nathan Harold [Fri, 9 Dec 2016 22:23:26 +0000 (22:23 +0000)]
Enable and Disable IMS Provisioning Based on Platform Capability
am: c137050588

Change-Id: If618e69ebc504e55ab5a8eda874104f471ae44fc

7 years agoMerge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
Youhan Wang [Fri, 9 Dec 2016 22:17:08 +0000 (22:17 +0000)]
Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev

* changes:
  Add Ims Registration Info to RadioInfo
  Enable and Disable IMS Provisioning Based on Platform Capability

7 years agoMerge "First step in refactoring Index.java"
TreeHugger Robot [Fri, 9 Dec 2016 22:13:26 +0000 (22:13 +0000)]
Merge "First step in refactoring Index.java"

7 years agoMerge "Remove divider lines from new IA fragments."
TreeHugger Robot [Fri, 9 Dec 2016 21:43:11 +0000 (21:43 +0000)]
Merge "Remove divider lines from new IA fragments."

7 years agoHandle tap on intent based search results.
Fan Zhang [Thu, 8 Dec 2016 23:40:05 +0000 (15:40 -0800)]
Handle tap on intent based search results.

Also fix how icon is loaded. IconResId is specific to the package of the
indexed result. If result comes from external app, icon needs to be
decoded against the external app's package context.

Bug: 33432310
Test: RunSettingsRoboTests
Change-Id: Ia0c53e63be757405dfaeceb2d865e7d8de87c5ee

7 years agoMerge "Add check for DISALLOW_DEBUGGING_FEATURES restriction"
TreeHugger Robot [Fri, 9 Dec 2016 21:26:36 +0000 (21:26 +0000)]
Merge "Add check for DISALLOW_DEBUGGING_FEATURES restriction"

7 years agoMerge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a...
xiaocheng.x.wang [Fri, 9 Dec 2016 21:14:32 +0000 (21:14 +0000)]
Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a am: 2366d4dcfd
am: b4624dceda

Change-Id: I72288936aaf38faf2810dbcf2e426aca68aa8242

7 years agoMerge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a
xiaocheng.x.wang [Fri, 9 Dec 2016 21:08:45 +0000 (21:08 +0000)]
Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a
am: 2366d4dcfd

Change-Id: If27c734d231abbc76d21ac6efcab3933fe34f460

7 years agoMerge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116
xiaocheng.x.wang [Fri, 9 Dec 2016 21:02:45 +0000 (21:02 +0000)]
Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116
am: 2d38abb49a

Change-Id: Ic105a97e7ee4d56f16dc8f67d2b09a6ebd55b3ba

7 years agoMerge "Fix apn can't be updated when pressing back key"
xiaocheng.x.wang [Fri, 9 Dec 2016 20:57:46 +0000 (20:57 +0000)]
Merge "Fix apn can't be updated when pressing back key"
am: 5c6e7a2116

Change-Id: I5f7cf29476e88c3603c902c5e501bef08fad5c8c

7 years agoFirst step in refactoring Index.java
Matthew Fritze [Thu, 8 Dec 2016 17:54:13 +0000 (09:54 -0800)]
First step in refactoring Index.java

Handles the following refators:
 - Indexing code into: DatabaseIndexingManager
 - Indexing utility methods into: DatabaseIndexingUtil
 - XML Parsiing utility methods into XMLParserUtil

Bug: 33451851
Test: make RunSettingsRoboTests
Change-Id: I4264ad3806d1bd3a66d879c16ad6c8315ecb832b

7 years agoMerge "Fix apn can't be updated when pressing back key"
Treehugger Robot [Fri, 9 Dec 2016 20:50:39 +0000 (20:50 +0000)]
Merge "Fix apn can't be updated when pressing back key"

7 years agoRemove divider lines from new IA fragments.
Fan Zhang [Fri, 9 Dec 2016 19:43:42 +0000 (11:43 -0800)]
Remove divider lines from new IA fragments.

Change-Id: I0ce486f7ac6148e1747a948c9c2b187157734ed1
Fixes: 33486181
Test: RunSettingsRoboTests

7 years agoAdd check for DISALLOW_DEBUGGING_FEATURES restriction
Doris Ling [Wed, 7 Dec 2016 21:21:20 +0000 (13:21 -0800)]
Add check for DISALLOW_DEBUGGING_FEATURES restriction

- if the user has restriction for the action
  DISALLOW_DEBUGGING_FEATURES, remove the preference for taking bug
  report and the switch preference to enable bug report shortcut in the
  power key.
- refactor DevelopmentSettings to use preference controller for Take bug
  report and enable bug report in power key.

Fixes: 27145643
Test: make RunSettingsRoboTests

Change-Id: I18784d218d37956130c33f527d514ab703727397

7 years agoMerge "Improve UI pref when sync/cancel account syncs."
Fan Zhang [Fri, 9 Dec 2016 17:39:15 +0000 (17:39 +0000)]
Merge "Improve UI pref when sync/cancel account syncs."

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 9 Dec 2016 11:12:00 +0000 (03:12 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ib7c81831c8d7e40f0f98c8c65ba99a4af191e236
Auto-generated-cl: translation import

7 years agoImprove UI pref when sync/cancel account syncs.
Fan Zhang [Thu, 8 Dec 2016 19:28:31 +0000 (11:28 -0800)]
Improve UI pref when sync/cancel account syncs.

The core of the change is in ManageAccountSettings#showSyncState(). New
code caches as much information as it can. And break out of loops as
early as possible.

Bug: 28575620
Test: make RunSettingsRoboTests
Change-Id: I076ce148e3d8db55f6cadfd9491f037f7a55a986

7 years agoMerge "Show the highlight for the wifi toggle switch."
Jiaquan He [Thu, 8 Dec 2016 18:56:42 +0000 (18:56 +0000)]
Merge "Show the highlight for the wifi toggle switch."

7 years agoMerge "Makes it possible to robo-test Settings app fragments."
Jaewoong Jung [Thu, 8 Dec 2016 04:31:13 +0000 (04:31 +0000)]
Merge "Makes it possible to robo-test Settings app fragments."

7 years agoMerge "Makes app settings keep scroll position after unistalling apps."
Jaewoong Jung [Thu, 8 Dec 2016 04:31:13 +0000 (04:31 +0000)]
Merge "Makes app settings keep scroll position after unistalling apps."

7 years agoMerge "Use a single layout for CreateShortcut activity."
TreeHugger Robot [Thu, 8 Dec 2016 01:59:21 +0000 (01:59 +0000)]
Merge "Use a single layout for CreateShortcut activity."

7 years agoMakes it possible to robo-test Settings app fragments.
Jaewoong Jung [Wed, 30 Nov 2016 23:45:53 +0000 (15:45 -0800)]
Makes it possible to robo-test Settings app fragments.

This adds bunch of shadow/placeholder classes and logic to handle
references to Android internal resources or newly added classes/methods
that Robolectric hasn't yet picked up.

Developers can follow ManageApplicationsTest example to use the shadow
classes and the utility method to start ther fragment in their
robolectric tests.

Bug: 33431346
Test: This is a test improvement CL. RunSettingsRoboTests still passes.
Change-Id: I943ab871631cb8c368d9f9db481c00558c5c4d1f

7 years agoMerge "Remove no-op handlePerferenceTreeClick from PrefControllers"
TreeHugger Robot [Thu, 8 Dec 2016 01:27:50 +0000 (01:27 +0000)]
Merge "Remove no-op handlePerferenceTreeClick from PrefControllers"

7 years agoMove private volume storage calculations into a shared lib. am: c04f8b9ecd
Daniel Nishi [Thu, 8 Dec 2016 00:57:31 +0000 (00:57 +0000)]
Move private volume storage calculations into a shared lib. am: c04f8b9ecd
am: edf31e2e38

Change-Id: I8d561d292dda6270867ee7efb33fa0f3b7ef7598

7 years agoMove private volume storage calculations into a shared lib.
Daniel Nishi [Thu, 8 Dec 2016 00:50:11 +0000 (00:50 +0000)]
Move private volume storage calculations into a shared lib.
am: c04f8b9ecd

Change-Id: If2822dfcebf95546c0fa2ee96d3e689e104f3d59

7 years agoMerge "Add tint for ic_settings_24dp.xml in settings"
Lei Yu [Thu, 8 Dec 2016 00:48:25 +0000 (00:48 +0000)]
Merge "Add tint for ic_settings_24dp.xml in settings"

7 years agoMerge "Refactor SoundSettings to use more preference controller."
TreeHugger Robot [Thu, 8 Dec 2016 00:30:25 +0000 (00:30 +0000)]
Merge "Refactor SoundSettings to use more preference controller."

7 years agoUse a single layout for CreateShortcut activity.
Fan Zhang [Wed, 7 Dec 2016 23:29:43 +0000 (15:29 -0800)]
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

7 years agoRemove no-op handlePerferenceTreeClick from PrefControllers
Fan Zhang [Wed, 7 Dec 2016 23:34:31 +0000 (15:34 -0800)]
Remove no-op handlePerferenceTreeClick from PrefControllers

Bug: 33429853
Test: RunSettingsRoboTests
Change-Id: I5633953e3d7b07f9006e541b96a24a2a769e2686

7 years agoMerge "Add search loader for installed apps."
TreeHugger Robot [Wed, 7 Dec 2016 23:01:53 +0000 (23:01 +0000)]
Merge "Add search loader for installed apps."