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

24188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
bcd1a8f73c Fix crash in Settings from uninstall am: 6e2e8e17cf am: 34d6ea560d am: eccc9b3962 
am: 652ba5e22e

* commit '652ba5e22e86fe031ca080f5bfe032f27008989a':
  Fix crash in Settings from uninstall
 2015-10-22 23:48:54 +00:00
Jason Monk
652ba5e22e Fix crash in Settings from uninstall am: 6e2e8e17cf am: 34d6ea560d 
am: eccc9b3962

* commit 'eccc9b39626c525763e5590728f413e4d7ff8cf5':
  Fix crash in Settings from uninstall
 2015-10-22 23:42:14 +00:00
Jason Monk
eccc9b3962 Fix crash in Settings from uninstall am: 6e2e8e17cf 
am: 34d6ea560d

* commit '34d6ea560d3935eef6e53e93d5bb7ba1a8148965':
  Fix crash in Settings from uninstall
 2015-10-22 23:37:48 +00:00
Jason Monk
34d6ea560d Fix crash in Settings from uninstall 
am: 6e2e8e17cf

* commit '6e2e8e17cfea09548067baa8b361dbc31dce385c':
  Fix crash in Settings from uninstall
 2015-10-22 23:12:02 +00:00
Jason Monk
6e2e8e17cf Fix crash in Settings from uninstall 
Bug: 25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
 2015-10-22 22:58:50 +00:00
Maurice Lam
2fa828a951 Merge "[WifiDialog] Allow adding unspecified AP" 2015-10-22 19:52:05 +00:00
Maurice Lam
34e5a0c308 [WifiDialog] Allow adding unspecified AP 
In WifiDialogActivity, handle the case where the given
accessPointState is null, and show the Wi-Fi dialog allowing users
to enter the SSID and other credentials. This will be used by setup
wizard when user selected "Add new network" item.

Bug: 23392285
Change-Id: Ica2650d9e829d73281bc9c504c3005d9c5750d31
 2015-10-22 11:39:26 -07:00
Xiaohui Chen
bf10314819 Merge "Clean up UserHandle.isOwner() in settings" 2015-10-21 21:49:49 +00:00
Xiaohui Chen
f9ee84dba4 Clean up UserHandle.isOwner() in settings 
Bug: 24869636
Change-Id: I9cb05a7543024136935902047952f582ae57c07c
 2015-10-21 11:26:14 -07:00
Geoff Mendal
a4e1da0ba4 Import translations. DO NOT MERGE am: a489856def -s ours am: f3ad526200 -s ours am: 79e81bca9c -s ours 
am: af6440fb19  -s ours

* commit 'af6440fb1992cfc5a1f1c3127d98a72feb82a9f4':
  Import translations. DO NOT MERGE
 2015-10-21 16:52:58 +00:00
Geoff Mendal
af6440fb19 Import translations. DO NOT MERGE am: a489856def -s ours am: f3ad526200 -s ours 
am: 79e81bca9c  -s ours

* commit '79e81bca9c11b35bbc4522fbe8117dc0b425ccc7':
  Import translations. DO NOT MERGE
 2015-10-21 16:47:13 +00:00
Geoff Mendal
79e81bca9c Import translations. DO NOT MERGE am: a489856def -s ours 
am: f3ad526200  -s ours

* commit 'f3ad5262003947120243736851ff5dce7ae7635a':
  Import translations. DO NOT MERGE
 2015-10-21 14:59:01 +00:00
Geoff Mendal
f3ad526200 Import translations. DO NOT MERGE 
am: a489856def  -s ours

* commit 'a489856def386e52f3507370f5b504841bab7a61':
  Import translations. DO NOT MERGE
 2015-10-21 14:48:15 +00:00
Geoff Mendal
a489856def Import translations. DO NOT MERGE 
Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9
Auto-generated-cl: translation import
 2015-10-21 07:05:23 -07:00
Geoff Mendal
65671965de Import translations. DO NOT MERGE 
Change-Id: Ie184422a6bc4ead4e4ed8e32439a9b68168d35e4
Auto-generated-cl: translation import
 2015-10-21 06:19:48 -07:00
Jason Monk
f0c26ab7d5 Allow access to permissions, even if app has none am: 36866c8e84 am: 6fde534148 am: 47db2ba628 
am: 4f9f28effb

* commit '4f9f28effbce13e17c411016b00946070cc1ceeb':
  Allow access to permissions, even if app has none
 2015-10-21 02:29:23 +00:00
Jason Monk
4f9f28effb Allow access to permissions, even if app has none am: 36866c8e84 am: 6fde534148 
am: 47db2ba628

* commit '47db2ba62840135894cf139886c68e63a4497626':
  Allow access to permissions, even if app has none
 2015-10-21 02:20:21 +00:00
Jason Monk
47db2ba628 Allow access to permissions, even if app has none am: 36866c8e84 
am: 6fde534148

* commit '6fde534148c3f93b6362d4927270f81048a6bef3':
  Allow access to permissions, even if app has none
 2015-10-21 01:46:11 +00:00
Jason Monk
6fde534148 Allow access to permissions, even if app has none 
am: 36866c8e84

* commit '36866c8e84acd26e82b072f2d39106d0e58e6a84':
  Allow access to permissions, even if app has none
 2015-10-21 01:43:06 +00:00
Jason Monk
36866c8e84 Allow access to permissions, even if app has none 
Bug: 24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
 2015-10-20 19:38:58 -04:00
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