Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,667 Commits 1 Branch 0 Tags
7140b17bdb537c74feff40f794baefcfa7ae6f6f
Commit Graph

11379 Commits

Author SHA1 Message Date
Alan Viverette
7140b17bdb Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev am: 6a0b722 
am: 50528a4

* commit '50528a4e0011310293343b05781ee4dca0006e09':
  Fix EBT helper initialization in LabeledSeekBar class

Change-Id: Iea75763062ef6b439457bfe9de9f507e738babd4
 2016-04-11 18:52:26 +00:00
Alan Viverette
50528a4e00 Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev 
am: 6a0b722

* commit '6a0b7229847c6b2afb2a83aa397d23ec36a1df5b':
  Fix EBT helper initialization in LabeledSeekBar class

Change-Id: I8e400e00a4a064dc33f575223a29b01165c1b54a
 2016-04-11 18:48:44 +00:00
Alan Viverette
6a0b722984 Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev 2016-04-11 18:32:22 +00:00
Fyodor Kupolov
dcb30e1dcd Merge "Added getProfileIds method returning array of userIds" into nyc-dev am: 1ef3164 
am: 1b8b3fa

* commit '1b8b3fab3ddc71bc1567f8e260d7f0082924e5e5':
  Added getProfileIds method returning array of userIds

Change-Id: I5bf3d7d6d19c73518b63f612a7d1b66880db0535
 2016-04-11 17:03:16 +00:00
Fyodor Kupolov
1b8b3fab3d Merge "Added getProfileIds method returning array of userIds" into nyc-dev 
am: 1ef3164

* commit '1ef3164424cf6ac7ab604e9cdf0e1a2c67a7ea89':
  Added getProfileIds method returning array of userIds

Change-Id: I2f64e0079fc57d4e51fd222b9e8835d202e84448
 2016-04-11 16:50:37 +00:00
Fyodor Kupolov
1ef3164424 Merge "Added getProfileIds method returning array of userIds" into nyc-dev 2016-04-11 16:40:54 +00:00
Jason Monk
a26bb71068 Merge "Pull pref summaries from power usage summary" into nyc-dev am: 3cd935c 
am: 4a0c449

* commit '4a0c449ade858a12f18fb03d14115852067a4403':
  Pull pref summaries from power usage summary

Change-Id: I80f9ee746cabf2c3ad9dcfd441fa37d6590963ea
 2016-04-11 14:32:32 +00:00
Jason Monk
b7c24099e4 Merge "Guard against crash in SummaryProvider" into nyc-dev am: 3095c77 
am: 4fbb0e3

* commit '4fbb0e35e8a44b23b4f9a95ccdfb5e094c663f5c':
  Guard against crash in SummaryProvider

Change-Id: I8223bac4b7d8cf17f4cd4a47c479c2c2b95160e7
 2016-04-11 14:31:39 +00:00
Jason Monk
4a0c449ade Merge "Pull pref summaries from power usage summary" into nyc-dev 
am: 3cd935c

* commit '3cd935c89c46cdbbe5556823393045081ef6d844':
  Pull pref summaries from power usage summary

Change-Id: Ic512bfb11423a01db290fe941ef8365a53b67d4e
 2016-04-11 14:31:38 +00:00
Jason Monk
ce15b1c7ed Merge "Remove OpenGL traces from dev settings" into nyc-dev am: eeb2a19 
am: f5f750d

* commit 'f5f750d840933e4244711345cb78b67bcf9c5e61':
  Remove OpenGL traces from dev settings

Change-Id: I9971817d3f2052c0c06f4997a4b5a817e70dd864
 2016-04-11 14:31:38 +00:00
Jason Monk
3cd935c89c Merge "Pull pref summaries from power usage summary" into nyc-dev 2016-04-11 14:28:23 +00:00
Jason Monk
4fbb0e35e8 Merge "Guard against crash in SummaryProvider" into nyc-dev 
am: 3095c77

* commit '3095c77d5b28839ff6e757d6c08afd1bd2cd7afa':
  Guard against crash in SummaryProvider

Change-Id: I759042100f3b4f21b9056d83b817634f066fae93
 2016-04-11 14:26:50 +00:00
Jason Monk
f5f750d840 Merge "Remove OpenGL traces from dev settings" into nyc-dev 
am: eeb2a19

* commit 'eeb2a19a50c0fa1792ed163b555d0bddf217080f':
  Remove OpenGL traces from dev settings

Change-Id: Ia36a2187188f103da55e1066754ef764cc90c341
 2016-04-11 14:26:50 +00:00
Jason Monk
e04517611f Pull pref summaries from power usage summary 
Change-Id: I9bd3d1041576e183e7e5e03aaecc5128ea5227c2
Fixes: 27644604
 2016-04-11 10:25:04 -04:00
Jason Monk
3095c77d5b Merge "Guard against crash in SummaryProvider" into nyc-dev 2016-04-11 14:23:37 +00:00
Jason Monk
0127eb07f4 Guard against crash in SummaryProvider 
Change-Id: Ieeae65e50211618dbbee3d320cae614ac5926543
Fixes: 26310547
 2016-04-11 10:21:28 -04:00
Jason Monk
4b32de0d35 Fix localization issues with disabled am: 9e9ba0d 
am: 22b5064

* commit '22b5064424547daf4cdda5d106aa559539e89c23':
  Fix localization issues with disabled

Change-Id: I958dffd6f1c8370d5408b811a804411095a9eb74
 2016-04-11 14:20:17 +00:00
Jason Monk
eeb2a19a50 Merge "Remove OpenGL traces from dev settings" into nyc-dev 2016-04-11 14:19:55 +00:00
Jason Monk
4572249f5d Remove OpenGL traces from dev settings 
Change-Id: I43a23e5e7bf02b798f3ddffdf4c21077ef3d5e2f
Fixes: 26741446
 2016-04-11 10:17:53 -04:00
Jason Monk
22b5064424 Fix localization issues with disabled 
am: 9e9ba0d

* commit '9e9ba0d75142c7af9d8f7eabb7dfd34ff59e2064':
  Fix localization issues with disabled

Change-Id: If37b22b8dd44ad42265227b20c449acc97b06bb4
 2016-04-11 14:14:53 +00:00
Jason Monk
9e9ba0d751 Fix localization issues with disabled 
Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378
 2016-04-11 09:58:55 -04:00
Jason Monk
19fad2550e Merge "Settings tweaks" 2016-04-11 13:24:38 +00:00
Jason Monk
c19eb986f3 Settings tweaks 
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
 2016-04-11 09:21:24 -04:00
Clara Bayarri
99ea9716d5 Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev am: 6599660 
am: 232302e

* commit '232302ef30ea47d19b635ea9839ed83eccb864b1':
  Add Keyboard Shortcuts Helper entry in Settings

Change-Id: Iff3367c55d8d92b25328224599cad9e445a6ab48
 2016-04-11 10:05:55 +00:00
Clara Bayarri
232302ef30 Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev 
am: 6599660

* commit '659966019601b64fecd24a80d549b8d870059435':
  Add Keyboard Shortcuts Helper entry in Settings

Change-Id: I99dd51ef8dfdb80a59e003f332988b298e20152c
 2016-04-11 09:55:54 +00:00
Clara Bayarri
6599660196 Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev 2016-04-11 09:44:20 +00:00
Suprabh Shukla
2775de111b Fixed obsolete import 
Change-Id: Ibee0284c61f3e559efeb9a28788b55e86a8355c6
 2016-04-10 02:15:07 +00:00
Alan Viverette
3550a32ca9 Fix EBT helper initialization in LabeledSeekBar class 
Helper should have same lifecycle as the class itself. Also rearranges
class to match up with standard Android class organization.

Bug: 27674946
Change-Id: Ib2ab1e367d4ef1757321375bbb7e4c5f0dc8f46c
 2016-04-08 18:37:21 -07:00
Suprabh Shukla
a6820166fa resolve merge conflicts of d83867c to master 
Change-Id: I999d87f33ef028055ea42197b518dbe57e8312cf
 2016-04-08 18:34:54 -07:00
Jason Monk
14b6f12aea Merge "Settings tweaks" into nyc-dev 
am: db3fcfb

* commit 'db3fcfb7cb652c0afdd093e2ec9f387dc01b7819':
  Settings tweaks

Change-Id: Ibc9882219ad819cd516bf3c1ce7ce556b36ad9e6
 2016-04-09 00:32:15 +00:00
Suprabh Shukla
d83867c551 Merge "Moving HelpUtils to SettingsLib" into nyc-dev 
am: 1d464b9

* commit '1d464b9677c4f956dab81622b2cb59c53cbf01dd':
  Moving HelpUtils to SettingsLib

Change-Id: I2b855b36d0f3af29f5bc35008017aa7539cd0677
 2016-04-09 00:32:15 +00:00
Jason Monk
db3fcfb7cb Merge "Settings tweaks" into nyc-dev 2016-04-08 20:46:49 +00:00
Jason Monk
be8d5aa2b9 Settings tweaks 
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
 2016-04-08 16:44:31 -04:00
Suprabh Shukla
1d464b9677 Merge "Moving HelpUtils to SettingsLib" into nyc-dev 2016-04-08 19:31:37 +00:00
Jason Monk
e74ae23269 resolve merge conflicts of 65b5952 to master 
Change-Id: I0adc036416f21dfa7dd671d4920bce5c26fe7cb6
 2016-04-08 13:34:47 -04:00
Jason Monk
65b5952e4c Merge "Restore the premiume SMS Preference." into nyc-dev 
am: b8bce66

* commit 'b8bce66c02bef58d9df3bdfe0fc4a29da9491296':
  Restore the premiume SMS Preference.

Change-Id: Id83745add76b1afba24bf487dab12a66ebe4f0c3
 2016-04-08 17:11:43 +00:00
Jason Monk
b8bce66c02 Merge "Restore the premiume SMS Preference." into nyc-dev 2016-04-08 17:04:43 +00:00
Jason Monk
ea35f87377 Restore the premiume SMS Preference. 
Fixes: 27657256
Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e
 2016-04-08 13:02:48 -04:00
Daniel U
1933b8eef8 Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev am: 9f4ad67 
am: 957ec6a

* commit '957ec6aee4ad8dfbde5cedb9791effdce1ca9825':
  Allow user to hide sensitive notifications with no work challenge

Change-Id: I999f240c0112abb9b366017e7def431a2c3dae79
 2016-04-08 15:55:32 +00:00
Abodunrinwa Toki
ada3b3a0d4 Merge "Input settings: Show keyboard layout collection." into nyc-dev am: f103d10 
am: 186d97b

* commit '186d97bbab34d51a88321da2556eda551ea0ddd3':
  Input settings: Show keyboard layout collection.

Change-Id: Ia7e6d50590ac19f9f8e9de333bc36c73d6790c09
 2016-04-08 15:55:32 +00:00
Daniel U
957ec6aee4 Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev 
am: 9f4ad67

* commit '9f4ad67fad34331aecbdabd4a0193038fa0e9f79':
  Allow user to hide sensitive notifications with no work challenge

Change-Id: I80943b49439532bdb676825ac9a8ee5bc7088b11
 2016-04-08 15:51:13 +00:00
Abodunrinwa Toki
186d97bbab Merge "Input settings: Show keyboard layout collection." into nyc-dev 
am: f103d10

* commit 'f103d10861e6a702f8f29d42e48214c94b1ddb91':
  Input settings: Show keyboard layout collection.

Change-Id: I813b902c6638befc9dcd7ebd166e8fe9c33731a5
 2016-04-08 15:51:12 +00:00
Daniel U
9f4ad67fad Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev 2016-04-08 15:44:44 +00:00
Abodunrinwa Toki
f103d10861 Merge "Input settings: Show keyboard layout collection." into nyc-dev 2016-04-08 15:43:13 +00:00
Abodunrinwa Toki
f6053d1536 Input settings: Show keyboard layout collection. 
E.g. Android keyboard or Nexus Compat keyboard.

Bug: 27250977
Change-Id: Icd256a760b157418f52046f10ca272561b692838
 2016-04-08 14:08:56 +01:00
Robin Lee
7da1bc30b9 Merge "Credential storage: check lock quality for right user" into nyc-dev am: 16b4ac8 
am: c6696f1

* commit 'c6696f1c8675692bb0977a35ab65920f9eef67f1':
  Credential storage: check lock quality for right user

Change-Id: Iea17251ba3d27f2d4a2978d4466e5f80c0effdbe
 2016-04-08 11:02:40 +00:00
Robin Lee
c6696f1c86 Merge "Credential storage: check lock quality for right user" into nyc-dev 
am: 16b4ac8

* commit '16b4ac8a8efb7ea06397ff559984c3c08f275398':
  Credential storage: check lock quality for right user

Change-Id: Iea518cce08617d5ccfa6d5e43d5a65e377631528
 2016-04-08 10:58:34 +00:00
Oleksandr Peletskyi
046501fb85 Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev am: 76a2981 
am: 717ed0e

* commit '717ed0eed7bf60ed5163b8139bfdf7fc4f8a3072':
  Improved UX when DISALLOW_SET_WALLPAPER is set.

Change-Id: I8d712b436c36041f28e3a1d0871b2a3d83a265f3
 2016-04-08 10:54:27 +00:00
Robin Lee
16b4ac8a8e Merge "Credential storage: check lock quality for right user" into nyc-dev 2016-04-08 10:53:23 +00:00
Oleksandr Peletskyi
717ed0eed7 Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev 
am: 76a2981

* commit '76a29810c30978b958f953c3248fbd4ef19b5f79':
  Improved UX when DISALLOW_SET_WALLPAPER is set.

Change-Id: I354816c172deb4624326128079b50d6de4bf9031
 2016-04-08 10:50:23 +00:00