TreeHugger Robot
d4443e7196
Merge "New pref toggle for network recommendations."
2016-12-15 01:43:56 +00:00
Maurice Lam
1b89a9a4e1
Merge "Remove WifiSetupActivity"
2016-12-15 00:36:32 +00:00
Maurice Lam
f8a325c7c6
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
2016-12-14 22:41:58 +00:00
Esteban Talavera
e539c886fd
Merge "Check new user restriction for profile removal"
2016-12-14 19:16:28 +00:00
Zhendong Yang
b521aeb9f7
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d am: 8711f4055d
...
am: 8c9e3db8d9
2016-12-14 06:00:07 +00:00
Zhendong Yang
8c9e3db8d9
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769 am: 7598c6201d
...
am: 8711f4055d
2016-12-14 05:53:04 +00:00
Zhendong Yang
8711f4055d
Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769
...
am: 7598c6201d
2016-12-14 05:46:08 +00:00
Zhendong Yang
7598c6201d
Merge "Fix crash when rotating HighPowerDetail dialog"
...
am: 783ff43769
2016-12-14 05:38:34 +00:00
Treehugger Robot
783ff43769
Merge "Fix crash when rotating HighPowerDetail dialog"
2016-12-14 05:30:16 +00:00
Tony Mak
f869b14e25
Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev am: 0e7405fc17
...
am: 4cce4c5170
2016-12-14 02:27:31 +00:00
Tony Mak
90b13dee55
DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD am: 8a2f28a629
...
am: 2d45ef14e5
2016-12-14 02:27:15 +00:00
Tony Mak
4cce4c5170
Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev
...
am: 0e7405fc17
2016-12-14 02:19:24 +00:00
Tony Mak
2d45ef14e5
DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
...
am: 8a2f28a629
2016-12-14 02:19:22 +00:00
TreeHugger Robot
0e7405fc17
Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev
2016-12-14 02:08:37 +00:00
Jeremy Joslin
66e6027da0
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
2016-12-13 15:33:55 -08:00
Fan Zhang
af71eb20c8
Merge "Always reserve space for preference icons."
2016-12-13 17:06:59 +00:00
Bill Yi
fdcd3cfd08
Import translations. DO NOT MERGE am: a4e78d242d -s ours
...
am: a379685253
2016-12-13 04:02:26 +00:00
Bill Yi
a379685253
Import translations. DO NOT MERGE
...
am: a4e78d242d
2016-12-13 03:55:17 +00:00
TreeHugger Robot
20cd7b9c66
Merge "Import translations. DO NOT MERGE"
2016-12-13 03:41:12 +00:00
Bill Yi
a4e78d242d
Import translations. DO NOT MERGE
...
Change-Id: Ia4641aa6b6dc9907ede180fa2d7d0cb4f1c258f0
Auto-generated-cl: translation import
2016-12-12 17:30:02 -08:00
Bill Yi
43ac544b65
Import translations. DO NOT MERGE
...
Change-Id: I2531790f442ad46e6bff142af9b1694d93049021
Auto-generated-cl: translation import
2016-12-12 17:24:44 -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
Marie Janssen
fe312be222
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings" am: 8c11340b0c -s ours am: 0d60028669 -s ours am: f1342adb86
...
am: 1c4f12c6db
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
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
2016-12-12 21:40:16 +00:00
Marie Janssen
0d60028669
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
...
am: 8c11340b0c
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
2016-12-09 22:35:19 +00:00
Nathan Harold
ae981288f8
Add Ims Registration Info to RadioInfo am: 839b9f9733
...
am: 70ab95ee63
2016-12-09 22:34:16 +00:00
Nathan Harold
346f5aaafc
Enable and Disable IMS Provisioning Based on Platform Capability am: c137050588
...
am: cc140412a5
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
2016-12-09 22:24:30 +00:00
Nathan Harold
70ab95ee63
Add Ims Registration Info to RadioInfo
...
am: 839b9f9733
2016-12-09 22:23:33 +00:00
Nathan Harold
cc140412a5
Enable and Disable IMS Provisioning Based on Platform Capability
...
am: c137050588
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
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
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
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
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
