PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,459 Commits 1 Branch 0 Tags
fde014516f884e957a1fdcd0a4c8d8ff71c0f47c
Commit Graph

22459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
63c7e4c26f am 4f7e1968: am d03f041a: am fd44d346: am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit '4f7e1968eab4afb4b65a80def2e80f20d1bff593':
  Add content description to wifi networks
 2015-07-14 21:12:23 +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
Narayan Kamath
5152086a17 am 83a25842: Merge "Lose some deprecated test annotations." 
* commit '83a25842e720ddb838519e194679b464d0114301':
  Lose some deprecated test annotations.
 2015-07-14 20:27:36 +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
509f2fe51c am bd5ae865: 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 'bd5ae86579d7aeebc2cff415f1ed355f269387d5':
  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:23:52 +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
Jorim Jaggi
983e99dcf1 am 07a9d3b3: am d4391c22: am 464e54f8: am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev 
* commit '07a9d3b3123a0c22b9409f0464b82bc62f7319c9':
  Disable voice input if assist is voice service
 2015-07-14 18:28:27 +00:00
Wei Liu
751d0e6701 am e6023574: am cfb053f5: Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev 
* commit 'e60235748c01ee5b7d083b642920006565b08c9a':
  Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
 2015-07-14 18:28:26 +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
Jason Monk
aa7a7740a1 am b2805789: am 3aee5d79: am 19186edd: am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev 
* commit 'b2805789352f60853e087b6886e022724b550645':
  Disable notification volume when user restricted
 2015-07-14 18:14:54 +00:00
Martijn Coenen
9670159d46 am f5f40191: am bafffd14: am 35738049: am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev 
* commit 'f5f40191a594d192a90c0e3052b78d29146b15ff':
  Fix up Tap and Pay how it works.
 2015-07-14 18:14:45 +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
eda414e5bd am ec786ebd: am 381b1758: am 5250cc00: am 53dd1d4d: Merge "Fix app icon size" into mnc-dev 
* commit 'ec786ebd8c725150711a496929463680c8d18d5e':
  Fix app icon size
 2015-07-14 16:25:31 +00:00
Sanket Padawe
ed6c19aefa am b1167763: am 389fbb74: am 2db9291e: am 7995ca41: Use same technology type for LTE/4G 
* commit 'b11677635ad12105e4adc0cae6099713a12371f1':
  Use same technology type for LTE/4G
 2015-07-14 16:25:24 +00:00
Chris Wren
7734e80798 am 95ac6029: am 209a72ca: am b6d8b5f6: am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev 
* commit '95ac602959ce41465ab8e8922659c471a33e7fed':
  import new view enums into MetricsLogger
 2015-07-14 16:25:20 +00:00
Geoff Mendal
e3f33af29b am f1507ef3: (-s ours) am 1e9aca41: (-s ours) am d8b05ce2: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f1507ef3dd8b296329d514ec87a6efbcc8ac249e':
  Import translations. DO NOT MERGE
 2015-07-14 16:25:19 +00:00
Zoltan Szatmary-Ban
ba79dc4d32 am 0998e03a: am e4e52064: am c968c407: am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev 
* commit '0998e03a8dfa01cf62649e2d277e0b8556b1ffc9':
  Do not throw exception when MeasurementDetails.mediaSize is empty
 2015-07-14 16:25:17 +00:00
Geoff Mendal
14940f9bc6 am 4c415361: (-s ours) am ed45bc30: (-s ours) am 92a33ff7: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE 
* commit '4c41536153d381f1b9b00e7ef74e5e5d50530caa':
  Import translations. DO NOT MERGE
 2015-07-14 16:25:16 +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
Narayan Kamath
83a25842e7 Merge "Lose some deprecated test annotations." 2015-07-14 10:48:09 +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
Geoff Mendal
f1507ef3dd am 1e9aca41: (-s ours) am d8b05ce2: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '1e9aca417c87308cc95433fde1ed679b8ccff150':
  Import translations. DO NOT MERGE
 2015-07-14 00:14:59 +00:00