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

23170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Salyzyn
f3cc23524f Merge "Settings: Add option to disable logging" 2015-12-28 17:35:26 +00:00
Nick Kralevich
b913bf926e Merge "Hide usb mode chooser dialog after disconnected" 2015-12-23 18:55:09 +00:00
Mark Salyzyn
285afa8d15 Settings: Add option to disable logging 
Bug: 26178938
Change-Id: I64263595705ceb1e6816e3cdfa982929877ff5b2
 2015-12-22 15:14:56 -08:00
Du, Changbin
93df36a1c7 Hide usb mode chooser dialog after disconnected 
Add a UsbDisconnectedReceiver to listen usb state event, and hide
the usb mode chooser dialog if usb disconnected.

Change-Id: I871f56cb5a310e20950926180d9747dd9fad9754
Signed-off-by: Du, Changbin <changbin.du@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
 2015-12-22 15:26:13 +08:00
Svetoslav Ganov
142193550e Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" 
am: c4321c7e6c  -s ours

* commit 'c4321c7e6caa1a3699567f9c39d2bc33bbf39c6b':
  [DO NOT MERGE] Modify system settings: incorrect UI state
 2015-12-03 22:45:05 +00:00
Svetoslav Ganov
c4321c7e6c Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" 2015-12-03 22:38:54 +00:00
Svetoslav
28daa67fcb [DO NOT MERGE] Modify system settings: incorrect UI state 
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.

The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.

bug:25843134

Change-Id: I2da4eec1c3574bd6aef9ab968c9deb148536cb0a
 2015-12-03 14:36:36 -08:00
Robin Lee
905829393d Merge "VPN settings: grey out policy-restricted menus" 
am: ee4808d37b

* commit 'ee4808d37b955299501e9b753cc7bb19877d4f83':
  VPN settings: grey out policy-restricted menus
 2015-11-13 14:08:52 +00:00
Robin Lee
ee4808d37b Merge "VPN settings: grey out policy-restricted menus" 2015-11-13 14:07:05 +00:00
Robin Lee
4198607ee2 VPN settings: grey out policy-restricted menus 
setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.

Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
 2015-11-13 14:01:43 +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
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
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
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