PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,619 Commits 1 Branch 0 Tags
d23e45bfb591a6e616d0b889e1607c81af63792c
Commit Graph

24619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
2f43b146f5 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp 
am: ead9448b4a

* commit 'ead9448b4a9284543e875115dde389444f2e2e3e':
  Always show pairing dialog for device-specific keyboard.
 2015-10-20 23:14:42 +00:00
Jeff Sharkey
5368e7519d Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 am: 82839c8073 am: 0b07ce50a7 
am: 6a4bd6f6f9

* commit '6a4bd6f6f9882307bce087f8abe9bfafeda1680d':
  Hide empty data usage cycles.
 2015-10-20 23:14:32 +00:00
Jeff Sharkey
2fa5c2645e resolve merge conflicts of 071352de9e to master. 
Change-Id: Ib777927fd479fcb567d005910930fda7354865d0
 2015-10-20 16:04:59 -07:00
Geoff Mendal
8fa7e23b32 Import translations. DO NOT MERGE am: 3a7368e9c3 -s ours am: 6bdaffa2af -s ours am: 275a235437 -s ours 
am: 8da5906dcb  -s ours

* commit '8da5906dcb5b18f1e76cd1482a2dbbbd2de9fba6':
  Import translations. DO NOT MERGE
 2015-10-20 21:37:42 +00:00
Jason Monk
30e0a4a48a resolve merge conflicts of 8e18934478 to master. 
Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534
 2015-10-20 14:29:43 -07:00
Jeff Sharkey
ead9448b4a Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp 2015-10-20 18:34:46 +00:00
Jeff Sharkey
6a4bd6f6f9 Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 am: 82839c8073 
am: 0b07ce50a7

* commit '0b07ce50a7e3069be81214559652ad2bf2191378':
  Hide empty data usage cycles.
 2015-10-20 18:34:40 +00:00
Michael Wright
48dfa33230 Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev 
am: 98ec49dd6c

* commit '98ec49dd6c3105e342cf8e6c4fb5eb6168924b13':
 2015-10-20 18:34:24 +00:00
Michael Wright
e794a5814c Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c am: 6e957d6b42 
am: 94a5587ed6

* commit '94a5587ed664fa2e3996534d9ccf41394a1f131e':
  Always show pairing dialog for device-specific keyboard.
 2015-10-20 18:34:11 +00:00
Jeff Sharkey
2197d960a9 Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 am: 82839c8073 
am: 0b07ce50a7

* commit '0b07ce50a7e3069be81214559652ad2bf2191378':
  Hide empty data usage cycles.
 2015-10-20 18:32:34 +00:00
Jeff Sharkey
071352de9e Merge "Clamp large data usage values." into mnc-dr-dev am: 29b0ea2dbf am: a8bd650e81 
am: 10338550c4

* commit '10338550c42421595896377f68545df1f8a93644':
  Clamp large data usage values.
 2015-10-20 18:30:09 +00:00
Michael Wright
98ec49dd6c Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev 2015-10-20 17:54:53 +00:00
Michael Wright
94a5587ed6 Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c 
am: 6e957d6b42

* commit '6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
  Always show pairing dialog for device-specific keyboard.
 2015-10-20 17:54:46 +00:00
Michael Wright
ad1f744417 Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c 
am: 6e957d6b42

* commit '6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
  Always show pairing dialog for device-specific keyboard.
 2015-10-20 17:54:29 +00:00
Jeff Sharkey
0b07ce50a7 Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 
am: 82839c8073

* commit '82839c8073ff358e036c7ae54e52041e4a51738e':
  Hide empty data usage cycles.
 2015-10-20 17:49:25 +00:00
Jeff Sharkey
10338550c4 Merge "Clamp large data usage values." into mnc-dr-dev am: 29b0ea2dbf 
am: a8bd650e81

* commit 'a8bd650e810178358251e3099f949af8422d5a24':
  Clamp large data usage values.
 2015-10-20 17:48:14 +00:00
Michael Wright
6e957d6b42 Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev 
am: 66b6591d4c

* commit '66b6591d4c14400a18573a11880db16bb26ab80a':
  Always show pairing dialog for device-specific keyboard.
 2015-10-20 17:35:19 +00:00
Jeff Sharkey
82839c8073 Merge "Hide empty data usage cycles." into mnc-dr-dev 
am: 2fcbdb7bb6

* commit '2fcbdb7bb677ed06ca5e3fbe558aff77259c194c':
  Hide empty data usage cycles.
 2015-10-20 17:33:50 +00:00
Jeff Sharkey
a8bd650e81 Merge "Clamp large data usage values." into mnc-dr-dev 
am: 29b0ea2dbf

* commit '29b0ea2dbf8f0a31d02af8a4ce17753c9499b167':
  Clamp large data usage values.
 2015-10-20 17:32:47 +00:00
Michael Wright
66b6591d4c Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev 2015-10-20 17:23:40 +00:00
Jeff Sharkey
2fcbdb7bb6 Merge "Hide empty data usage cycles." into mnc-dr-dev 2015-10-20 17:21:52 +00:00
Jeff Sharkey
29b0ea2dbf Merge "Clamp large data usage values." into mnc-dr-dev 2015-10-20 17:21:43 +00:00
Geoff Mendal
8da5906dcb Import translations. DO NOT MERGE am: 3a7368e9c3 -s ours am: 6bdaffa2af -s ours 
am: 275a235437  -s ours

* commit '275a235437c3dfe4824cd1ca36aff38c81fa46fb':
  Import translations. DO NOT MERGE
 2015-10-20 11:59:56 +00:00
Geoff Mendal
275a235437 Import translations. DO NOT MERGE am: 3a7368e9c3 -s ours 
am: 6bdaffa2af  -s ours

* commit '6bdaffa2af987725f54cae246b5ed694720213bb':
  Import translations. DO NOT MERGE
 2015-10-20 11:56:07 +00:00
Geoff Mendal
6bdaffa2af Import translations. DO NOT MERGE 
am: 3a7368e9c3  -s ours

* commit '3a7368e9c32af8c3245c8effc98de9e75f90f27a':
  Import translations. DO NOT MERGE
 2015-10-20 11:52:42 +00:00
Geoff Mendal
3a7368e9c3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
 2015-10-19 21:22:01 -07:00
Jason Monk
8e18934478 Hide SIM and IMEI for wifi only devices am: 417a0500c3 am: 2a90c111ee 
am: 554c3aef41

* commit '554c3aef41c089d2baf6f2f6894de14e576f6d45':
  Hide SIM and IMEI for wifi only devices
 2015-10-20 03:00:11 +00:00
Jason Monk
554c3aef41 Hide SIM and IMEI for wifi only devices am: 417a0500c3 
am: 2a90c111ee

* commit '2a90c111ee994a0b8d95039b102ab280d6ce9d6b':
  Hide SIM and IMEI for wifi only devices
 2015-10-20 02:22:55 +00:00
Jason Monk
2a90c111ee Hide SIM and IMEI for wifi only devices 
am: 417a0500c3

* commit '417a0500c3d7e14013751dbe62791487b033ee72':
  Hide SIM and IMEI for wifi only devices
 2015-10-20 02:05:14 +00:00
Jeff Sharkey
02551ecd2e Hide empty data usage cycles. 
When building list of historical data usage cycles, omit cycles
that don't contain any data usage.  A bad NITZ or NTP fix may have
caused us to record some usage in 1970 or 2038, which would have
shown all the cycles in between.  Now we hide empty cycles to keep
things clean.

Bug: 18282691
Change-Id: Ib04c95d1411400ba9967d311b59402a26d39cfe3
 2015-10-19 17:28:04 -07:00
Jason Monk
417a0500c3 Hide SIM and IMEI for wifi only devices 
Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
 2015-10-19 20:02:11 -04:00
Jeff Sharkey
3105ea30d4 Clamp large data usage values. 
Without clamping, they can wrap around to negative values and cause
all sorts of havok.  1TB ought to be enough for anyone: that's 3Mbps
for a solid month.

Bug: 24555152
Change-Id: If92c87f9920c3f05cd3ff2cc6630b1bbb65335b8
 2015-10-19 16:41:53 -07:00
Geoff Mendal
57217ae00a am edfdeeee: (-s ours) am b2568ed0: (-s ours) am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours 
* commit 'edfdeeee309c19c553f5a5661d4070b5132995cf':
  Import translations. DO NOT MERGE
 2015-10-19 14:42:38 +00:00
Geoff Mendal
edfdeeee30 am b2568ed0: (-s ours) am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours 
* commit 'b2568ed0d1ae4cdaabcb061b2a503fece4aaa22a':
  Import translations. DO NOT MERGE
 2015-10-19 14:38:55 +00:00
Geoff Mendal
b2568ed0d1 am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours 
* commit '35e01bf70f560c3651ae34968cd1082cb2dd8536':
  Import translations. DO NOT MERGE
 2015-10-19 14:33:34 +00:00
Geoff Mendal
35e01bf70f Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
am: 84c62dde3d  -s ours

* commit '84c62dde3d737e0cc194a24e76dbdac9e8c75170':
  Import translations. DO NOT MERGE
 2015-10-19 14:28:59 +00:00
Geoff Mendal
84c62dde3d Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-19 14:27:20 +00:00
Geoff Mendal
7f62f29b24 Import translations. DO NOT MERGE 
Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import
 2015-10-19 07:25:38 -07:00
Geoff Mendal
2f38c25b0b Merge "Import translations. DO NOT MERGE" 2015-10-19 13:40:02 +00:00
Geoff Mendal
f1bd8f3446 Import translations. DO NOT MERGE 
Change-Id: I5165b5d0fe4fc0cf9dff9ccf44fe1aa95db26628
Auto-generated-cl: translation import
 2015-10-19 06:39:34 -07:00
Geoff Mendal
3ea647bcdc am 1c95645b: (-s ours) am ca059bfb: (-s ours) am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours 
* commit '1c95645b3bbc55db50d5720e29a2b867d849d0f8':
  Import translations. DO NOT MERGE
 2015-10-19 13:21:41 +00:00
Geoff Mendal
1c95645b3b am ca059bfb: (-s ours) am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours 
* commit 'ca059bfb439df9db2c4ee2f7d860e8a29bf0a91f':
  Import translations. DO NOT MERGE
 2015-10-19 13:17:46 +00:00
Geoff Mendal
ca059bfb43 am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours 
* commit '51b43e1236fa70711d914d0bc117a1ac745f0172':
  Import translations. DO NOT MERGE
 2015-10-19 13:13:08 +00:00
Geoff Mendal
51b43e1236 am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE 
am: 862568de0d  -s ours

* commit '862568de0d722af6f47e02b8c6fbf8efb9d6b6cc':
  Import translations. DO NOT MERGE
 2015-10-19 13:09:13 +00:00
Geoff Mendal
862568de0d am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE 
* commit '99131cf64253cf997d8ee6e356843e376a141846':
  Import translations. DO NOT MERGE
 2015-10-19 13:04:28 +00:00
Geoff Mendal
99131cf642 am f191953c: (-s ours) Import translations. DO NOT MERGE 
* commit 'f191953c77af3c5b78e576a430577aaf050aa5f1':
  Import translations. DO NOT MERGE
 2015-10-19 13:01:28 +00:00
Geoff Mendal
f191953c77 Import translations. DO NOT MERGE 
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
 2015-10-19 05:21:10 -07:00
Julia Reynolds
36d2b3faa9 Merge "Update sorting for rule types and instances." 2015-10-16 19:29:39 +00:00
Maurice Lam
80129d936b Merge "Fix preferences v14 issues in lock screeen setup" 2015-10-16 17:44:04 +00:00
Jason Monk
c03a45fa9c am 6d85d168: am d2975f9d: am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev 
* commit '6d85d1686e6a333fe990d9e3ae5b978e8a8ce8c2':
  Fix crashes in Settings
 2015-10-16 16:56:40 +00:00