PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,364 Commits 1 Branch 0 Tags
29eeaf9530fa116f7ad890ed438c4e5de7486dff
Commit Graph

26364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
29eeaf9530 Merge "Notification slider changes." into nyc-dev 
am: 8b01df5

* commit '8b01df5d7869b392ad542b5c27fe8dd21b8759ba':
  Notification slider changes.

Change-Id: Ibb5c1fc046096c0c1b3c04367d95b557d2291997
 2016-04-15 15:32:17 +00:00
Julia Reynolds
8b01df5d78 Merge "Notification slider changes." into nyc-dev 2016-04-15 15:20:21 +00:00
Julia Reynolds
088fb52ef8 Notification slider changes. 
Bug: 27558254
Change-Id: I15635ae19e82a57d6e6fcb2f8f946f31bebf5d0f
 2016-04-15 11:04:13 -04:00
Benjamin Franz
e4a793f02d Merge "Only try disabling quiet mode" into nyc-dev 
am: 89726fd

* commit '89726fd95209689dea1f82912e85c837fbeb8553':
  Only try disabling quiet mode

Change-Id: I20ae72a682796290796e724f26e2f36280de9ed0
 2016-04-15 14:55:11 +00:00
Benjamin Franz
89726fd952 Merge "Only try disabling quiet mode" into nyc-dev 2016-04-15 14:53:16 +00:00
Noah Wang
3256144eba Merge "Change Preview Pager and Pager Indicator order for RTL environment Bug: 28025982" into nyc-dev 
am: 87ec078

* commit '87ec078dd5bb1801bb58189ccd2e11a771cb453a':
  Change Preview Pager and Pager Indicator order for RTL environment Bug: 28025982

Change-Id: I83445e037451d4ab121d040ef9b2e63e1ba9be3d
 2016-04-15 14:49:19 +00:00
Noah Wang
87ec078dd5 Merge "Change Preview Pager and Pager Indicator order for RTL environment Bug: 28025982" into nyc-dev 2016-04-15 14:47:58 +00:00
Ricky Wai
ab8a79616f Merge "Show "work mode off" dialog when work notification setting is clicked" into nyc-dev 
am: 697f3a6

* commit '697f3a6ce21319d4e8f666633b4888fa8dfb0a50':
  Show "work mode off" dialog when work notification setting is clicked

Change-Id: I3385090466d1a601e451bee0b166b784c12df2e8
 2016-04-15 14:42:46 +00:00
Ricky Wai
697f3a6ce2 Merge "Show "work mode off" dialog when work notification setting is clicked" into nyc-dev 2016-04-15 14:40:11 +00:00
Noah Wang
37c95e41e0 Change Preview Pager and Pager Indicator order for 
RTL environment
Bug: 28025982

Change-Id: Ia80220f9e4c4a22a10e7cd857dc4e3573ee7b51d
 2016-04-15 07:34:39 -07:00
Ricky Wai
af67c3b576 Show "work mode off" dialog when work notification setting is clicked 
Bug: 28158297
Change-Id: Iea4eaa32f3c4b2e605b6eace82ee4443e387fb4b
 2016-04-15 14:43:44 +01:00
Oleksandr Peletskyi
7cca80d68c Merge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev 
am: bd666a1

* commit 'bd666a17a28d94036f9312f992aacd37022bfea0':
  Fixed stopped countdown when PIN entered incorrect.

Change-Id: Id56d809f42aac3f5e49e4e56a07e57d41882d7dc
 2016-04-15 13:34:49 +00:00
Oleksandr Peletskyi
bd666a17a2 Merge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev 2016-04-15 13:29:35 +00:00
Sudheer Shanka
ded37b8050 Merge "Set user icon to default when updating profile without photo" into nyc-dev 
am: 2cae2f1

* commit '2cae2f1613136e42e2b79121055da8b526a92a24':
  Set user icon to default when updating profile without photo

Change-Id: If5ddd38898387b52570fbb07365dfd2934ad46a0
 2016-04-15 02:22:12 +00:00
Sudheer Shanka
2cae2f1613 Merge "Set user icon to default when updating profile without photo" into nyc-dev 2016-04-15 02:18:11 +00:00
Sudheer Shanka
71caf698b4 Set user icon to default when updating profile without photo 
If the user photo was deleted in the Myself contact, the change
was not reflected neither in Settings/Users nor in expanded
status bar. This was because the ProfileUpdateReceiver did not
handle the case where the updated image was null (deleted).
Fixed by assigning default user icon in UserManager if no photo
found in the profile update.

AOSP change: https://android-review.googlesource.com/#/c/153137

Bug: 28031914
Change-Id: I2f452f78dcf777414f50b133b1a9cee334bbd9a8
 2016-04-14 16:56:15 -07:00
Sudheer Shanka
371804159c Merge "Add additional summaries for some restricted switch preferences." into nyc-dev 
am: cdb089c

* commit 'cdb089c96d9b23d389619783ff68cb333daf6b27':
  Add additional summaries for some restricted switch preferences.

Change-Id: I8640613299b71a2a4c60ef49a363508541234bc5
 2016-04-14 21:19:26 +00:00
Sudheer Shanka
cdb089c96d Merge "Add additional summaries for some restricted switch preferences." into nyc-dev 2016-04-14 21:05:25 +00:00
Ricky Wai
efe504558b Merge "Force to unlock work challenge before reply inline notification" into nyc-dev 
am: 29d59dd

* commit '29d59dd21f3caa38e866ee304fed7d785477ad1e':
  Force to unlock work challenge before reply inline notification

Change-Id: I4ed8b69740db78b1b3a7ad489bfd5107c8e00aa3
 2016-04-14 18:09:41 +00:00
Ricky Wai
29d59dd21f Merge "Force to unlock work challenge before reply inline notification" into nyc-dev 2016-04-14 17:59:27 +00:00
Oleksandr Peletskyi
a6fb46621b Fixed stopped countdown when PIN entered incorrect. 
When device is locked CountDownTimer.onFinish() is not called
after countdown finished. Thus some logic was copied to onResume().

BUG:28160696
Change-Id: I1906e7ab2202b437b909afc12b7b3628692a00f1
 2016-04-14 19:35:04 +02:00
Robin Lee
65aa6563ad Merge "Allow disconnecting always-on VPNs" into nyc-dev 
am: 1932aa9

* commit '1932aa95d45ec05758ca376d89def368dcd3c921':
  Allow disconnecting always-on VPNs

Change-Id: I53d63ecf276210582baf568dd4fc9c5aa607f8b3
 2016-04-14 16:58:41 +00:00
Bernard Chau
edb4856ec1 Merge "Fixed typos "QuiteMode"" into nyc-dev 
am: 78f1e3d

* commit '78f1e3de5ea4872dfe0aca03510b06a6ab8a86db':
  Fixed typos "QuiteMode"

Change-Id: Ib44c4f665e17c011e4c7b90da99780aa058693dd
 2016-04-14 16:53:34 +00:00
Robin Lee
1932aa95d4 Merge "Allow disconnecting always-on VPNs" into nyc-dev 2016-04-14 16:50:42 +00:00
Bernard Chau
78f1e3de5e Merge "Fixed typos "QuiteMode"" into nyc-dev 2016-04-14 16:18:32 +00:00
Felipe Leme
242e4f5c31 Merge "Improvements on "App data usage" screen." into nyc-dev 
am: 2b131e5

* commit '2b131e58a71278488dd7e8f0bbf32dabe363ef04':
  Improvements on "App data usage" screen.

Change-Id: I6e12bd68820a8fadc4115061774de794a4ee7b9c
 2016-04-14 16:00:23 +00:00
Felipe Leme
2b131e58a7 Merge "Improvements on "App data usage" screen." into nyc-dev 2016-04-14 15:55:18 +00:00
Robin Lee
b3c4133a71 Allow disconnecting always-on VPNs 
Bug: 28072644
Change-Id: If7595f7e17747867158368d95db5addf97d3a14c
 2016-04-14 15:41:41 +01:00
Bernard Chau
88d523bc5c Fixed typos "QuiteMode" 
Bug: 28186496
Change-Id: I460509f7fda205711532c290f764d842f07aba49
 2016-04-14 15:12:14 +01:00
Jason Monk
2f781b7401 Merge "Don\'t debug log on ConditionManager" into nyc-dev 
am: 452e371

* commit '452e371aa1a83f61ba475689b18ca8c1bc996920':
  Don't debug log on ConditionManager

Change-Id: Ia6e1f1caf9736b7f901ad2641b249bb9317306c2
 2016-04-14 13:20:28 +00:00
Jason Monk
452e371aa1 Merge "Don't debug log on ConditionManager" into nyc-dev 2016-04-14 13:14:44 +00:00
Oleksandr Peletskyi
dfa04e2017 Merge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev 
am: 9abb6b0

* commit '9abb6b01f45bb6fbabf3235f989286783db1a7ae':
  Improved UX for DISALLOW_SET_USER_ICON restriction.

Change-Id: I7ea20af30bb84529cdc971ecdc9f41ac0a188751
 2016-04-14 10:53:21 +00:00
Oleksandr Peletskyi
9abb6b01f4 Merge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev 2016-04-14 10:46:08 +00:00
Abodunrinwa Toki
03137f7ceb Merge "Show Physical keyboards only after everything has been loaded" into nyc-dev 
am: bbf5df7

* commit 'bbf5df73f9e4318948272b0ca0aba5d55eaca13f':
  Show Physical keyboards only after everything has been loaded

Change-Id: Idcf8d0f5fd4043d42591005a553668864c65d080
 2016-04-14 10:07:51 +00:00
Abodunrinwa Toki
bbf5df73f9 Merge "Show Physical keyboards only after everything has been loaded" into nyc-dev 2016-04-14 10:04:17 +00:00
Noah Wang
36b15ba0be Merge "Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf" into nyc-dev 
am: 7444be6

* commit '7444be6f289f72b09551b4ee865ad6beb157e5e6':
  Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf

Change-Id: Ia5097feabb5da6713634a2466a15b0c809d6ea58
 2016-04-14 05:15:02 +00:00
Noah Wang
105c088d8f Merge "Instantiating background image of preview video in Magnification Gesture screen using ImageView, also set GlobalLayoutListener to adjust its position. Bug: 27992162 Bug: 27901691" into nyc-dev 
am: 6e15861

* commit '6e1586150e5e97b4f7f0bdd15b380c99b668770b':
  Instantiating background image of preview video in Magnification Gesture screen using ImageView, also set GlobalLayoutListener to adjust its position. Bug: 27992162 Bug: 27901691

Change-Id: I1713e7dc4ba7b17ecbd9bb472e3b3ac72056befb
 2016-04-14 05:15:02 +00:00
Noah Wang
7444be6f28 Merge "Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf" into nyc-dev 2016-04-14 05:10:49 +00:00
Noah Wang
6e1586150e Merge "Instantiating background image of preview video in Magnification Gesture screen using ImageView, also set GlobalLayoutListener to adjust its position. Bug: 27992162 Bug: 27901691" into nyc-dev 2016-04-14 05:10:34 +00:00
Sudheer Shanka
415bd9ece1 Add additional summaries for some restricted switch preferences. 
For some of the switch preferences, we need the new summary
"Enabled/Disabled" so that the user know about the switch state but
we can't replace some existing summaries because they provide
context.

Bug: 27659072
Change-Id: I65aca79184f543ef3fc85634594cad75f516d2fa
 2016-04-13 21:34:30 -07:00
Noah Wang
f3a20cc9bc Instantiating background image of preview video in 
Magnification Gesture screen using ImageView, also
set GlobalLayoutListener to adjust its position.
Bug: 27992162
Bug: 27901691

Change-Id: I9563eb2776bcde3d7edeb4a420a9b3c02481baf8
 2016-04-13 19:02:41 -07:00
Julia Reynolds
de8799cc03 Merge "Notification listeners have full DND access." into nyc-dev 
am: cc43dd9

* commit 'cc43dd935f654b133e84c3cd745d1e8cf52e3959':
  Notification listeners have full DND access.

Change-Id: I7d968d327cb7d17c130bb7d8945747b6d4d025a3
 2016-04-14 01:07:18 +00:00
Julia Reynolds
cc43dd935f Merge "Notification listeners have full DND access." into nyc-dev 2016-04-14 00:58:09 +00:00
Noah Wang
45393213da Remove the preview screens from Display/Font size settings 
when the activity height is smaller.
Also refactored for readability.
Bug: 27699996
Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf
 2016-04-13 16:55:11 -07:00
Felipe Leme
4e7742114b Merge "Data Saver Mode phrasing tweaks." into nyc-dev 
am: 6a41da8

* commit '6a41da8e9a6fb016cd93f991d65cf8334fb1d3a2':
  Data Saver Mode phrasing tweaks.

Change-Id: I2061eb0fee1a6c2a2f2bdfd3a823bbaa5f7a4bbc
 2016-04-13 23:48:15 +00:00
TreeHugger Robot
6a41da8e9a Merge "Data Saver Mode phrasing tweaks." into nyc-dev 2016-04-13 23:36:28 +00:00
Noah Wang
d7c1b42ae0 Merge "Maintain higher color contrast of labels/controlls on the side of the SeekBar in PreviewPagerPreferenceFragment Bug: 27952877" into nyc-dev 
am: 40c2e7a

* commit '40c2e7adcfd366c2de8691e04fb6663a79c0b872':
  Maintain higher color contrast of labels/controlls on the side of the SeekBar in PreviewPagerPreferenceFragment Bug: 27952877

Change-Id: I2b150492b01eb84c6956605be17823cabee397a0
 2016-04-13 23:27:42 +00:00
Noah Wang
40c2e7adcf Merge "Maintain higher color contrast of labels/controlls on the side of the SeekBar in PreviewPagerPreferenceFragment Bug: 27952877" into nyc-dev 2016-04-13 23:17:35 +00:00
Felipe Leme
4133fc1cb1 Improvements on "App data usage" screen. 
- Don't disply whitelist toggle if app is blacklisted.
- Handle scenario where app don't have any quota usage.

BUG: 27481520

Change-Id: I0147025d6bba2d6deeda109aeebb296607550bd8
 2016-04-13 15:35:27 -07:00
Noah Wang
c528984785 Maintain higher color contrast of labels/controlls 
on the side of the SeekBar in PreviewPagerPreferenceFragment
Bug: 27952877

Change-Id: I6fb173cfe5dce17c5cdf20dd90d601de19e44906
 2016-04-13 14:07:24 -07:00