PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,733 Commits 1 Branch 0 Tags
b5ca40c6442c4f30b79dcd202bb9fecc65ba436c
Commit Graph

21733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
eb37daffa1 am b6cb215c: am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 
* commit 'b6cb215cbefc803b0a1510a7f7c606d4d5c10045':
  Fix Help menu for PrivateVolumeSettings
 2015-07-15 15:22:19 +00:00
Jason Monk
b6cb215cbe am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 
* commit 'cd075edf6dcff9ca9ff243760e032190acbdecdc':
  Fix Help menu for PrivateVolumeSettings
 2015-07-15 15:08:44 +00:00
Jason Monk
cd075edf6d Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 2015-07-15 14:54:04 +00:00
Geoff Mendal
9a635144e1 am 13b52d78: (-s ours) am 78aeabe8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '13b52d781a3d7c7b2cb9dbd12ba5ca4650f634e2':
  Import translations. DO NOT MERGE
 2015-07-15 14:47:29 +00:00
Geoff Mendal
13b52d781a am 78aeabe8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '78aeabe834c6efacbbb7712bdbdd100917e356f3':
  Import translations. DO NOT MERGE
 2015-07-15 14:35:26 +00:00
Geoff Mendal
f71e13c80f am 32a9a993: (-s ours) am 4c60755b: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE 
* commit '32a9a993f74c962858591b0d2293edddb37d1b43':
  Import translations. DO NOT MERGE
 2015-07-15 14:33:07 +00:00
Geoff Mendal
32a9a993f7 am 4c60755b: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE 
* commit '4c60755b310dfb54a1eb748fe184f6e928295b3d':
  Import translations. DO NOT MERGE
 2015-07-15 14:16:17 +00:00
Geoff Mendal
78aeabe834 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-15 14:15:34 +00:00
Geoff Mendal
ad3601989a Import translations. DO NOT MERGE 
Change-Id: I451d2757ef702a046bc62ee5940e510fa0b739ee
Auto-generated-cl: translation import
 2015-07-15 07:14:40 -07:00
Geoff Mendal
4c60755b31 am f3907176: (-s ours) Import translations. DO NOT MERGE 
* commit 'f3907176da3f17397f61bf48ba90ab08a9cd85f3':
  Import translations. DO NOT MERGE
 2015-07-15 14:07:41 +00:00
Geoff Mendal
f3907176da Import translations. DO NOT MERGE 
Change-Id: I0bd7d5fb307ffa5fd3b001eaf5cf7697168e90d6
Auto-generated-cl: translation import
 2015-07-15 06:56:45 -07:00
xinhe
53d676791b am 9d95d884: am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit '9d95d88442babaa3511d28d89e05a244b97a7bdf':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:39:58 +00:00
xinhe
9d95d88442 am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit '7e23bae6c6d8697c1f53ed4a3b8b467d3142fd76':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:26:08 +00:00
xinhe
7e23bae6c6 am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit 'd7fb46de591943c402dd13551ca603081ac4e6a7':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:13:03 +00:00
xinhe
d7fb46de59 Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 2015-07-14 22:29:32 +00:00
Jim Miller
9f2fdd4bb0 am b8d1fc6b: am a41eb2fa: am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev 
* commit 'b8d1fc6b3c7564ec7d7f731f79a9f2879a90ad5b':
  Postpone call to postEnroll() until we actually leave activity.
 2015-07-14 21:43:47 +00:00
xinhe
cbdcca6cf6 Need to disable 5GHz bands for WiFi tethering in Japan 
b/22396383

Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
 2015-07-14 14:39:43 -07:00
Jim Miller
b8d1fc6b3c am a41eb2fa: am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev 
* commit 'a41eb2faaa4f86b77fe6fa2273f4a84216b5920c':
  Postpone call to postEnroll() until we actually leave activity.
 2015-07-14 21:33:14 +00:00
Jim Miller
a41eb2faaa am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev 
* commit 'e641e7d706095b54ac89f6fcb58c66e2190f46c7':
  Postpone call to postEnroll() until we actually leave activity.
 2015-07-14 21:18:39 +00:00
Jason Monk
4f7e1968ea am d03f041a: am fd44d346: am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit 'd03f041a06af8fe31c7fffd4aa9c975e2b5151e6':
  Add content description to wifi networks
 2015-07-14 21:02:18 +00:00
Jim Miller
e641e7d706 Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev 2015-07-14 21:02:02 +00:00
Jason Monk
d03f041a06 am fd44d346: am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit 'fd44d346bcaae6e8267aa4767ad70037d436e1e4':
  Add content description to wifi networks
 2015-07-14 20:47:33 +00:00
Jason Monk
fd44d346bc am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit 'acc70a3a3262aef48b2efab90f14328f818a9aef':
  Add content description to wifi networks
 2015-07-14 20:30:19 +00:00
Jason Monk
acc70a3a32 Merge "Add content description to wifi networks" into mnc-dev 2015-07-14 20:20:40 +00:00
Billy Lau
bd5ae86579 am 254ce51b: am de784e6a: am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 
* commit '254ce51b129a6b6a8f98b4641895ab085a3936c9':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
 2015-07-14 19:08:46 +00:00
Jason Monk
f05248f88f Fix Help menu for PrivateVolumeSettings 
Call super.onCreateOptionsMenu so that the auto help stuff can
work properly.

Bug: 22202745
Change-Id: Iee6b4a81574c7e981290465a78641f3c5b06c143
 2015-07-14 15:00:22 -04:00
Billy Lau
254ce51b12 am de784e6a: am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 
* commit 'de784e6ab5e86eb780cdeee4a2f01e2db9a1ef07':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
 2015-07-14 18:51:58 +00:00
Billy Lau
de784e6ab5 am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 
* commit '52df60d83dc48818aacbe1721e6aaa9be39e8451':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
 2015-07-14 18:36:53 +00:00
Billy Lau
52df60d83d Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 2015-07-14 18:22:30 +00:00
Jorim Jaggi
07a9d3b312 am d4391c22: am 464e54f8: am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev 
* commit 'd4391c22d147cbf97823e14fbe16d0a97b195dd3':
  Disable voice input if assist is voice service
 2015-07-14 18:19:31 +00:00
Wei Liu
e60235748c am cfb053f5: Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev 
* commit 'cfb053f590b9c972010ef4c7f78156121eb70276':
  Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
 2015-07-14 18:19:30 +00:00
Sanket Padawe
c06f9b6721 Use common xml file for multi-tab settings. 
Bug: 22360525
Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
 2015-07-14 11:13:43 -07:00
Jorim Jaggi
d4391c22d1 am 464e54f8: am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev 
* commit '464e54f88b4aa933a7d26cb1afecf0ddfc282751':
  Disable voice input if assist is voice service
 2015-07-14 18:13:27 +00:00
Wei Liu
cfb053f590 Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev 2015-07-14 18:08:35 +00:00
Jorim Jaggi
464e54f88b am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev 
* commit '8505d4a51d1112ea71f7df680cf85378a9567bde':
  Disable voice input if assist is voice service
 2015-07-14 18:04:11 +00:00
Jason Monk
2ecd295d56 Add content description to wifi networks 
Bug: 22468835
Change-Id: Ifd9d0384030befbd221b14599159348bf56d41c8
 2015-07-14 14:00:07 -04:00
Jorim Jaggi
8505d4a51d Merge "Disable voice input if assist is voice service" into mnc-dev 2015-07-14 17:50:34 +00:00
Jason Monk
b280578935 am 3aee5d79: am 19186edd: am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev 
* commit '3aee5d790cf74661f358ae8ad73dccba243a7f41':
  Disable notification volume when user restricted
 2015-07-14 14:28:55 +00:00
Jason Monk
3aee5d790c am 19186edd: am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev 
* commit '19186edddb32efc43e7f00faea0436c36b702290':
  Disable notification volume when user restricted
 2015-07-14 14:18:00 +00:00
Jason Monk
19186edddb am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev 
* commit '7713fe26d2151a7ba8e9970d90f55ae184d48b7d':
  Disable notification volume when user restricted
 2015-07-14 14:02:27 +00:00
Jason Monk
7713fe26d2 Merge "Disable notification volume when user restricted" into mnc-dev 2015-07-14 13:53:29 +00:00
Martijn Coenen
f5f40191a5 am bafffd14: am 35738049: am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev 
* commit 'bafffd149aa6cf56bd7ac7c728d0a5442aca4d2c':
  Fix up Tap and Pay how it works.
 2015-07-14 10:26:33 +00:00
Martijn Coenen
bafffd149a am 35738049: am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev 
* commit '35738049df5aa6b14ef0721375cf40c5e7c60539':
  Fix up Tap and Pay how it works.
 2015-07-14 10:13:58 +00:00
Martijn Coenen
35738049df am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev 
* commit '8d9bb1ae1d551699ba85061001ced90a157ae9ad':
  Fix up Tap and Pay how it works.
 2015-07-14 07:57:35 +00:00
Martijn Coenen
8d9bb1ae1d Merge "Fix up Tap and Pay how it works." into mnc-dev 2015-07-14 07:45:01 +00:00
Jorim Jaggi
0798ef0523 Disable voice input if assist is voice service 
Bug: 22358252
Change-Id: Id4a9de8c5287c5e025d0ccc7f98edd8855db519c
 2015-07-14 04:13:57 +00:00
Maurice Lam
9fa8d9f248 [Fingerprint] Use accent color for fingerprint highlight 
Set the fingerprint activated color, while registering a new
fingerprint to be 50% alpha of the accent color. This allows the
color to be changed with the theme, so that it will be highlighted
blue during setup wizard.

Bug: 21695577
Change-Id: Iee68506a4fbb8e8996bdb52694992ac460ae943d
 2015-07-14 01:22:38 +00:00
Jason Monk
ec786ebd8c am 381b1758: am 5250cc00: am 53dd1d4d: Merge "Fix app icon size" into mnc-dev 
* commit '381b1758f69a267e5e83d8d35319e1cf8da2884f':
  Fix app icon size
 2015-07-14 00:15:02 +00:00
Sanket Padawe
b11677635a am 389fbb74: am 2db9291e: am 7995ca41: Use same technology type for LTE/4G 
* commit '389fbb748c577dd08ec8657a2ffa81c4e56ae5fa':
  Use same technology type for LTE/4G
 2015-07-14 00:15:01 +00:00
Chris Wren
95ac602959 am 209a72ca: am b6d8b5f6: am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev 
* commit '209a72cab17a48b549484982817bb13513d96cd3':
  import new view enums into MetricsLogger
 2015-07-14 00:15:00 +00:00