Commit Graph

24619 Commits

Author SHA1 Message Date
Alan Viverette
003774bd04 Localization clarifications
Bug: 26223525
Bug: 26222163
Change-Id: I273d0452d26cfe4ec0e23a8455cda958dfcf26bb
2015-12-17 10:52:13 -05:00
Jason Monk
5d0bdb9d90 Merge "Fix search highlighting items" 2015-12-17 15:47:01 +00:00
Gustav Sennton
6ced4c95f5 Add null-pointer check for the case where we have no WebView provider.
Change-Id: I33a142bd3af694dfe9c63e6852a6b5cd701de467
2015-12-17 15:44:16 +00:00
Jason Monk
65bb097732 Fix search highlighting items
Bug: 24576551
Change-Id: I0a6c251cc93eef9f49070f2b7e57780d4542dd03
2015-12-17 10:39:44 -05:00
Julia Reynolds
2ba71ad15d Don't show orphaned rule instances in Settings.
Bug: 25472361
Change-Id: Ic9bec4872777b720aa786679cbc960a9ee51dbe1
2015-12-17 08:46:09 -05:00
Jason Monk
fa4813783f Avoid RecyclerView causing items to blink on update
Change-Id: Ic0bd70ec3f2a5e195cc0924c98c589f90e27afe9
2015-12-16 16:43:02 -05:00
Jason Monk
b1dd5c9959 Fix Settings Titles not being set correctly
Bug: 25585359
Change-Id: I523a00115295adb9f43de768bb40c02099ffb1af
2015-12-16 16:13:54 -05:00
Jason Monk
aca0f1cf8a Fix airplane mode conditional primary click
Change-Id: Iacd83b53be224ad8fd55fe176f66a0d724576247
2015-12-16 15:58:59 -05:00
Jason Monk
77d57d07a9 Protect against crash when no NfcAdapter is around
Bug: 26155716
Change-Id: I9e10831ca068263b40fcf06bf83ce341d73e96d2
2015-12-16 14:26:18 -05:00
Jason Monk
c685853bb8 Add background data off conditional
Change-Id: If51fdaecc880560c4a0cd8d320b06804cfe98388
2015-12-16 12:58:39 -05:00
Jason Monk
70ecea2207 Add cellular data off conditional
Change-Id: I34980f3fc09bf5dd47eb296c5b1c5fccc87b5c90
2015-12-16 12:42:22 -05:00
Jason Monk
af24b6377e Add battery saver conditional
Change-Id: If80b749185537f252dae88230f80b29bcf321fdf
2015-12-16 12:38:32 -05:00
Amit Mahajan
cd74ebb53d Code cleanup including removing direct references to IMS classes.
Bug: 25793157
Change-Id: I15f285a03ce65695ac260945993fbd189ba3b5d0
2015-12-15 16:43:32 -08:00
Amit Mahajan
29d3b16fc4 Merge "Code cleanup including removing direct references to IMS classes." 2015-12-15 23:50:22 +00:00
Maurice Lam
0f5860c9a0 Merge "[ScreenLock] Fix result code handling" 2015-12-15 22:20:47 +00:00
Maurice Lam
e9d2abca86 [ScreenLock] Fix result code handling
Modify the back stack and result code propagation in the screen lock
scenarios.

- EncryptionInterstitial now propagates the result of ChooseLock*
  request instead of always returning RESULT_OK.
- ChooseLockGeneric now treats CHOOSE_LOCK_REQUEST and
  ENABLE_ENCRYPTION_REQUEST the same (since encryption can be a proxy
  for ChooseLock*). This means ChooseLockGeneric will now stay on
  back stack when going back from ChooseLock*, just like the case
  (indirectly) through EncryptionInterstitial.

Bug: 26177240
Change-Id: Id7f1256dcbff00d552a3e7db60c285f53f1e63e6
2015-12-15 11:56:45 -08:00
Jason Monk
b69b96042c Merge "Move DropDownPreference to supportlib" 2015-12-15 18:02:53 +00:00
Jason Monk
1230ac820e Move DropDownPreference to supportlib
Change-Id: Ife6799d1136302b805b5191f1a86276c538ca4bf
2015-12-15 10:59:08 -05:00
Alan Viverette
4582dab08e Merge "Allow use of comma to separate search keywords, update keywords" 2015-12-15 15:24:53 +00:00
Alan Viverette
35c3454808 Allow use of comma to separate search keywords, update keywords
Bug: 26149710
Change-Id: I2d8095bbb007c011d7b3e2fe077115c696f9e39c
2015-12-15 09:50:44 -05:00
Clara Bayarri
c5cde05562 Fire pending intent from Confirm Credentials flow
Add support in the Confirm Credentials flow to read an Intent extra
and fire it when authentication succeeds.

This is part of the Separate Work Challenge feature.

Change-Id: I52c203735fa9b53fd2f7df971824747eeb930f36
2015-12-15 10:45:48 +00:00
Jim Miller
990c08e3af Merge "Fix blank animation in "find the sensor" flow for fingerprint." 2015-12-15 04:08:30 +00:00
Jim Miller
931901186a Fix blank animation in "find the sensor" flow for fingerprint.
Fixes bug 26194530

Change-Id: I855b6f12a72c7489fae8fba249c55d4626b4a202
2015-12-14 20:01:42 -08:00
Paul Lawrence
39087a7eaa Merge "Fix no keyboard on N builds" 2015-12-15 02:46:39 +00:00
Paul Lawrence
250faf9243 Fix no keyboard on N builds
Bug: 25942488
Bug: 26190615
Change-Id: Ifd588bf7db76f9ea5d6a90854f8e92f86f4c2910
2015-12-15 02:33:27 +00:00
Jim Miller
c1f72f9169 Allow animation movie for "find the sensor" flow
This adds an optional overlay to specify a per-device
movie to illustrate enrolling a fingerprint. To enable,
create a new layout overlay for
fingerprint_enroll_find_sensor_graphic.xml using
FingerprintLocationAnimationVideoView

Fixes bug 22954305

Change-Id: I59294f71617ecf7a9bf09603fc0b068cc5aa8ff9
2015-12-14 17:19:27 -08:00
Jason Monk
9cbf325589 Fix CustomListPreference click handling
Bug: 26187611
Change-Id: I6293d5577b4f770e2dfe94bae53fa9da0822cefc
2015-12-14 16:39:45 -05:00
Amit Mahajan
b922186831 Code cleanup including removing direct references to IMS classes.
Bug: 25793157
Change-Id: I15f285a03ce65695ac260945993fbd189ba3b5d0
2015-12-14 13:23:29 -08:00
Jason Monk
ffb4535d3a Add dnd conditional
Change-Id: I81eabf274bde05358c60bb63e1ed6d1bd447ce55
2015-12-14 15:34:12 +00:00
Jason Monk
db4ed191de Add conditionals to Settings
Also add Airplane Mode and Hotspot conditionals (more to come soon)

Change-Id: I11f206db59f7c715f416fb5852b8f0fcb857a247
2015-12-14 10:29:12 -05:00
Gustav Sennton
a48f16fe01 Merge "Add WebView provider setting to developer settings." 2015-12-14 14:33:55 +00:00
Kenny Guy
4f3b09d2b5 Merge "Add support for showing the admin disabling settings." 2015-12-14 14:31:37 +00:00
Henrik Baard
2984b2b791 Some text are missing in eject sdcard warning
The eject sdcard warning page shows incomplete texts
in some languages (german) and it is not apparant that
that you can scroll to see the text.

The layout is divided into three parts, the button
and one blank line, and the text. The text and the
blanke space will have equal parts of the screen
since they have the same weight. Because of this the
(complete) text is not shown in som languages.

Remove the blank part and let the text use the whole
screen.

Change-Id: Id8fd88fc6c0aa6105d64c100e3365cd9b00bf851
2015-12-14 12:23:10 +01:00
Geoff Mendal
e88f94b6df Import translations. DO NOT MERGE am: 1cb1ad2c55 -s ours am: ab3b13d0ed -s ours
am: 6419a4a6e2  -s ours

* commit '6419a4a6e25dadb3cac04b041dd325510bd0a6d4':
  Import translations. DO NOT MERGE
2015-12-13 13:18:46 -08:00
Geoff Mendal
92bea3c775 Revert "Import translations. DO NOT MERGE" am: 7bafd5ee2f -s ours am: d2981b099e -s ours
am: 4f86f6274a  -s ours

* commit '4f86f6274aaa8966247000b6c5bf1fb01b6de4d9':
  Revert "Import translations. DO NOT MERGE"
2015-12-13 13:18:13 -08:00
Geoff Mendal
6380b7bb68 Import translations. DO NOT MERGE am: df57be8aef -s ours am: bc84451452 -s ours
am: 819e07fbbe  -s ours

* commit '819e07fbbe3c1722d6e612d5c8c03e8ca7afbb33':
  Import translations. DO NOT MERGE
2015-12-13 13:15:16 -08:00
Geoff Mendal
6419a4a6e2 Import translations. DO NOT MERGE am: 1cb1ad2c55 -s ours
am: ab3b13d0ed  -s ours

* commit 'ab3b13d0edce3b89bd5836f8a9446a427b6c6acc':
  Import translations. DO NOT MERGE
2015-12-11 18:07:11 -08:00
Geoff Mendal
ab3b13d0ed Import translations. DO NOT MERGE
am: 1cb1ad2c55  -s ours

* commit '1cb1ad2c55d1997dd5c31e5aed5062a4d395238f':
  Import translations. DO NOT MERGE
2015-12-11 18:04:00 -08:00
Geoff Mendal
1cb1ad2c55 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 26151591
Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
2015-12-11 17:58:32 -08:00
Geoff Mendal
4f86f6274a Revert "Import translations. DO NOT MERGE" am: 7bafd5ee2f -s ours
am: d2981b099e  -s ours

* commit 'd2981b099e15e9f39ed8c69d06860ae74ecb497c':
  Revert "Import translations. DO NOT MERGE"
2015-12-11 17:47:41 -08:00
Geoff Mendal
d2981b099e Revert "Import translations. DO NOT MERGE"
am: 7bafd5ee2f  -s ours

* commit '7bafd5ee2f2c6fb3c3e3f456e855ab34c06f7c91':
  Revert "Import translations. DO NOT MERGE"
2015-12-11 17:44:31 -08:00
Geoff Mendal
7bafd5ee2f Revert "Import translations. DO NOT MERGE"
This reverts commit df57be8aef.

Change-Id: Ie47ab587c4ea43cdd6fb608b0c5dfe26e534ab93
2015-12-12 01:42:00 +00:00
Geoff Mendal
819e07fbbe Import translations. DO NOT MERGE am: df57be8aef -s ours
am: bc84451452  -s ours

* commit 'bc844514522870bd3e70bba85a11ea824ff59e5b':
  Import translations. DO NOT MERGE
2015-12-11 16:36:21 -08:00
Geoff Mendal
bc84451452 Import translations. DO NOT MERGE
am: df57be8aef  -s ours

* commit 'df57be8aef6dd1760e72d7f76490048eeb425a3e':
  Import translations. DO NOT MERGE
2015-12-11 16:30:09 -08:00
Geoff Mendal
df57be8aef Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 26151591
Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
2015-12-11 16:05:26 -08:00
Julia Reynolds
f6080b49be Merge "Importance shift." 2015-12-11 21:22:00 +00:00
Vasu Nori
3cafcba67e Merge "When Airplane mode is changed due to Voice Intent, use the system provided ConnectionManager method to do that, instead of changing it directly using Settings.Global.putInt() - because that doesn't case ACTION_AIRPLANE_MODE_CHANGED intent to be broadcast. This breaks Google Search App (GSA) code that relies on the above broadcast to do a variety of things." 2015-12-11 20:25:01 +00:00
Vasu Nori
1d89a19207 When Airplane mode is changed due to Voice Intent, use the system
provided ConnectionManager method to do that, instead of changing
it directly using Settings.Global.putInt() - because that doesn't
case ACTION_AIRPLANE_MODE_CHANGED intent to be broadcast.
This breaks Google Search App (GSA) code that relies on the above
broadcast to do a variety of things.

Change-Id: I2aa61643ed23b373aa362a59af83427a4548c492
2015-12-11 11:56:50 -08:00
Sudheer Shanka
9159fe9af8 Add support for showing the admin disabling settings.
For settings disabled by user restrictions show
the user a lock icon and allow them to click to
find more info.

Bug: 22543585

Change-Id: Ie8b02ac26f2b22db386a9044f3c6570098f6e14b
2015-12-11 19:44:14 +00:00
Julia Reynolds
98ed019209 Importance shift.
Change-Id: If39ee2c4665aa27de4e32b73ecf2d5917f7ed4ca
2015-12-11 14:25:41 -05:00