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

23176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
7ee05202ab Null check queryIntentServices am: a4c9492b50 am: e27cada8c4 
am: e198f7b84f

* commit 'e198f7b84fde2b3ca3f0e0c9195166b06363850e':
  Null check queryIntentServices
 2015-11-09 22:40:33 +00:00
Jason Monk
e198f7b84f Null check queryIntentServices am: a4c9492b50 
am: e27cada8c4

* commit 'e27cada8c49c8aec2463c352faf5211502b1b372':
  Null check queryIntentServices
 2015-11-09 22:36:21 +00:00
Jason Monk
e27cada8c4 Null check queryIntentServices 
am: a4c9492b50

* commit 'a4c9492b50b742488a6a92abdc290b5ada3c004b':
  Null check queryIntentServices
 2015-11-09 22:31:51 +00:00
Jason Monk
a4c9492b50 Null check queryIntentServices 
Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
 2015-11-09 16:56:46 -05:00
Baligh Uddin
4b87b724eb Import translations. DO NOT MERGE 
am: 7b9f79bb6e  -s ours

* commit '7b9f79bb6e6c72adae3e9674617b5b9c45c769bd':
  Import translations. DO NOT MERGE
 2015-11-05 19:40:21 +00:00
Baligh Uddin
7b9f79bb6e Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I38ff46207ad622dc25f4cbbf6445ceac1dcfedb7
 2015-11-04 12:11:39 -08:00
Jason Monk
1150cfce95 Merge "Don\'t show MIDI USB option if not supported" am: c2a9cd03f7 
am: 92aafd3ed5

* commit '92aafd3ed5391eb5b172c54e6ea820dd36110c99':
  Don't show MIDI USB option if not supported
 2015-11-04 15:02:47 +00:00
Jason Monk
92aafd3ed5 Merge "Don\'t show MIDI USB option if not supported" 
am: c2a9cd03f7

* commit 'c2a9cd03f71b3b6b0af2f6faaf877fd9c75dd9fe':
  Don't show MIDI USB option if not supported
 2015-11-04 14:56:04 +00:00
Jason Monk
c2a9cd03f7 Merge "Don't show MIDI USB option if not supported" 2015-11-04 14:43:11 +00:00
Zoran Jovanovic
81ec094554 Don't show MIDI USB option if not supported 
If device doesn't support MIDI, don't show MIDI in "Use USB for" menu
when USB cable is connected.
(Selecting MIDI will crash the Settings app.)

Change-Id: I60f4cbb6357f162fecb574cdb6766cf5ed92e78e
 2015-11-04 15:21:58 +01:00
Dianne Hackborn
c271a8a00e Merge "Further tweak to issue #issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d am: a42bad972c 
am: 44643bad26

* commit '44643bad268fa65d8a5d95055a8a9c2c4bf86fdf':
  Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS
 2015-10-30 17:27:44 +00:00
Dianne Hackborn
44643bad26 Merge "Further tweak to issue #issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d 
am: a42bad972c

* commit 'a42bad972ca44f52ac84b3139198acc11dec0d4f':
  Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS
 2015-10-30 17:24:34 +00:00
Dianne Hackborn
a42bad972c Merge "Further tweak to issue #issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev 
am: 3b4e4dd91d

* commit '3b4e4dd91d416c93fdc0326e54469ceabb8281ab':
  Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS
 2015-10-30 17:20:13 +00:00
Dianne Hackborn
3b4e4dd91d Merge "Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev 2015-10-30 17:16:20 +00:00
Dianne Hackborn
b6c7b05056 Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS 
Make sure the duration shown for z-ram is sane (the maximum of the
other process durations of that app).

Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130
 2015-10-29 17:32:28 -07:00
Dianne Hackborn
6ee79b2823 Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076 am: 68954d930d 
am: 2af9128966

* commit '2af9128966ee855d6c8e06479562cb141c625511':
  Fix issue #25371736: Don't include z-ram allocations in Android OS
 2015-10-29 23:46:20 +00:00
Dianne Hackborn
2af9128966 Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076 
am: 68954d930d

* commit '68954d930d0a583c7150e1a3959d5a798b8e5f34':
  Fix issue #25371736: Don't include z-ram allocations in Android OS
 2015-10-29 23:43:04 +00:00
Dianne Hackborn
68954d930d Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev 
am: 508559d076

* commit '508559d0760596509f07fa56371c6e18d8bd9559':
  Fix issue #25371736: Don't include z-ram allocations in Android OS
 2015-10-29 23:39:39 +00:00
Dianne Hackborn
508559d076 Merge "Fix issue #25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev 2015-10-29 23:36:14 +00:00
Dianne Hackborn
30bbd902dd Fix issue #25371736: Don't include z-ram allocations in Android OS 
Just distribute them across all of the running apps, by creating
an additional fake "z-ram" process for each of them.

Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686
 2015-10-29 15:43:21 -07:00
Geoff Mendal
b5497564ee Import translations. DO NOT MERGE am: 260d90a102 -s ours am: 04817defc9 -s ours 
am: fe5582a26b  -s ours

* commit 'fe5582a26b461482c51a163b76c2283ae96116eb':
  Import translations. DO NOT MERGE
 2015-10-28 14:10:08 +00:00
Geoff Mendal
fe5582a26b Import translations. DO NOT MERGE am: 260d90a102 -s ours 
am: 04817defc9  -s ours

* commit '04817defc935af871ec90b971f61d4b31d28c97d':
  Import translations. DO NOT MERGE
 2015-10-28 14:05:28 +00:00
Geoff Mendal
04817defc9 Import translations. DO NOT MERGE 
am: 260d90a102  -s ours

* commit '260d90a102b3a0d7ba51c5bf73d34291ef2f4910':
  Import translations. DO NOT MERGE
 2015-10-28 14:00:31 +00:00
Geoff Mendal
260d90a102 Import translations. DO NOT MERGE 
Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import
 2015-10-28 08:55:41 -05:00
Geoff Mendal
80f2b5430e Import translations. DO NOT MERGE am: c338bacb59 -s ours am: 884a8bbe78 -s ours 
am: 436fcc47fc  -s ours

* commit '436fcc47fce217f4c2b6301fe94fa87ffd6c0dbe':
  Import translations. DO NOT MERGE
 2015-10-26 14:22:41 +00:00
Geoff Mendal
436fcc47fc Import translations. DO NOT MERGE am: c338bacb59 -s ours 
am: 884a8bbe78  -s ours

* commit '884a8bbe7872e8d7aa94f854e4057d2d073cd09a':
  Import translations. DO NOT MERGE
 2015-10-26 14:17:02 +00:00
Geoff Mendal
884a8bbe78 Import translations. DO NOT MERGE 
am: c338bacb59  -s ours

* commit 'c338bacb59b13bed45239a587e3429b4bed00a71':
  Import translations. DO NOT MERGE
 2015-10-26 14:13:23 +00:00
Geoff Mendal
c338bacb59 Import translations. DO NOT MERGE 
Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import
 2015-10-26 07:03:05 -07: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
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
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
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