PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,211 Commits 1 Branch 0 Tags
c30a11483624dcfbd6daf2997866654bf6fc5fd1
Commit Graph

26211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
c30a114836 Merge "Fix crash in ApnSettings." into nyc-dev am: 2cfda2a 
am: 38a266a

* commit '38a266a6815a1b5bcce6775bb1c60e34737ee9b0':
  Fix crash in ApnSettings.
 2016-03-28 17:36:31 +00:00
Sudheer Shanka
62d9f3d21b Merge "Fix crash in AndroidBeam class." into nyc-dev am: 2fff06e 
am: d459e35

* commit 'd459e355776cea28656af71e84fe5930885fba7c':
  Fix crash in AndroidBeam class.
 2016-03-28 17:36:31 +00:00
Sudheer Shanka
38a266a681 Merge "Fix crash in ApnSettings." into nyc-dev 
am: 2cfda2a

* commit '2cfda2a3bd796585c02f93dae628896ac077aa98':
  Fix crash in ApnSettings.
 2016-03-28 17:32:36 +00:00
Sudheer Shanka
d459e35577 Merge "Fix crash in AndroidBeam class." into nyc-dev 
am: 2fff06e

* commit '2fff06e91816ff787dfcbaf4de3cb71f9ce91282':
  Fix crash in AndroidBeam class.
 2016-03-28 17:32:35 +00:00
Sudheer Shanka
2cfda2a3bd Merge "Fix crash in ApnSettings." into nyc-dev 2016-03-28 17:18:54 +00:00
Sudheer Shanka
2fff06e918 Merge "Fix crash in AndroidBeam class." into nyc-dev 2016-03-28 17:18:37 +00:00
Geoff Mendal
2837ff0238 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3efe250 -s ours 
am: 0e4d7cf  -s ours

* commit '0e4d7cf33fad229505c506e1f1b18c7e2cfc1833':
  Import translations. DO NOT MERGE
 2016-03-28 15:09:13 +00:00
Geoff Mendal
0e4d7cf33f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 3efe250  -s ours

* commit '3efe25059f3f94167de96f9e48052bfeb61c2dfb':
  Import translations. DO NOT MERGE
 2016-03-28 15:01:32 +00:00
Geoff Mendal
3efe25059f Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-28 14:46:14 +00:00
Geoff Mendal
ff750b5d82 Import translations. DO NOT MERGE 
Change-Id: I87b7e8ca95a7c65402a93cf6ad37db5222b3e4ec
Auto-generated-cl: translation import
 2016-03-28 07:42:47 -07:00
Jason Monk
9f2ba29151 Merge changes I22d799f8,I1bc14e7a into nyc-dev am: 2de6a28 
am: 81ab842

* commit '81ab8425630d3a3ac51109a045384a708ad9799c':
  Guard against crash in dev options
  Switch to whitelist for animations
 2016-03-28 14:27:37 +00:00
Jason Monk
81ab842563 Merge changes I22d799f8,I1bc14e7a into nyc-dev 
am: 2de6a28

* commit '2de6a287cad72cb7939df3702dabd4aa559fe0c9':
  Guard against crash in dev options
  Switch to whitelist for animations
 2016-03-28 14:23:50 +00:00
Jason Monk
2de6a287ca Merge changes I22d799f8,I1bc14e7a into nyc-dev 
* changes:
  Guard against crash in dev options
  Switch to whitelist for animations
 2016-03-28 14:14:01 +00:00
Geoff Mendal
1a57473dde Import translations. DO NOT MERGE 
Change-Id: I8303e337afd764231eb307766b38e08b766d8f7a
Auto-generated-cl: translation import
 2016-03-28 06:33:52 -07:00
Bill Yi
c7acdb1d46 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2d17f93 -s ours 
am: 937ad3c  -s ours

* commit '937ad3c1a240afa4303f44fb137f35a336bf4974':
  Import translations. DO NOT MERGE
 2016-03-26 17:42:50 +00:00
Bill Yi
937ad3c1a2 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2d17f93  -s ours

* commit '2d17f93122cc0630a1ad6bffbdcdddc16a143ac4':
  Import translations. DO NOT MERGE
 2016-03-26 17:39:16 +00:00
Bill Yi
6d7f9f20ca Merge "Import translations. DO NOT MERGE" 2016-03-26 17:26:30 +00:00
Bill Yi
2d17f93122 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-26 17:26:11 +00:00
Bill Yi
2393396422 Import translations. DO NOT MERGE 
Change-Id: I766afa18abf7a57162fc9bc51ed0c1aa9c97e9a9
Auto-generated-cl: translation import
 2016-03-26 00:37:09 -07:00
Bill Yi
d2ec0e5219 Import translations. DO NOT MERGE 
Change-Id: I7bc995d474f548d4628f0b73991a1c8b181f0d45
Auto-generated-cl: translation import
 2016-03-25 23:52:45 -07:00
Christopher Tate
7b55a383aa Call it "Opening links" now am: 13d79b2 
am: 8d5561f

* commit '8d5561fc3e54138886e7ee76911df3f9c3f3cf99':
  Call it "Opening links" now
 2016-03-26 00:19:38 +00:00
Christopher Tate
8d5561fc3e Call it "Opening links" now 
am: 13d79b2

* commit '13d79b2a252ac4bbb55e110782f5d166d1ed4db7':
  Call it "Opening links" now
 2016-03-26 00:16:39 +00:00
Christopher Tate
13d79b2a25 Call it "Opening links" now 
Better labels are better.

Bug 27834016

Change-Id: I3f5a8088234db7790ac8baded0547f415d7e2c4c
 2016-03-25 15:06:25 -07:00
Alan Viverette
d29d40e822 Merge "Move DensityUtils into SettingsLib" into nyc-dev am: 30dbd47 
am: 447bb2f

* commit '447bb2f7dad8133f1f18e1f3b627affda6e4bdfe':
  Move DensityUtils into SettingsLib
 2016-03-25 20:10:07 +00:00
Alan Viverette
447bb2f7da Merge "Move DensityUtils into SettingsLib" into nyc-dev 
am: 30dbd47

* commit '30dbd47a29fb12f1a5c5027d6719397fb322fe9e':
  Move DensityUtils into SettingsLib
 2016-03-25 20:06:34 +00:00
Alan Viverette
30dbd47a29 Merge "Move DensityUtils into SettingsLib" into nyc-dev 2016-03-25 19:59:38 +00:00
Alan Viverette
6b0b73fdc4 Move DensityUtils into SettingsLib 
Bug: 27644685
Change-Id: Ie493bd7b07700c2df1221a4257c0487db2a14ff7
 2016-03-25 14:56:25 -04:00
Philip P. Moltmann
c85475c50f Merge "Use changed getStatus interface" into nyc-dev am: 872f621 
am: a18db31

* commit 'a18db3133a7c367c1fcf5aad910ee41fa600e833':
  Use changed getStatus interface
 2016-03-25 16:58:52 +00:00
Philip P. Moltmann
a18db3133a Merge "Use changed getStatus interface" into nyc-dev 
am: 872f621

* commit '872f621eb358a2237f516a4bc783f3a7306ed3a6':
  Use changed getStatus interface
 2016-03-25 16:56:31 +00:00
Philip P. Moltmann
872f621eb3 Merge "Use changed getStatus interface" into nyc-dev 2016-03-25 16:50:35 +00:00
Philip P. Moltmann
b05fbfa274 Use changed getStatus interface 
Change-Id: I72a2aa74607e34a1afbef0982f634def3e30efd4
 2016-03-24 16:53:44 -07:00
Udam Saini
fc76f5ffd4 Merge "Updates spacing on redaction interstitial" into nyc-dev am: 375b981 
am: f7e45a7

* commit 'f7e45a7f281a399ed373d6aac892d63941be33de':
  Updates spacing on redaction interstitial
 2016-03-24 22:45:00 +00:00
Julia Reynolds
f2f1272ac0 Merge "Rules without a configuration activity aren\'t clickable." into nyc-dev am: befc5c5 
am: eb9dae0

* commit 'eb9dae04ab3a224f108d1911c09c9ed88c8678c9':
  Rules without a configuration activity aren't clickable.
 2016-03-24 22:44:59 +00:00
Udam Saini
f7e45a7f28 Merge "Updates spacing on redaction interstitial" into nyc-dev 
am: 375b981

* commit '375b981267aea4f3fb3374d2a6e18339125dd455':
  Updates spacing on redaction interstitial
 2016-03-24 22:40:16 +00:00
Julia Reynolds
eb9dae04ab Merge "Rules without a configuration activity aren\'t clickable." into nyc-dev 
am: befc5c5

* commit 'befc5c59eb7e896ab5ec7df423f3b9eec8726f01':
  Rules without a configuration activity aren't clickable.
 2016-03-24 22:40:16 +00:00
Sudheer Shanka
4249d7589b Fix crash in ApnSettings. 
ApnSettings runs with uid android.uid.phone and since it doesn't has
the MANAGE_DEVICE_ADMINS and MANAGE_PROFILE_AND_DEVICE_OWNERS
permission, show the generic support instead of the admin specific
message.

Bug: 27826969
Change-Id: I556a8b74aa1f692ebac1f4e30aeab3ed78ec5078
 2016-03-24 15:39:24 -07:00
Udam Saini
375b981267 Merge "Updates spacing on redaction interstitial" into nyc-dev 2016-03-24 22:20:10 +00:00
Julia Reynolds
befc5c59eb Merge "Rules without a configuration activity aren't clickable." into nyc-dev 2016-03-24 22:11:53 +00:00
Julia Reynolds
2bcb0778c3 Rules without a configuration activity aren't clickable. 
Bug: 27823109
Change-Id: Ifa2291627846e562f9a04ec1e85582833ab234de
 2016-03-24 15:10:25 -07:00
Sudheer Shanka
b51457db10 Fix crash in AndroidBeam class. 
SwitchChangeListener is not added if admin disables the options, so
don't try to remove the listener in this case.

Bug: 27828118
Change-Id: Id0f9c71a10f93fc4c87af2b02ab7f04482145217
 2016-03-24 12:21:45 -07:00
Robin Lee
ec4393953d Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev am: 1997f76 
am: 32c3be8

* commit '32c3be8e0392fd2f26ed505f52f048691628addd':
  Implement action "android.settings.VPN_SETTINGS"
 2016-03-24 18:44:46 +00:00
Robin Lee
32c3be8e03 Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev 
am: 1997f76

* commit '1997f76cfc1ca3ee22d629db0504773f4f2abac3':
  Implement action "android.settings.VPN_SETTINGS"
 2016-03-24 18:41:16 +00:00
Robin Lee
1997f76cfc Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev 2016-03-24 18:32:51 +00:00
Hall Liu
b8eb4a1c55 Merge "Add indicator for system dialer in Settings" into nyc-dev am: f3dc18b 
am: 736afac

* commit '736afac6cbfdc2f96fc074afbc6f25f5243fba42':
  Add indicator for system dialer in Settings
 2016-03-24 17:43:04 +00:00
Hall Liu
736afac6cb Merge "Add indicator for system dialer in Settings" into nyc-dev 
am: f3dc18b

* commit 'f3dc18b65bd78d7f00b6255208864cb6899674bc':
  Add indicator for system dialer in Settings
 2016-03-24 17:39:30 +00:00
Hall Liu
f3dc18b65b Merge "Add indicator for system dialer in Settings" into nyc-dev 2016-03-24 17:29:39 +00:00
Fan Zhang
a2414963da Merge "Don't return anything from setTitleFromBackStack." 2016-03-24 16:46:57 +00:00
Fan Zhang
2a7d1c3648 Don't return anything from setTitleFromBackStack. 
The return value is not consumed by anything.

Change-Id: Id024ac02f00861aa1c7f347676c648ab406011b1
 2016-03-24 09:33:43 -07:00
Robin Lee
d3041943a7 Implement action "android.settings.VPN_SETTINGS" 
Bug: 27700919
Change-Id: Ibd23f1d53d40addc2ff8ac3215f3524b7e8c9c2e
 2016-03-24 16:02:08 +00:00
Daichi Hirono
e73d3cfe67 Merge "Don\'t close USB type notification when USB is connected to USB devices." into nyc-dev am: 98607d4 
am: 28fa685

* commit '28fa685ef3bdd1a5ea399172258bed15d97d1dbb':
  Don't close USB type notification when USB is connected to USB devices.
 2016-03-24 02:53:04 +00:00