PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,847 Commits 1 Branch 0 Tags
aa38035ef57e35a1dbf3f0d50167d73fe15d321c
Commit Graph

23847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
fe7a25f8fe am 1e29e6b9: am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '1e29e6b9ecb8cadceb6a815464ad3f5e4f6d2138':
  Add setting to disable camera gesture
 2015-08-11 14:20:29 +00:00
Jason Monk
1e29e6b9ec am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '31227bfaf12ede192474bb162f1555215ffa605b':
  Add setting to disable camera gesture
 2015-08-11 14:12:00 +00:00
Jason Monk
31227bfaf1 am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit 'bce29c8a012a27d4cd4ca87892d215e29a793fa7':
  Add setting to disable camera gesture
 2015-08-11 14:08:02 +00:00
Jason Monk
bce29c8a01 am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '746886c59a20dc33d62c2dd500fd27edcf0abcca':
  Add setting to disable camera gesture
 2015-08-11 14:02:37 +00:00
Jason Monk
746886c59a Merge "Add setting to disable camera gesture" into mnc-dr-dev 2015-08-11 13:55:54 +00:00
Dianne Hackborn
70c52fcbf8 am 0583f297: am b98206c9: am 01cfaade: am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog 
* commit '0583f297f8223cacda71bda5b2b896cc03031b89':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:50:00 +00:00
Dianne Hackborn
0583f297f8 am b98206c9: am 01cfaade: am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog 
* commit 'b98206c99e687d043702df01d6a7a4a4273c82a8':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:42:51 +00:00
Dianne Hackborn
b05082598c am c7fbbf0d: am c262c522: am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'c7fbbf0d7c9b1fd432dd702c2a46f039c463fd85':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:38:31 +00:00
Dianne Hackborn
b98206c99e am 01cfaade: am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog 
* commit '01cfaadeeb9eb98f9a772a85ba6c4e1034319fb5':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:35:12 +00:00
Dianne Hackborn
c7fbbf0d7c am c262c522: am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'c262c522ae2ae31b5a6d1217efb40cbf81bbef59':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:33:41 +00:00
Dianne Hackborn
01cfaadeeb am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog 
* commit 'e9bcef3541435c1e1a2716d48eb1c1c897841880':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:28:17 +00:00
Dianne Hackborn
c262c522ae am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit '6fcacc41273a195dfa0f4cbca93c4eafe32edd1d':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:27:06 +00:00
Dianne Hackborn
e9bcef3541 am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog 
* commit 'be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:19:40 +00:00
Dianne Hackborn
6fcacc4127 am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'fc7633cae2aec30f32adbc26d3e24a8005e773f5':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:19:07 +00:00
Dianne Hackborn
ef54ab616a am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog 
* commit 'be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:17:11 +00:00
Dianne Hackborn
f664947291 am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:12:59 +00:00
Dianne Hackborn
fc7633cae2 am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:11:09 +00:00
Dianne Hackborn
be4df036e1 Fix issue #23037899: Support for Battery Optimization permission + Dialog 
New pretty dialog.

Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
 2015-08-10 17:07:14 -07:00
Dianne Hackborn
ba38155d25 Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 2015-08-11 00:06:43 +00:00
Dianne Hackborn
9bedd25c77 Fix issue #23037720: New Battery Optimization Strings 
No, really, these are the strings.

Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
 2015-08-10 17:03:38 -07:00
Jorim Jaggi
9a2af1ad7a Fix fingerprint string descriptions 
Change-Id: I83d4c89d9a060871117f8ec8cd72f36c1f3cf3a4
 2015-08-10 23:08:27 +00:00
Dianne Hackborn
6a473f94a1 am d638185d: am 6ae019e7: am cbfb4c4b: am fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'd638185db99b6082327ae0f7fe79b4add436f74f':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-10 22:30:53 +00:00
Dianne Hackborn
d638185db9 am 6ae019e7: am cbfb4c4b: am fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit '6ae019e74b9dcd10fb99fd684c5cd0114cc01ed9':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-10 22:21:22 +00:00
Dianne Hackborn
6ae019e74b am cbfb4c4b: am fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'cbfb4c4bff60c37ca04887a6e9cdd01fcdbf1a67':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-10 22:15:13 +00:00
Dianne Hackborn
cbfb4c4bff am fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'fa8a85da05a9deea9b1ae249a490b63e46058eff':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-10 22:07:13 +00:00
Dianne Hackborn
6aeabbf2d2 am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit '996e285cdcd26ee7251ec80915eeed57541efb6d':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-10 22:03:37 +00:00
Dianne Hackborn
fa8a85da05 am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit '996e285cdcd26ee7251ec80915eeed57541efb6d':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-10 22:02:23 +00:00
Dianne Hackborn
996e285cdc Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 2015-08-10 21:55:23 +00:00
Julia Reynolds
f4a6994106 am 0b514bdd: am 415d6a24: am f47896d2: am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev 
* commit '0b514bdd219e28cb1c920265fe36c1c30a6c8d5c':
  Wrap text on long preferences.
 2015-08-10 21:07:50 +00:00
Julia Reynolds
0b514bdd21 am 415d6a24: am f47896d2: am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev 
* commit '415d6a2411edfd72764bfd82208eff6020d85add':
  Wrap text on long preferences.
 2015-08-10 20:59:29 +00:00
Julia Reynolds
415d6a2411 am f47896d2: am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev 
* commit 'f47896d223c715a6f480a0c7be36fc1206caf404':
  Wrap text on long preferences.
 2015-08-10 20:53:31 +00:00
Julia Reynolds
f47896d223 am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev 
* commit '77dc56bc4ce29016820dc90fea933324dc57f4be':
  Wrap text on long preferences.
 2015-08-10 20:45:56 +00:00
Jason Monk
b4b4e2a981 am d1cecdd3: am 55511dab: am 9614b503: am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev 
* commit 'd1cecdd33e7366e5b23dcc7f05078bde0b43c13c':
  Remove extra help & feedback menu from power usage
 2015-08-10 20:39:46 +00:00
Julia Reynolds
0a27e57dd9 am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev 
* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
  Wrap text on long preferences.
 2015-08-10 20:38:15 +00:00
Julia Reynolds
77dc56bc4c am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev 
* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
  Wrap text on long preferences.
 2015-08-10 20:37:34 +00:00
Jason Monk
d1cecdd33e am 55511dab: am 9614b503: am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev 
* commit '55511dab4fcd7410868670a6d39e88a91784d722':
  Remove extra help & feedback menu from power usage
 2015-08-10 20:34:04 +00:00
Julia Reynolds
2557d8a251 Merge "Wrap text on long preferences." into mnc-dev 2015-08-10 20:32:49 +00:00
Jason Monk
55511dab4f am 9614b503: am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev 
* commit '9614b50319f8e22640fa43bb3623c41c5f412338':
  Remove extra help & feedback menu from power usage
 2015-08-10 20:30:11 +00:00
Jason Monk
656145a0e0 am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev 
* commit 'cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
  Remove extra help & feedback menu from power usage
 2015-08-10 20:23:14 +00:00
Jason Monk
9614b50319 am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev 
* commit 'a1f64bf207c452f9b0e6a558538d9614ca2bf655':
  Remove extra help & feedback menu from power usage
 2015-08-10 20:21:53 +00:00
Jason Monk
a1f64bf207 am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev 
* commit 'cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
  Remove extra help & feedback menu from power usage
 2015-08-10 20:14:46 +00:00
Jason Monk
cf1e22f447 Merge "Remove extra help & feedback menu from power usage" into mnc-dev 2015-08-10 20:09:20 +00:00
Jason Monk
3006c377c2 Remove extra help & feedback menu from power usage 
Bug: 23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4
 2015-08-10 15:58:09 -04:00
Roozbeh Pournader
280f26c9e3 Merge "Inline TextUtils.join(Iterable<CharSequence>)." 2015-08-10 18:54:58 +00:00
Roozbeh Pournader
4bbf75d184 Inline TextUtils.join(Iterable<CharSequence>). 
DataUsageSummary seems to be the only place the deprecated hidden
method is used. This inlines the definition so the deprecated method
could be removed.

Change-Id: I63dc1de74e1df1119ba99f46bed5d016e07c87b5
 2015-08-10 11:32:19 -07:00
Pavel Zhamaitsiak
3e16609755 am 10278acc: am 7381ed0d: am 05c4a757: am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev 
* commit '10278acc8b0dee0ee4fa0b04c17749418f382365':
  Ensure that listener is removed only if it was added
 2015-08-10 18:06:59 +00:00
Pavel Zhamaitsiak
10278acc8b am 7381ed0d: am 05c4a757: am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev 
* commit '7381ed0d9b1e34466fd6486b49a98a002267fcb2':
  Ensure that listener is removed only if it was added
 2015-08-10 17:58:10 +00:00
Pavel Zhamaitsiak
7381ed0d9b am 05c4a757: am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev 
* commit '05c4a75701f1b1d56255b74a15cf28a018ad659a':
  Ensure that listener is removed only if it was added
 2015-08-10 17:51:31 +00:00
Pavel Zhamaitsiak
05c4a75701 am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev 
* commit 'f48424e17caf6d4e890154d45c70a125802e1682':
  Ensure that listener is removed only if it was added
 2015-08-10 17:41:22 +00:00
Pavel Zhamaitsiak
f48424e17c am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev 
* commit '8cf54264995aea65d77c25b5050cb3aac0196c59':
  Ensure that listener is removed only if it was added
 2015-08-10 17:35:16 +00:00