Commit Graph

32716 Commits

Author SHA1 Message Date
Marie Janssen
fe312be222 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
2016-12-12 21:51:56 +00:00
Marie Janssen
1c4f12c6db Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours am: 0d60028669 -s ours
am: f1342adb86

Change-Id: Ib7b4cb112fcde7e8286f24e59aa31befef56a068
2016-12-12 21:46:12 +00:00
Marie Janssen
f1342adb86 Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours
am: 0d60028669  -s ours

Change-Id: I38c9941c8a7102c6e987fda1d7d1d1b0155ccde9
2016-12-12 21:40:16 +00:00
Marie Janssen
0d60028669 Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
am: 8c11340b0c  -s ours

Change-Id: I60f481691445aeb4926b177d83f39077b9a72921
2016-12-12 21:34:45 +00:00
Marie Janssen
8c11340b0c Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" 2016-12-12 21:27:23 +00:00
Lei Yu
4eba3954e2 Merge "Fix account picker crash when there is no account before." 2016-12-12 21:06:12 +00:00
Svetoslav Ganov
c6a074c80d 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
2016-12-12 09:44:39 -08:00
Zhendong Yang
cb911e3402 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
2016-12-12 20:55:40 +09:00
Tony Mak
8a2f28a629 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
2016-12-12 02:35:42 +00:00
jackqdyulei
9134548ea4 Fix account picker crash when there is no account before.
Bug: 33497222
Test: make RunSettingsRoboTests
Change-Id: I06adb4e0a4afcb359a4f7e8b15f13f67c28d5b46
2016-12-11 12:37:26 -08:00
TreeHugger Robot
1a71c05c7c Merge "Handle tap on intent based search results." 2016-12-09 23:04:03 +00:00
Youhan Wang
e5a2be9d40 Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev am: f6b8321654
am: 9706936945

Change-Id: Ie863e18d661c459c89c5b3f144e4d9f1b5ab3f52
2016-12-09 22:35:19 +00:00
Nathan Harold
ae981288f8 Add Ims Registration Info to RadioInfo am: 839b9f9733
am: 70ab95ee63  -s ours

Change-Id: I11232ff4ff0dfd8f39437e6407f35f82fdd7aa11
2016-12-09 22:34:16 +00:00
Nathan Harold
346f5aaafc Enable and Disable IMS Provisioning Based on Platform Capability am: c137050588
am: cc140412a5

Change-Id: I7df9a79a42c8768354a6fa31e9123c0d0ccf736f
2016-12-09 22:34:09 +00:00
Youhan Wang
9706936945 Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
am: f6b8321654

Change-Id: Icc7bbc20943c224bfb6cc0131480cf394b1e1124
2016-12-09 22:24:30 +00:00
Nathan Harold
70ab95ee63 Add Ims Registration Info to RadioInfo
am: 839b9f9733

Change-Id: I18a64c82bf853b86da4fe99981b1b8d6f5955643
2016-12-09 22:23:33 +00:00
Nathan Harold
cc140412a5 Enable and Disable IMS Provisioning Based on Platform Capability
am: c137050588

Change-Id: If618e69ebc504e55ab5a8eda874104f471ae44fc
2016-12-09 22:23:26 +00:00
Youhan Wang
f6b8321654 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
2016-12-09 22:17:09 +00:00
TreeHugger Robot
0a56f479f9 Merge "First step in refactoring Index.java" 2016-12-09 22:13:26 +00:00
TreeHugger Robot
aff89527e6 Merge "Remove divider lines from new IA fragments." 2016-12-09 21:43:11 +00:00
Fan Zhang
12daf6830d 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
2016-12-09 13:27:00 -08:00
TreeHugger Robot
62b397d38c Merge "Add check for DISALLOW_DEBUGGING_FEATURES restriction" 2016-12-09 21:26:36 +00:00
xiaocheng.x.wang
63bff146ab Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a am: 2366d4dcfd
am: b4624dceda

Change-Id: I72288936aaf38faf2810dbcf2e426aca68aa8242
2016-12-09 21:14:32 +00:00
xiaocheng.x.wang
b4624dceda Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a
am: 2366d4dcfd

Change-Id: If27c734d231abbc76d21ac6efcab3933fe34f460
2016-12-09 21:08:45 +00:00
xiaocheng.x.wang
2366d4dcfd Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116
am: 2d38abb49a

Change-Id: Ic105a97e7ee4d56f16dc8f67d2b09a6ebd55b3ba
2016-12-09 21:02:45 +00:00
xiaocheng.x.wang
2d38abb49a Merge "Fix apn can't be updated when pressing back key"
am: 5c6e7a2116

Change-Id: I5f7cf29476e88c3603c902c5e501bef08fad5c8c
2016-12-09 20:57:46 +00:00
Matthew Fritze
18fcb08308 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
2016-12-09 20:51:32 +00:00
Treehugger Robot
5c6e7a2116 Merge "Fix apn can't be updated when pressing back key" 2016-12-09 20:50:39 +00:00
Fan Zhang
cdc1135e51 Remove divider lines from new IA fragments.
Change-Id: I0ce486f7ac6148e1747a948c9c2b187157734ed1
Fixes: 33486181
Test: RunSettingsRoboTests
2016-12-09 11:43:42 -08:00
Doris Ling
cc20600102 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
2016-12-09 11:38:22 -08:00
Fan Zhang
d4b43228b0 Merge "Improve UI pref when sync/cancel account syncs." 2016-12-09 17:39:16 +00:00
Bill Yi
28fbec0aaa Import translations. DO NOT MERGE
Change-Id: Ib7c81831c8d7e40f0f98c8c65ba99a4af191e236
Auto-generated-cl: translation import
2016-12-09 03:12:00 -08:00
Fan Zhang
2829958456 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
2016-12-08 14:35:13 -08:00
Jiaquan He
1ff0a53529 Merge "Show the highlight for the wifi toggle switch." 2016-12-08 18:56:42 +00:00
Jaewoong Jung
56a8c64c43 Merge "Makes it possible to robo-test Settings app fragments." 2016-12-08 04:31:14 +00:00
Jaewoong Jung
b680966748 Merge "Makes app settings keep scroll position after unistalling apps." 2016-12-08 04:31:14 +00:00
TreeHugger Robot
2a6193df36 Merge "Use a single layout for CreateShortcut activity." 2016-12-08 01:59:22 +00:00
Jaewoong Jung
bccd652503 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
2016-12-07 17:32:39 -08:00
TreeHugger Robot
fb8d1bf427 Merge "Remove no-op handlePerferenceTreeClick from PrefControllers" 2016-12-08 01:27:51 +00:00
Daniel Nishi
82389a0861 Move private volume storage calculations into a shared lib. am: c04f8b9ecd
am: edf31e2e38

Change-Id: I8d561d292dda6270867ee7efb33fa0f3b7ef7598
2016-12-08 00:57:31 +00:00
Daniel Nishi
edf31e2e38 Move private volume storage calculations into a shared lib.
am: c04f8b9ecd

Change-Id: If2822dfcebf95546c0fa2ee96d3e689e104f3d59
2016-12-08 00:50:11 +00:00
Lei Yu
b9b68a50a1 Merge "Add tint for ic_settings_24dp.xml in settings" 2016-12-08 00:48:25 +00:00
TreeHugger Robot
6c6c0e1151 Merge "Refactor SoundSettings to use more preference controller." 2016-12-08 00:30:25 +00: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
Fan Zhang
9b6f181340 Remove no-op handlePerferenceTreeClick from PrefControllers
Bug: 33429853
Test: RunSettingsRoboTests
Change-Id: I5633953e3d7b07f9006e541b96a24a2a769e2686
2016-12-07 15:34:31 -08:00
TreeHugger Robot
276e3b7a5e Merge "Add search loader for installed apps." 2016-12-07 23:01:53 +00:00
Doris Ling
6c2cf0dbc5 Refactor SoundSettings to use more preference controller.
- second round of refactoring SoundSettings to use preference
  controller.
- add controller for Emergency broadcast, Vibrate when ring, Phone
  ringtone, Alarm ringtone, and Notification ringtone.

Bug: 32276590
Test: make RunSettingsRoboTests
Change-Id: Iaff48ecb27bf156a5c8995de20ce7a440b094cdb
2016-12-07 14:33:13 -08:00
Fan Zhang
36d0d143be Add search loader for installed apps.
- The loader filters out system apps.
- Loader performs case-insensitive match with app names.
- SearchResultAdapter combines results from multiple loaders into a
  single list.

Fixes: 33347966
Test: make RunSettingsRoboTests
Change-Id: I228ca6fb82f0ac5151b2346c079c2de41104a4df
2016-12-07 13:00:26 -08:00
Matthew Fritze
cacb2f00c1 Merge "Test the Columns in the SearchIndexablesContract" 2016-12-07 19:37:43 +00:00
Matthew Fritze
172eac4c51 Test the Columns in the SearchIndexablesContract
The test is going into settings because of the lack testing
support in framework/base for this kind of change, and
because Settings search depends on this change.

Test: make RunSettingsUnitTests
Bug: 33390556
Change-Id: I8a87d4228a37fca475791409b89c7d135c29004a
2016-12-07 09:45:51 -08:00