Suprabh Shukla
90b71c644d
Merge "Fix user photo popup layout for RTL" into nyc-dev
2016-04-07 00:56:04 +00:00
Amith Yamasani
3c51422067
Merge "Fix user photo popup layout for RTL" am: 6186414
...
am: d0d0af8
2016-04-07 00:53:05 +00:00
Amith Yamasani
6186414be8
Merge "Fix user photo popup layout for RTL"
2016-04-07 00:44:06 +00:00
Ryoji Miyazaki
9238e50a80
Fix user photo popup layout for RTL
...
When RTL language is set, the edit-photo popup window
on user profile info is not shown fully.
The popup window should be aligned with the anchor.
Cherrypick of https://android-review.googlesource.com/#/c/207762/
Bug: 27955356
Change-Id: Ia928c99fbfff3596b048cc3949aef6d03594fed7
2016-04-06 17:24:16 -07:00
Andres Morales
11dcefc9a8
Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev
...
am: 2006403
2016-04-07 00:09:13 +00:00
Andres Morales
20064037a7
Merge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev
2016-04-07 00:00:38 +00:00
Andres Morales
ce4bdca151
handle devices that don't support FLASH_LOCK_STATE
...
only disable OEM unlocking pref for devices that report
FLASH_LOCK_UNLOCKED.
Bug: 27967926
Change-Id: Ia41b0dc9249e11df2fb35263ebde05f3a2e0d29a
2016-04-06 15:04:48 -07:00
Fan Zhang
4b2519d3c1
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev
...
am: df634d0
2016-04-06 19:26:11 +00:00
Fan Zhang
df634d03c5
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev
2016-04-06 19:07:10 +00:00
Anna Galusza
8e13f725dc
Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev
...
am: a3d8c31
2016-04-06 17:48:16 +00:00
Anna Galusza
a3d8c316d4
Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev
2016-04-06 17:47:09 +00:00
Fan Zhang
905002a01d
Fix animation when expand conditional notices in Settings.
...
Bug: 28017593
Change-Id: I8275cb2050f79d26e58c02ffd91cb1a3e32a5ff2
2016-04-06 10:07:03 -07:00
Clara Bayarri
ea8772a9c3
Add Keyboard Shortcuts Helper entry in Settings
...
Bug: 27811273
Change-Id: Ic4a97c869d6476bf427e41023dc595b39589e6ce
2016-04-06 14:55:49 +01:00
Jason Monk
51970c8558
Merge "Add dev options to set swXdp" into nyc-dev
...
am: b22dd20
2016-04-06 13:29:09 +00:00
Jason Monk
b22dd2071f
Merge "Add dev options to set swXdp" into nyc-dev
2016-04-06 13:20:07 +00:00
Victor Chang
2bd4e1689f
Merge "Add button to trust a CA cert" into nyc-dev
...
am: b49c901
2016-04-06 11:04:59 +00:00
Victor Chang
b49c901f8e
Merge "Add button to trust a CA cert" into nyc-dev
2016-04-06 10:59:20 +00:00
Nicolas Prevot
a599c8fd04
Ask the user to unlock the work profile before adding a work account.
...
If the work profile is locked, and the user tries to add a
work account from Settings:
Show the work profile security challenge.
BUG:28005200
Change-Id: I87ff25d9de94026b0d7ac307ea3a541e77989aa6
2016-04-06 11:19:08 +01:00
Oleksandr Peletskyi
a2810b8eaa
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev
...
am: 4ffa5c8
2016-04-06 09:36:14 +00:00
Oleksandr Peletskyi
4ffa5c8af5
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev
2016-04-06 09:31:22 +00:00
Joseph Pirozzo
4c74ed3318
Merge "PBAP Pairing Permission" into nyc-dev
...
am: e5b8ec0
2016-04-05 23:44:12 +00:00
Sanket Agarwal
e5b8ec020c
Merge "PBAP Pairing Permission" into nyc-dev
2016-04-05 23:39:55 +00:00
Fyodor Kupolov
e1d9fd8346
Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev
...
am: 84948db
2016-04-05 23:34:05 +00:00
Fyodor Kupolov
84948db8d0
Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev
2016-04-05 22:20:16 +00:00
Suprabh Shukla
b84720c075
Moving HelpUtils to SettingsLib
...
Moved HelpUtils to SettingsLib in frameworks/base so it can be shared by
packageinstaller as well.
Bug: b/22096093
Change-Id: I8d620abcde8279a3b4d11bbcff8ae9b6f46a1895
2016-04-05 14:37:33 -07:00
Victor Chang
a390d63682
Add button to trust a CA cert
...
- Put Disable button for system cert and Remove button for user cert as action button in cert dialog
- OK (dismiss) button is displayed when trust button is not shown
- Showing chain of cert dialot will be in a later CL
Bug: 18224038
Change-Id: Ieef70e12fd8bdf711be48dc0488f03dbe143d3c5
2016-04-05 22:22:41 +01:00
Jason Monk
449f97204a
Add dev options to set swXdp
...
Change-Id: Ibe88e2b1a2e818838baf452b6da204fc9e004a42
Fixes: 27734698
2016-04-05 16:47:44 -04:00
Fyodor Kupolov
7a5e897db0
Do not store bitmap into Bundle in onSaveInstanceState
...
It may cause TransactionTooLargeException because of the parcel size limit
Bug: 27990767
Change-Id: Ie1a702810a5c26e25fc485ebae09dc65e2b48e41
2016-04-05 10:46:20 -07:00
Anna Galusza
51ccf7c7a9
Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706" into nyc-dev
...
am: da0e4d3
2016-04-05 16:55:00 +00:00
Anna Galusza
da0e4d3280
Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706" into nyc-dev
2016-04-05 16:46:29 +00:00
Rubin Xu
04bc35ca6b
Merge "Listen on new broadcasts for profile changes." into nyc-dev
...
am: 29e73f2
2016-04-05 15:04:55 +00:00
Rubin Xu
29e73f2d4c
Merge "Listen on new broadcasts for profile changes." into nyc-dev
2016-04-05 14:52:00 +00:00
Udam Saini
a837edb3c6
Merge "Adds a multi line preference class." into nyc-dev
...
am: 9a8f009
2016-04-04 20:13:44 +00:00
Udam Saini
9a8f009880
Merge "Adds a multi line preference class." into nyc-dev
2016-04-04 20:06:30 +00:00
Julia Reynolds
41317c639c
Merge "Show fewer filters on notifications page." into nyc-dev
...
am: a003fa5
2016-04-04 19:48:39 +00:00
Julia Reynolds
6a165a1b9d
Merge "Fix ringtone persistance after device rotation." into nyc-dev
...
am: cd37e59
2016-04-04 19:48:39 +00:00
Julia Reynolds
a003fa583c
Merge "Show fewer filters on notifications page." into nyc-dev
2016-04-04 19:39:26 +00:00
Julia Reynolds
cd37e59b9a
Merge "Fix ringtone persistance after device rotation." into nyc-dev
2016-04-04 19:39:13 +00:00
Jason Monk
ed84c11657
Merge "Add moar dividers" into nyc-dev
...
am: da6ae85
2016-04-04 19:36:44 +00:00
Jason Monk
da6ae856a9
Merge "Add moar dividers" into nyc-dev
2016-04-04 19:29:55 +00:00
Julia Reynolds
1e91f9f30e
Show fewer filters on notifications page.
...
Bug: 27834480
Change-Id: Ibdc9924a7ea1b1db7be089507485de5c4fd41b58
2016-04-04 15:20:11 -04:00
Julia Reynolds
c736efcb61
Fix ringtone persistance after device rotation.
...
Bug: 26122624
Change-Id: I187fe673dea250e93c6e9603239f01845ed378a3
2016-04-04 15:20:11 -04:00
Maurice Lam
4317f907c4
Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev
...
am: f9db17e
2016-04-04 18:04:12 +00:00
Maurice Lam
f9db17e3cc
Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev
2016-04-04 17:57:52 +00:00
Yohei Yukawa
4ddc39e17f
Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev
...
am: 19998fe
2016-04-04 17:43:22 +00:00
Yohei Yukawa
19998fef79
Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev
2016-04-04 17:28:23 +00:00
Jason Monk
3676b931d9
Add moar dividers
...
Bug: 27834471
Change-Id: I575040edcdf76124f21a667e64762acb86a65cb2
2016-04-04 13:20:59 -04:00
Rubin Xu
819f78e91b
Listen on new broadcasts for profile changes.
...
The change is due to API review comments on the platform side.
Bug: 27532254
Change-Id: Iacb87f97148ceead6bf1f1cc7a0671711698b061
2016-04-04 17:24:30 +01:00
Julia Reynolds
7effca50d4
Merge "Hide repeat callers instead of disabling." into nyc-dev
...
am: 03a3a1e
2016-04-04 13:56:54 +00:00
Daniel U
6e556092f5
Allow user to hide sensitive notifications with no work challenge
...
When a user upgrades to N, her work profile is automatically
unified even though no work challenge setting is shown to the user
if the user has not upgraded her DPC. Allow the user to hide
sensitive notifications based on whethere there's a profile, but not
on whether there is a work challenge.
Bug:27673591
Change-Id: Iec41dda2d9e479597b3e593e7f9b7f1c0fcd2a49
2016-04-04 14:55:56 +01:00
