Commit Graph

25614 Commits

Author SHA1 Message Date
Julia Reynolds
fe9c0ebcb1 Hide notification asst setting. am: 602e133e79
am: b755b16598

* commit 'b755b16598f956b7badd6ce69a2ebf58905dfbd1':
  Hide notification asst setting.
2016-03-01 15:40:31 +00:00
Julia Reynolds
b755b16598 Hide notification asst setting.
am: 602e133e79

* commit '602e133e79c68216756ac897e762497ea8747cd0':
  Hide notification asst setting.
2016-03-01 15:38:45 +00:00
Julia Reynolds
602e133e79 Hide notification asst setting.
Bug: 22960980
Change-Id: If9f28e3944d6a3a450d2607448be9ec25fdcdb85
2016-03-01 10:20:36 -05:00
Julia Reynolds
3adcc09b06 Merge "Api review: AutomaticZenRule" into nyc-dev am: a20dff1ebf
am: fb366d9f34

* commit 'fb366d9f34df200040bb60fca177c076823db2e8':
  Api review: AutomaticZenRule
2016-03-01 15:12:09 +00:00
Julia Reynolds
fb366d9f34 Merge "Api review: AutomaticZenRule" into nyc-dev
am: a20dff1ebf

* commit 'a20dff1ebf9acdec8efdc244aef1128e38921fe5':
  Api review: AutomaticZenRule
2016-03-01 15:08:55 +00:00
Julia Reynolds
a20dff1ebf Merge "Api review: AutomaticZenRule" into nyc-dev 2016-03-01 15:05:34 +00:00
Nicolas Prevot
8b8f6e4594 Merge "Make some Settings intent filters cross-profile again." into nyc-dev am: 8eb11e473d
am: bfe0dee0eb

* commit 'bfe0dee0eb3298be3aedaf779e850a6a166d43c7':
  Make some Settings intent filters cross-profile again.
2016-03-01 11:45:43 +00:00
Nicolas Prevot
bfe0dee0eb Merge "Make some Settings intent filters cross-profile again." into nyc-dev
am: 8eb11e473d

* commit '8eb11e473d6bd42119bb349812cc39ce0c5d5879':
  Make some Settings intent filters cross-profile again.
2016-03-01 11:44:00 +00:00
Nicolas Prévot
8eb11e473d Merge "Make some Settings intent filters cross-profile again." into nyc-dev 2016-03-01 11:42:49 +00:00
Felipe Leme
17c211a699 Fixed padding on "Take Bug Report" dialog. am: 2c9911f190
am: bbeb1fc842

* commit 'bbeb1fc842287267604d79cbac8c5c9057566d05':
  Fixed padding on "Take Bug Report" dialog.
2016-03-01 02:39:00 +00:00
Felipe Leme
bbeb1fc842 Fixed padding on "Take Bug Report" dialog.
am: 2c9911f190

* commit '2c9911f1905aea2a01fc04040e7d7a1b17b94987':
  Fixed padding on "Take Bug Report" dialog.
2016-03-01 02:28:13 +00:00
Felipe Leme
2c9911f190 Fixed padding on "Take Bug Report" dialog.
BUG: 26324085
Change-Id: If716066d8ebf35e4fb398e7a423c808abd6a159e
2016-02-29 17:21:44 -08:00
Anna Galusza
683f4cee61 Merge "Change Action Bar title in a11y SUW to match setting name. Bug: 27326637" into nyc-dev am: 445bd53e51
am: 897223ed3f

* commit '897223ed3f056e1ca13e9f6a9fbe75bfa1754411':
  Change Action Bar title in a11y SUW to match setting name. Bug: 27326637
2016-02-29 19:57:33 +00:00
Anna Galusza
897223ed3f Merge "Change Action Bar title in a11y SUW to match setting name. Bug: 27326637" into nyc-dev
am: 445bd53e51

* commit '445bd53e5176f6140779284b6cc3110b06722ca5':
  Change Action Bar title in a11y SUW to match setting name. Bug: 27326637
2016-02-29 19:51:18 +00:00
Anna Galusza
445bd53e51 Merge "Change Action Bar title in a11y SUW to match setting name. Bug: 27326637" into nyc-dev 2016-02-29 19:47:15 +00:00
Anna Galusza
e87a2c21ff Change Action Bar title in a11y SUW to match setting name.
Bug: 27326637

Change-Id: Ifddabdfef75707d5cdc164b4415e830539fd962a
2016-02-29 11:45:24 -08:00
Sanket Padawe
0ea4357445 Resolve merge conflicts of b9e837bc78 to nyc-dev am: 7e6eec5b87
am: 71b73695bd

* commit '71b73695bd5c434fdf5d6789ba92f84fe54570a2':
  Remove displaying of WifiCalling twice in Settings search.
2016-02-29 19:17:57 +00:00
Sanket Padawe
71b73695bd Resolve merge conflicts of b9e837bc78 to nyc-dev
am: 7e6eec5b87

* commit '7e6eec5b87ba5ba34f63f7ba99ad911d54729d87':
  Remove displaying of WifiCalling twice in Settings search.
2016-02-29 19:14:52 +00:00
Sanket Padawe
7e6eec5b87 Resolve merge conflicts of b9e837bc78 to nyc-dev
+ Fix merge conflict fromm mm-wireless-dev to nyc-dev

Change-Id: I8a604cec65bbe5ed61262771c9fe0489798425ed
2016-02-29 10:48:51 -08:00
Sanket Padawe
b9e837bc78 Merge "Remove displaying of WifiCalling twice in Settings search." into mm-wireless-dev 2016-02-29 18:23:56 +00:00
Geoff Mendal
bf075ebab0 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5a3dec0c40 -s ours
am: d9bd7b0324  -s ours

* commit 'd9bd7b032422c2bdb0ec8cb47b28f1b28f681550':
  Import translations. DO NOT MERGE
2016-02-29 16:48:19 +00:00
Geoff Mendal
d9bd7b0324 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 5a3dec0c40  -s ours

* commit '5a3dec0c401cd7c3c5bada1cc9da2a57b91fec7f':
  Import translations. DO NOT MERGE
2016-02-29 16:46:40 +00:00
Geoff Mendal
5a3dec0c40 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-29 16:46:02 +00:00
Geoff Mendal
baadb43627 Import translations. DO NOT MERGE
Change-Id: I75e4543568e4d74a1cd3804a04ea13d49eb6a6d1
Auto-generated-cl: translation import
2016-02-29 07:37:40 -08:00
Jason Monk
215f9cc594 Guard against apps with no permissions am: 01a4491600
am: 986e2e3adc

* commit '986e2e3adcf93fe57c5191a49c8920e2dffeac75':
  Guard against apps with no permissions
2016-02-29 15:06:18 +00:00
Jason Monk
986e2e3adc Guard against apps with no permissions
am: 01a4491600

* commit '01a44916003ebdff399406405548c6058b114c5a':
  Guard against apps with no permissions
2016-02-29 15:04:44 +00:00
Jason Monk
01a4491600 Guard against apps with no permissions
Bug: 27355802
Change-Id: Iee8d9898af0e5910319cb47218ceee8da1352554
2016-02-29 09:55:19 -05:00
Geoff Mendal
b76274f9a3 Import translations. DO NOT MERGE
Change-Id: I7a1b8f0dd9b8f8a7b085a893e7bcb19ad4ccbac6
Auto-generated-cl: translation import
2016-02-29 06:32:57 -08:00
Nicolas Prevot
aea1702338 Make some Settings intent filters cross-profile again.
The intents:
INPUT_METHOD_SETTINGS, MANAGE_DEFAULT_APPS_SETTINGS and HOME_SETTINGS
were not handled in the parent any more. Handle them in the parent.

BUG:27240411
Change-Id: I42da3ce37901ba3e9f5c8004db53e49bc2f9ed24
2016-02-29 13:49:31 +00:00
shwetachahar
41bf597777 Merge "Set the layout of seekbar as the preference_iconless_slider and remove the higher speech rate preference variables. The layout is changed to preference_iconless_slider so that the speech rate slider layout is same as the layout of seekbars in android settings." into nyc-dev am: b17a56e07f
am: 7a5e279957

* commit '7a5e2799577d50978016572ccb03e55d2654be84':
  Set the layout of seekbar as the preference_iconless_slider and remove the higher speech rate preference variables. The layout is changed to preference_iconless_slider so that the speech rate slider layout is same as the layout of seekbars in android settings.
2016-02-29 10:44:59 +00:00
shwetachahar
7a5e279957 Merge "Set the layout of seekbar as the preference_iconless_slider and remove the higher speech rate preference variables. The layout is changed to preference_iconless_slider so that the speech rate slider layout is same as the layout of seekbars in android settings." into nyc-dev
am: b17a56e07f

* commit 'b17a56e07fcd127a900c7030499b3328dc87237d':
  Set the layout of seekbar as the preference_iconless_slider and remove the higher speech rate preference variables. The layout is changed to preference_iconless_slider so that the speech rate slider layout is same as the layout of seekbars in android settings.
2016-02-29 10:41:47 +00:00
Shweta Chahar
b17a56e07f Merge "Set the layout of seekbar as the preference_iconless_slider and remove the higher speech rate preference variables. The layout is changed to preference_iconless_slider so that the speech rate slider layout is same as the layout of seekbars in android settings." into nyc-dev 2016-02-29 10:39:29 +00:00
Baligh Uddin
dbf871701d Import translations. DO NOT MERGE am: 71dcb876e8 -s ours
am: 5b0380456b  -s ours

* commit '5b0380456b097baba1cdb1f68ae952672d2630d8':
  Import translations. DO NOT MERGE
2016-02-27 05:33:21 +00:00
Baligh Uddin
5b0380456b Import translations. DO NOT MERGE
am: 71dcb876e8  -s ours

* commit '71dcb876e8d0722f9410e95ab69df9fc5a151a55':
  Import translations. DO NOT MERGE
2016-02-27 05:32:34 +00:00
Andy Hung
47c080546b Merge changes from topic \'update mono audio\' into nyc-dev am: a77940d0f5
am: 9e59a51560

* commit '9e59a5156003c484780a3382b29077ba12baa97e':
  Add mono audio to AccessibilitySettings
  Remove mono audio from SoundSettings
2016-02-27 02:56:41 +00:00
Andy Hung
9e59a51560 Merge changes from topic \'update mono audio\' into nyc-dev
am: a77940d0f5

* commit 'a77940d0f5ca5bc16b352dbcc026684e738a2d2c':
  Add mono audio to AccessibilitySettings
  Remove mono audio from SoundSettings
2016-02-27 02:55:47 +00:00
Andy Hung
a77940d0f5 Merge changes from topic 'update mono audio' into nyc-dev
* changes:
  Add mono audio to AccessibilitySettings
  Remove mono audio from SoundSettings
2016-02-27 02:50:06 +00:00
Baligh Uddin
71dcb876e8 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 27293916
Change-Id: I5aa09746314d0401283206a7d59a802e752a85a6
2016-02-26 18:46:30 -08:00
Julia Reynolds
1d33d59be2 Api review: AutomaticZenRule
Bug: 27364144
Change-Id: Ic0ea5d4958711cf5216e87ad8054460ad4246856
2016-02-26 18:38:50 -05:00
Andy Hung
acef55d099 Add mono audio to AccessibilitySettings
Bug: 15283594
Change-Id: If5ca14a800e1932b17ef479589beb8a5d1489b5d
2016-02-26 14:35:09 -08:00
Andy Hung
f892e21696 Remove mono audio from SoundSettings
Mono audio will move to AccessibilitySettings only.
This reverts commit 0863ea40cd.

Bug: 15283594
Change-Id: I2cc744c96a9f6a6454b0bf533a44bb2eb56b745a
2016-02-26 14:17:29 -08:00
Yohei Yukawa
26a78d4cf0 Handle the case where no spell checker is selected. am: 1ea368b5d5
am: edbcfde9a4

* commit 'edbcfde9a4abdbb69508a3388c8b3840e2630dc3':
  Handle the case where no spell checker is selected.
2016-02-26 18:58:20 +00:00
Yohei Yukawa
edbcfde9a4 Handle the case where no spell checker is selected.
am: 1ea368b5d5

* commit '1ea368b5d5e353110eb131579b8eda00b4e35c59':
  Handle the case where no spell checker is selected.
2016-02-26 18:55:42 +00:00
Yohei Yukawa
1ea368b5d5 Handle the case where no spell checker is selected.
This follows up to a previous CL [1] that fixed Bug 26685795 that the
Settings app crashes when no spell checker is selected, but introduced
another Bug 26686710 that the user cannot re-select the spell checker
once the device has fallen into that state because the button to select
new spell checker is disabled.

This CL tries to deal with such a case more carefully and gracefully, by
adding more null checking and by showing a meaningful text
("Not selected" for English) to users when no spell checker is currently
selected.

  [1]: I65e6d269572e064aa6897807b6611ef947d90211
       093a646772

Bug: 26108333
Bug: 26685795
Bug: 26686710
Change-Id: I0ed71bbb580e3547d97e321799ac2b77b1f284a3
2016-02-26 18:12:43 +00:00
Julia Reynolds
7e795ee822 Merge "Introduce IMPORTANCE_MIN." into nyc-dev am: c2bcc727d9
am: 09da802710

* commit '09da8027103055203495ee7ca421bd8be0fea2f7':
  Introduce IMPORTANCE_MIN.
2016-02-26 16:23:18 +00:00
Julia Reynolds
09da802710 Merge "Introduce IMPORTANCE_MIN." into nyc-dev
am: c2bcc727d9

* commit 'c2bcc727d9a43dc5f43574c7558f28ca9b798533':
  Introduce IMPORTANCE_MIN.
2016-02-26 16:17:53 +00:00
Julia Reynolds
c2bcc727d9 Merge "Introduce IMPORTANCE_MIN." into nyc-dev 2016-02-26 16:14:33 +00:00
Jason Monk
e3a3abb204 Workarounds to avoid removing all prefs am: 2071eda150
am: 447ad113df

* commit '447ad113dfc1d16fbc832df19b583e5b652f9479':
  Workarounds to avoid removing all prefs
2016-02-26 16:08:23 +00:00
Jason Monk
447ad113df Workarounds to avoid removing all prefs
am: 2071eda150

* commit '2071eda150c4ade320fa91ec99678114afbd223e':
  Workarounds to avoid removing all prefs
2016-02-26 16:05:35 +00:00
Jason Monk
2071eda150 Workarounds to avoid removing all prefs
Removing all prefs causes ugly animations, so avoid it at all cost
and cache all the prefs (while still added) as long as possible.

Bug: 26271353
Change-Id: I33b84d751938b460f4b66c0158057407dd45d974
2016-02-26 11:00:01 -05:00