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

9916 Commits

Author SHA1 Message Date
Alan Viverette
8fa75e03f7 Let the framework handle long clicks 
If we manually propagate long click events, the framework can't include
coordinate information and we'll only be able to show a modal dialog.
Since the default long-click behavior is to show the context menu, just
let the framework handle it.

Bug: 25214386
Change-Id: I32e14b326ac91cc5a9c2bf7581325daaba34298e
 2015-10-23 10:49:23 -04: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
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
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
Jason Monk
30e0a4a48a resolve merge conflicts of 8e18934478 to master. 
Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534
 2015-10-20 14:29:43 -07: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
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
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
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
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
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
Jason Monk
6d85d1686e am d2975f9d: am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev 
* commit 'd2975f9d0c12b46978c2a108961617293eeaba85':
  Fix crashes in Settings
 2015-10-16 16:49:38 +00:00
Jason Monk
d9774c9f5b am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev 
* commit 'cdcba9ce5f44cf4cad9e308919272db4e15e9717':
  Fix crashes in Settings
 2015-10-16 16:41:22 +00:00
Jason Monk
cdcba9ce5f Merge "Fix crashes in Settings" into mnc-dr-dev 2015-10-16 16:33:56 +00:00
Jeff Sharkey
1f5e53f9db am bfee8b48: am 31e2ce0e: am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev 
* commit 'bfee8b484f3bb4807d185526058ea463f91f1091':
  Bail if activity was destroyed.
 2015-10-16 16:33:53 +00:00
Jeff Sharkey
bfee8b484f am 31e2ce0e: am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev 
* commit '31e2ce0ea617bfe07a5c20d3c2b0433f14531678':
  Bail if activity was destroyed.
 2015-10-16 16:29:54 +00:00
Jeff Sharkey
d36edb9f46 am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev 
* commit 'de005547bae3799265fdad8f61720a82241f4b07':
  Bail if activity was destroyed.
 2015-10-16 16:18:41 +00:00
Jeff Sharkey
de005547ba Merge "Bail if activity was destroyed." into mnc-dr-dev 2015-10-16 16:14:47 +00:00
Julia Reynolds
8fe6efc8e1 Update sorting for rule types and instances. 
Bug: 22977552
Change-Id: I671f45f156f8f3faa4ce55608dd1d61b9f07d16a
 2015-10-16 11:43:54 -04:00
Jason Monk
562e40f66a Fix add account screen 
Don't use layout that didn't do anything special.

Bug: 24961118
Change-Id: I9207ee16e8c2c8325f3b4c00e423ac015170d10e
 2015-10-16 10:59:02 -04:00
Jason Monk
afa3a1a0cb Fix ManagedServiceSettings to work with Preferencev14 
Bug: 25007000
Change-Id: I5e3a59b77001ce0e2928b35fa1b87878e22d4fbd
 2015-10-16 10:52:16 -04:00
Jason Monk
77b11fa470 Fix crashes in Settings 
Fix problems from unsupported intents being launched through adb.
Remove the ones we can, fix the other.

Bug: 19634064
Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
 2015-10-16 10:13:53 -04:00
Maurice Lam
bd28ceef10 Fix preferences v14 issues in lock screeen setup 
Preferences support-v14 expects a RecyclerView, and cannot override
onCreateView to inflate custom views. This changes
SetupChooseLockGeneric to use suw_template_no_scroll and let
preference framework inflate its RecyclerView inside it.

Bug: 24929660
Change-Id: Icda0fed37b68d4cffb49da46a241185f32d7e467
 2015-10-15 14:34:06 -07:00
Amit Mahajan
2ffc11c069 am 7b990298: am f20d51f3: am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 
* commit '7b990298323f0e24c87123d955cfd08717a079d3':
  Change to add user_visible field to Carriers table.
 2015-10-14 23:54:00 +00:00
Amit Mahajan
7b99029832 am f20d51f3: am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 
* commit 'f20d51f3b02fafb6001e91de8b3d5a15e6222099':
  Change to add user_visible field to Carriers table.
 2015-10-14 23:49:08 +00:00
Amit Mahajan
6d042a69aa am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 
* commit '1704ca968d4566218f159817625f849c1dc34d96':
  Change to add user_visible field to Carriers table.
 2015-10-14 23:37:32 +00:00
Amit Mahajan
1704ca968d Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 2015-10-14 23:33:01 +00:00
Jeff Sharkey
cabb62faf3 Bail if activity was destroyed. 
Bug: 24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
 2015-10-14 14:45:52 -07:00
Erik Kline
3acdaac1b0 am 38fc400a: am 453d52b6: am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 
* commit '38fc400ac901c8cfec0aeaf07c9d11a2f29d3ce2':
  Unconfigure the lockdown VPN if the user forgets its profile.
 2015-10-14 18:01:50 +00:00
Erik Kline
38fc400ac9 am 453d52b6: am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 
* commit '453d52b6575ebd97c7b4c962bd3a687c1c163968':
  Unconfigure the lockdown VPN if the user forgets its profile.
 2015-10-14 17:55:18 +00:00
Erik Kline
51d71aa2bf am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 
* commit '583deb524b2d6ed2fd2741c605d5ae02c5c5d52a':
  Unconfigure the lockdown VPN if the user forgets its profile.
 2015-10-14 17:42:15 +00:00
Jason Monk
783718fffe Fix crash language & input settings 
Bug: 24576551
Change-Id: Ifb717689c862193cf06c23de52b3fb68f910db3c
 2015-10-13 16:45:49 -04:00