PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,599 Commits 1 Branch 0 Tags
65e940b8c13a0a89c80cf1b83c2cd946ad2b9552
Commit Graph

11027 Commits

Author SHA1 Message Date
Jason Monk
84796d0f64 am 63c7e4c2: am 4f7e1968: am d03f041a: am fd44d346: am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit '63c7e4c26ff9b8c7fc595770eaa816cc711f7688':
  Add content description to wifi networks
 2015-07-14 21:28:07 +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
Jim Miller
52374856e8 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:14:59 +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
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
810448204f am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit 'acc70a3a3262aef48b2efab90f14328f818a9aef':
  Add content description to wifi networks
 2015-07-14 20:31:52 +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
5742b87e5c am 509f2fe5: 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 '509f2fe51c84e2c0c2d83770710dc8572d0c2223':
  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:39:17 +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
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
Jorim Jaggi
f79dc2054f am 983e99dc: am 07a9d3b3: am d4391c22: am 464e54f8: am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev 
* commit '983e99dcf14b8858071a15f62d870b1561dc9d82':
  Disable voice input if assist is voice service
 2015-07-14 18:48:39 +00:00
Wei Liu
68e0cf8ee3 am 751d0e67: am e6023574: am cfb053f5: Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev 
* commit '751d0e67016c3d5cd25a195d412308e96f87f040':
  Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
 2015-07-14 18:48:38 +00:00
Jason Monk
1ae9f7d754 am aa7a7740: am b2805789: am 3aee5d79: am 19186edd: am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev 
* commit 'aa7a7740a16ed03960ea3fd81e5685357594d84a':
  Disable notification volume when user restricted
 2015-07-14 18:46:49 +00:00
Martijn Coenen
0ebcd356cf am 9670159d: am f5f40191: am bafffd14: am 35738049: am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev 
* commit '9670159d46a16a2151ff6f1ca737babf4c7685b0':
  Fix up Tap and Pay how it works.
 2015-07-14 18:46:48 +00:00
Billy Lau
45b27c3a04 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:37:09 +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
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
8f37d4bc11 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:05:05 +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
Sanket Padawe
20728bfc35 am ed6c19ae: am b1167763: am 389fbb74: am 2db9291e: am 7995ca41: Use same technology type for LTE/4G 
* commit 'ed6c19aefa6e6c542e957b653d8f6f392a7b0fb6':
  Use same technology type for LTE/4G
 2015-07-14 16:42:07 +00:00
Chris Wren
c53c63ecd8 am 7734e807: am 95ac6029: am 209a72ca: am b6d8b5f6: am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev 
* commit '7734e807986daa34fa7b8d0d729dc0dd9ea912d4':
  import new view enums into MetricsLogger
 2015-07-14 16:42:06 +00:00
Zoltan Szatmary-Ban
25b3876b19 am ba79dc4d: am 0998e03a: am e4e52064: am c968c407: am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev 
* commit 'ba79dc4d32e6fb909732b04b9cec562aa4a762da':
  Do not throw exception when MeasurementDetails.mediaSize is empty
 2015-07-14 16:42:04 +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
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
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
31e0538651 am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev 
* commit '7713fe26d2151a7ba8e9970d90f55ae184d48b7d':
  Disable notification volume when user restricted
 2015-07-14 14:04:12 +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
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
90d21f0967 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
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
48b11b8158 am 49e0b9fd: am a2511269: am 39f92c0f: am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev 
* commit '49e0b9fdff9741f51e69683b2f79b6079d344a67':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-14 00:25:35 +00:00
Maurice Lam
49e0b9fdff am a2511269: am 39f92c0f: am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev 
* commit 'a2511269745c7d8ae101996d02905fbed3c5bfe7':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-13 23:50:34 +00:00
Sanket Padawe
389fbb748c am 2db9291e: am 7995ca41: Use same technology type for LTE/4G 
* commit '2db9291ea4ba1d880ebcc976c65b12dd24d080ad':
  Use same technology type for LTE/4G
 2015-07-13 23:34:48 +00:00
Chris Wren
209a72cab1 am b6d8b5f6: am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev 
* commit 'b6d8b5f6a4dfd5838f9e35d9ddd840e80f5bfec6':
  import new view enums into MetricsLogger
 2015-07-13 23:34:47 +00:00