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

11732 Commits

Author SHA1 Message Date
Jim Miller
471da56938 Merge "Revert "Fix some dark theme issues"" into mnc-dev 2015-06-04 02:52:12 +00:00
Jim Miller
6433bd8f6a Revert "Fix some dark theme issues" 
This breaks the pattern entry screens of SecuritySettings.  Reverting until we can take a closer look.


This reverts commit cb8ccbb3b5.

Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227
 2015-06-04 02:45:40 +00:00
Stuart Scott
9a8933ab5f am 9eb4d103: am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev 
* commit '9eb4d103450b3a6d2682f0ff8d5f8806518ae058':
  Re-add a string which was accidently removed.
 2015-06-04 01:28:13 +00:00
Stuart Scott
9eb4d10345 am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev 
* commit '01a6351f7afd4af10538a0b1cf4ed48cd2d7396a':
  Re-add a string which was accidently removed.
 2015-06-04 01:14:18 +00:00
Stuart Scott
fcf64237b7 Merge "Re-add a string which was accidently removed." into mnc-dev 2015-06-04 00:51:17 +00:00
Stuart Scott
1da842af41 Re-add a string which was accidently removed. 
bug:20051165
Change-Id: I43214f30650565499ffbdddb3819e96ac957ebf1
 2015-06-03 17:01:42 -07:00
Nicolas Prevot
decc1a79d1 am e7efc4b2: am 91ec04bd: am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev 
* commit 'e7efc4b2a726cc2779211bc43c5fade83f08bf0c':
  In Settings, don't allow to disable an app which is profile/device owner.
 2015-06-03 22:51:18 +00:00
Nicolas Prevot
e7efc4b2a7 am 91ec04bd: am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev 
* commit '91ec04bdce32f24056613f15041c905bf119c533':
  In Settings, don't allow to disable an app which is profile/device owner.
 2015-06-03 22:38:24 +00:00
Sanket Padawe
6eb55f64ad am 2613215a: am ab0ea0a2: am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling. 
* commit '2613215a6fdc683302fd6177ac10bd00736861c9':
  Fix Wifi Settings crash on continuous wifi toggling.
 2015-06-03 22:36:06 +00:00
Sanket Padawe
50376382df am 8b81d576: am 04e1d51a: am fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev 
* commit '8b81d576a7a63116bbcb51b3885df98ab4fe19c4':
  Fix Wifi Signal strength icon issues in WifiSettings.
 2015-06-03 22:23:27 +00:00
Sanket Padawe
2613215a6f am ab0ea0a2: am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling. 
* commit 'ab0ea0a24f062485113de60c76a97a239ece6065':
  Fix Wifi Settings crash on continuous wifi toggling.
 2015-06-03 22:18:53 +00:00
Nicolas Prevot
41dbc14eda Merge "In Settings, don't allow to disable an app which is profile/device owner." into mnc-dev 2015-06-03 22:17:11 +00:00
Nicolas Prevot
d0dfdda2f6 In Settings, don't allow to disable an app which is profile/device owner. 
In the App Info section of Settings:
If the app is device owner or profile owner of at least one user, disable the
disable button.

BUG: 20831525

Change-Id: Iff00314108caf8c0b209f66060e6655ef06f2aa0
 2015-06-03 14:41:39 -07:00
Sanket Padawe
3d32af2642 Fix Wifi Settings crash on continuous wifi toggling. 
Bug: 21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60
 2015-06-03 14:16:13 -07:00
Jason Monk
28ca64b3d1 Protect against monkey crash 
Bug: 19541028
Change-Id: Ia8e477b3c2843b2e841c429ce090ff388958bfcb
 2015-06-03 15:43:46 -04:00
Sanket Padawe
8b81d576a7 am 04e1d51a: am fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev 
* commit '04e1d51a6467ae41df6604423500e864e0ec7721':
  Fix Wifi Signal strength icon issues in WifiSettings.
 2015-06-03 19:24:11 +00:00
Jason Monk
53f7cddd94 am 48424d9d: am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev 
* commit '48424d9def5175cc03ca722bcd73bf7cf3267f9d':
  Fix some dark theme issues
 2015-06-03 19:23:47 +00:00
Nicolas Prevot
37622f29d8 am 058a428d: am ff9098dd: am bc9a3630: Merge "Don\'t allow secondary users apps to start restricted Settings fragment." into mnc-dev 
* commit '058a428dbc7b2e16d13a66f8eae47675e517ed50':
  Don't allow secondary users apps to start restricted Settings fragment.
 2015-06-03 19:23:45 +00:00
Jason Monk
ea0aa049ad am 174ed18d: am 748c9381: am e6d7623c: Merge "Reorder device category" into mnc-dev 
* commit '174ed18d90a827814c931e08772bbf408ec4033f':
  Reorder device category
 2015-06-03 19:23:44 +00:00
Barnaby James
3571671d99 am 6a441e2a: am fc32d510: am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev 
* commit '6a441e2aba09d350df4834e21d72c43afaea8634':
  Fix TTS for Zen mode voice activity.
 2015-06-03 19:23:43 +00:00
Xiyuan Xia
8b89e373fd am b2508e10: am 3bab71f8: am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev 
* commit 'b2508e10d1d8676d78a466b0c337a71a3d03dbb8':
  Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
 2015-06-03 19:23:42 +00:00
Sanket Padawe
fb619a8726 Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev 2015-06-03 18:57:47 +00:00
Sanket Padawe
8cde7135b5 Fix Wifi Signal strength icon issues in WifiSettings. 
Bug: 21591392
Bug: 21592509
Change-Id: I6612ef62c17e6279b06f80a67bee345e913f1927
 2015-06-03 11:54:41 -07:00
Jason Monk
48424d9def am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev 
* commit '84cd3bfb43174215abb8648e14e0481380b27828':
  Fix some dark theme issues
 2015-06-03 18:48:01 +00:00
Nicolas Prevot
058a428dbc am ff9098dd: am bc9a3630: Merge "Don\'t allow secondary users apps to start restricted Settings fragment." into mnc-dev 
* commit 'ff9098ddc6905ccd9e102b762df283887456da16':
  Don't allow secondary users apps to start restricted Settings fragment.
 2015-06-03 18:48:00 +00:00
Jason Monk
174ed18d90 am 748c9381: am e6d7623c: Merge "Reorder device category" into mnc-dev 
* commit '748c938135c73ef6fa3c5d5777d4dd4cf8a8b0e3':
  Reorder device category
 2015-06-03 18:47:59 +00:00
Barnaby James
6a441e2aba am fc32d510: am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev 
* commit 'fc32d5101dfdf38dbe7c1da4382cedc1015208a5':
  Fix TTS for Zen mode voice activity.
 2015-06-03 18:46:07 +00:00
Xiyuan Xia
b2508e10d1 am 3bab71f8: am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev 
* commit '3bab71f843e713f1325ae043668442ee9387258f':
  Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
 2015-06-03 18:46:05 +00:00
Jason Monk
a3a245219a am b84c5d3f: am 21c43016: Merge "Dont crash if there is no spellchecker" 
* commit 'b84c5d3fce61bf302f4cca26fab163638572beaf':
  Dont crash if there is no spellchecker
 2015-06-03 17:37:15 +00:00
Jason Monk
0732a64602 Merge "Fix some dark theme issues" into mnc-dev 2015-06-03 17:30:54 +00:00
Jason Monk
cb8ccbb3b5 Fix some dark theme issues 
Bug: 21117509
Bug: 21077345
Bug: 21480587
Change-Id: I61bcd6631288b0e51204ac8bf134c44b2800e0fe
 2015-06-03 13:29:16 -04:00
Nicolas Prevot
bc9a3630bc Merge "Don't allow secondary users apps to start restricted Settings fragment." into mnc-dev 2015-06-03 17:28:34 +00:00
Jason Monk
e6d7623ca7 Merge "Reorder device category" into mnc-dev 2015-06-03 17:22:00 +00:00
Jason Monk
f48c89ff7c Reorder device category 
Bug: 21588753
Change-Id: Ie01ad44b3bc9d2d3cac165e25b72a112896d4d2c
 2015-06-03 13:18:07 -04:00
Barnaby James
ef0b43625c Merge "Fix TTS for Zen mode voice activity." into mnc-dev 2015-06-03 17:09:56 +00:00
Xiyuan Xia
d9e92ea551 Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev 2015-06-03 16:07:42 +00:00
Jason Monk
b84c5d3fce am 21c43016: Merge "Dont crash if there is no spellchecker" 
* commit '21c430160fe6d9a6e53600ac350e3661802b85aa':
  Dont crash if there is no spellchecker
 2015-06-03 13:56:51 +00:00
Jason Monk
21c430160f Merge "Dont crash if there is no spellchecker" 2015-06-03 13:28:58 +00:00
Sanket Padawe
d8ecd66821 am 3364ddaa: am 9b190d18: am fb32790a: Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev 
* commit '3364ddaa8d031b3a0bc41272a12df51bb5271e26':
  Fix Bluetooth device Settings checkbox issue on clicking "Input device"
 2015-06-03 02:34:38 +00:00
Jason Monk
bc45beded1 am 7d9c8b27: am 62bb4227: am 6a051168: Merge "Hide search from everywhere but the dashboard" into mnc-dev 
* commit '7d9c8b27ef172f8ea242cb9d94d1bfebc1c282e2':
  Hide search from everywhere but the dashboard
 2015-06-03 02:34:36 +00:00
Sanket Padawe
3364ddaa8d am 9b190d18: am fb32790a: Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev 
* commit '9b190d1879174c937a26e8bfff3187902543872c':
  Fix Bluetooth device Settings checkbox issue on clicking "Input device"
 2015-06-03 02:21:30 +00:00
Jason Monk
7d9c8b27ef am 62bb4227: am 6a051168: Merge "Hide search from everywhere but the dashboard" into mnc-dev 
* commit '62bb4227da8962642fb9f34161a016c80ab74c0b':
  Hide search from everywhere but the dashboard
 2015-06-03 02:21:00 +00:00
Nicolas Prevot
a5df4779a0 Don't allow secondary users apps to start restricted Settings fragment. 
On a secondary user, the fragments ApnSettings, TetherSettings and VpnSettings
should not be started.

But an app can still send an intent to start these fragments.
Prevent this by checkin the userId in these fragments.

BUG:15313261
BUG:15312781
BUG:15312494

Change-Id: I2a36bb89a8e37e4440aa28372d7a1800b33dae37
 2015-06-02 16:49:20 -07:00
Sanket Padawe
fb32790adc Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev 2015-06-02 23:04:24 +00:00
Sanket Padawe
0da0573b70 Fix Bluetooth device Settings checkbox issue on clicking "Input device" 
Bug: 19937357
Change-Id: I6f74577a062df407e50972b84dd4e5d7d2da529b
 2015-06-02 16:00:43 -07:00
Jason Monk
6a05116804 Merge "Hide search from everywhere but the dashboard" into mnc-dev 2015-06-02 22:39:08 +00:00
Xiyuan Xia
4458fd6e57 Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText 
- Revert previous "Add announceForAccessibility to ConfirmLockPattern";
- Add android:accessibilityLiveRegion="polite" for errorText in
  ConfirmLockPassword/Pattern;

Bug:20282779
Change-Id: I4b9c0d461d0dd0504bd88a8a2144e09a42d5f64e
 2015-06-02 15:27:59 -07:00
Adrian Roos
df5de5b991 am 62b92ab5: am 63a885d3: am 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev 
* commit '62b92ab53dd9f7f31d3df5703357477a579e4ef8':
  Only show emergency app preference if enabled
 2015-06-02 21:25:43 +00:00
Jason Monk
78da3e6d67 am 3eccde2e: am 8c48a9b1: am 0d7d9272: Change DeviceProfilesSettings to DialogFragment 
* commit '3eccde2e05c07b7fd65ba82f21862ae077c7051d':
  Change DeviceProfilesSettings to DialogFragment
 2015-06-02 21:25:42 +00:00
Jason Monk
26e34e3d9e am f723447c: am 84abde71: am 1b7bff11: Merge "Fix battery usage screen issues" into mnc-dev 
* commit 'f723447cbf52049329c13acb7ad60104e5df0104':
  Fix battery usage screen issues
 2015-06-02 21:25:40 +00:00