Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,221 Commits 1 Branch 0 Tags
85ff2caec787f4d8ec16efb3bfd98c8d79c3df45
Commit Graph

11059 Commits

Author SHA1 Message Date
Anna Galusza
85ff2caec7 Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572" into nyc-dev am: 65e940b 
am: 3915311

* commit '39153117f05382f058b1e897ec89a5ed700ad971':
  Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572
 2016-03-28 22:41:15 +00:00
Anna Galusza
ffb2e2e919 Merge "Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766" into nyc-dev am: c53f337 
am: eff7714

* commit 'eff771423e6e1c12a23fd489c46c7bd8c293d2b0':
  Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766
 2016-03-28 22:41:11 +00:00
Anna Galusza
39153117f0 Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572" into nyc-dev 
am: 65e940b

* commit '65e940b8c13a0a89c80cf1b83c2cd946ad2b9552':
  Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572
 2016-03-28 22:33:33 +00:00
Anna Galusza
eff771423e Merge "Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766" into nyc-dev 
am: c53f337

* commit 'c53f3374436ec01653a57722f709f36bfa431c5d':
  Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766
 2016-03-28 22:33:30 +00:00
Anna Galusza
65e940b8c1 Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572" into nyc-dev 2016-03-28 18:14:37 +00:00
Anna Galusza
c53f337443 Merge "Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766" into nyc-dev 2016-03-28 18:14:18 +00:00
Fan Zhang
7d18401a14 Merge "Add a DashboardContainerFragment to host DashboardSummary." 2016-03-28 17:51:40 +00:00
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
Fan Zhang
94df695453 Add a DashboardContainerFragment to host DashboardSummary. 
Eventually the container fragment will host more dashboard-type
fragments. For now it's just DashboardSummary.

Change-Id: I217ad71c2f2bbc4b7247c9dd2c3c2b8c8660d945
 2016-03-28 09:35:14 -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
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
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
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
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
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
Daichi Hirono
28fa685ef3 Merge "Don\'t close USB type notification when USB is connected to USB devices." into nyc-dev 
am: 98607d4

* commit '98607d444903f5c74fe190f65800a5679b312c4e':
  Don't close USB type notification when USB is connected to USB devices.
 2016-03-24 02:50:52 +00:00
Daichi Hirono
98607d4449 Merge "Don't close USB type notification when USB is connected to USB devices." into nyc-dev 2016-03-24 02:46:23 +00:00
Sudheer Shanka
0f0e2df40a Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev 
am: 45949f9

* commit '45949f9138f048a9dbf9789c7bd05b751137a0fb':
  Add more policy transparency for disallow_remove_user restriction.
 2016-03-23 18:06:22 +00:00
Sudheer Shanka
add53dfcb1 Merge "Add more policy transparency for wifi settings." into nyc-dev 
am: ed0d4dd

* commit 'ed0d4dd463494c011ffcbd079ec321aa1d95e2b4':
  Add more policy transparency for wifi settings.
 2016-03-23 18:06:22 +00:00
Sudheer Shanka
9ddc14e7c7 Merge "Add disabled by policy empty views to more screens." into nyc-dev 
am: 561a88c

* commit '561a88cfcd21bcfd2a02c9fa3f3575566ccf7a72':
  Add disabled by policy empty views to more screens.
 2016-03-23 18:06:21 +00:00
Sudheer Shanka
45949f9138 Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev 2016-03-23 17:53:25 +00:00
Sudheer Shanka
ed0d4dd463 Merge "Add more policy transparency for wifi settings." into nyc-dev 2016-03-23 17:53:19 +00:00
Sudheer Shanka
561a88cfcd Merge "Add disabled by policy empty views to more screens." into nyc-dev 2016-03-23 17:53:15 +00:00
Abodunrinwa Toki
181b63ebe0 Merge "InputSettings: Physical keyboard settings activity." into nyc-dev 
am: 14df560

* commit '14df56074435ef5cab4010d5c782fdd682509244':
  InputSettings: Physical keyboard settings activity.
 2016-03-23 16:12:49 +00:00
qinglian.x.zhang
178b198f70 Merge "Fix no options menu on location settings screen" 
am: 5c15ff9

* commit '5c15ff923d6116e7634e7c51cde76ce33ed77368':
  Fix no options menu on location settings screen
 2016-03-23 16:07:28 +00:00
Abodunrinwa Toki
14df560744 Merge "InputSettings: Physical keyboard settings activity." into nyc-dev 2016-03-23 16:03:24 +00:00
Sudheer Shanka
b5c92147ce Add more policy transparency for disallow_remove_user restriction. 
Bug: 27784015
Change-Id: I2386efbf521ee8e73326006e78b0146341745e2b
 2016-03-22 17:24:07 -07:00
Anna Galusza
a2a9d9afa0 Fix summary text on A11y SUW hub screen and remove unused String. 
Bug: 26966572

Change-Id: I31ab0a18b1e98564d1eead338fdbfa224dbded77
 2016-03-22 14:41:43 -07:00
Andres Morales
950de0e40a Merge "don't toggle OEM unlocking if the preference is not enabled" into nyc-dev 2016-03-22 21:20:43 +00:00