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

11094 Commits

Author SHA1 Message Date
Jason Monk
e86d54d041 Merge "Fix crash when clearing preference screen" into nyc-dev am: 2c313f0 
am: 2c1bfe3

* commit '2c1bfe37c1017c7d5989c5a9227a2a6b57185e7c':
  Fix crash when clearing preference screen

Change-Id: I5202056167c539420465cd01afd58dc8d1dc3b61
 2016-03-29 17:30:26 +00:00
Jason Monk
2c1bfe37c1 Merge "Fix crash when clearing preference screen" into nyc-dev 
am: 2c313f0

* commit '2c313f0e934c0e669b8c21519bb70eb5639b7a97':
  Fix crash when clearing preference screen

Change-Id: I6446500ce33534f7cc28c9b1431adc20b5723f71
 2016-03-29 17:27:14 +00:00
Jason Monk
2c313f0e93 Merge "Fix crash when clearing preference screen" into nyc-dev 2016-03-29 17:23:32 +00:00
Jason Monk
1cb12bbd60 Fix crash when clearing preference screen 
Bug: 27892359
Change-Id: I96cd167e8173bf0345c3e186fa11c2e613b63e6f
 2016-03-29 13:21:48 -04:00
Udam Saini
fd1ae344be Merge "Prevents drawer menu from showing depending on intent." into nyc-dev am: 11cd08a 
am: 73ce947

* commit '73ce9476827ed661536c10831039eebb9ce7eb40':
  Prevents drawer menu from showing depending on intent.

Change-Id: I4521de520df06f544200bd39b63608e8d376929f
 2016-03-29 17:01:20 +00:00
Udam Saini
73ce947682 Merge "Prevents drawer menu from showing depending on intent." into nyc-dev 
am: 11cd08a

* commit '11cd08a2130d9434d3b90bb5cdf1f631d4a17981':
  Prevents drawer menu from showing depending on intent.

Change-Id: I0977e0d831ec702053502bfcdfe3b1c4da6ce375
 2016-03-29 16:58:26 +00:00
Udam Saini
11cd08a213 Merge "Prevents drawer menu from showing depending on intent." into nyc-dev 2016-03-29 16:54:23 +00:00
Fyodor Kupolov
77045c3317 Merge "Disable Add user until Setup prompt is shown" into nyc-dev am: 5b469f6 
am: 5d8cac2

* commit '5d8cac2391dd9fe12eeb545fa3f07f709ecec2c5':
  Disable Add user until Setup prompt is shown

Change-Id: I397914191cd9e57ba6f461b060bbb501d7ae7971
 2016-03-29 16:52:38 +00:00
Fyodor Kupolov
5d8cac2391 Merge "Disable Add user until Setup prompt is shown" into nyc-dev 
am: 5b469f6

* commit '5b469f6a7366f6ca90252d9a8d84600bcf8fb8e1':
  Disable Add user until Setup prompt is shown

Change-Id: Ica621c8a25d6c521ec5ee2cf271db8f104e49fea
 2016-03-29 16:49:44 +00:00
Fyodor Kupolov
5b469f6a73 Merge "Disable Add user until Setup prompt is shown" into nyc-dev 2016-03-29 16:45:59 +00:00
Daniel U
1cfd96d6c4 Merge "Override device lock pattern visibility when unifying" into nyc-dev am: f19001f 
am: f9d23d9

* commit 'f9d23d94f1f75dddcad7c3d6041794a77452bd41':
  Override device lock pattern visibility when unifying

Change-Id: I6666fbd5d10b7f9143f1d5f293da3e5db5b92417
 2016-03-29 09:44:11 +00:00
Daniel U
f9d23d94f1 Merge "Override device lock pattern visibility when unifying" into nyc-dev 
am: f19001f

* commit 'f19001f2c0517b478dd07feb9b7427a1b506adb1':
  Override device lock pattern visibility when unifying

Change-Id: I3a73cc8ad0edb8f87f20043107fb23c3ce70cc10
 2016-03-29 09:40:51 +00:00
Daniel U
f19001f2c0 Merge "Override device lock pattern visibility when unifying" into nyc-dev 2016-03-29 09:34:05 +00:00
Pierre Imai
c58d5ac26e Prevent multicast addresses in static Wifi config. am: 47f67c1 
am: 1c96ec1

* commit '1c96ec166c4f04983d9a97b60c6019218e3b0b61':
  Prevent multicast addresses in static Wifi config.

Change-Id: I1dbaccf5e5fc6cc2f5f527ec084094f123b6d5f7
 2016-03-29 08:47:03 +00:00
Pierre Imai
1c96ec166c Prevent multicast addresses in static Wifi config. 
am: 47f67c1

* commit '47f67c1ff783422fa799128eb8f1215018855b26':
  Prevent multicast addresses in static Wifi config.

Change-Id: I448e43e43e2c87480e9a1027338d8d911d96bb84
 2016-03-29 08:44:22 +00:00
Pierre Imai
47f67c1ff7 Prevent multicast addresses in static Wifi config. 
Change-Id: I1961b10d67d322fb863620813fe9039b63bb7895
 2016-03-29 16:04:47 +09:00
Fyodor Kupolov
fe6cb6dac7 Disable Add user until Setup prompt is shown 
Bug: 27848426
Change-Id: Ibbc0ac0aad8298252dfc460a10a87955fc3e713d
 2016-03-28 16:44:51 -07:00
Udam Saini
92779ce701 Prevents drawer menu from showing depending on intent. 
When ChooseLockScreenGeneric is started via the set password
intents, it should not allow the drawer menu to show.

bug:26288300
Change-Id: I10d512e20fedab2be8c725c7d524db0c55666590
 2016-03-28 16:43:57 -07:00
Udam Saini
d75122bb83 Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev am: 7e7f82a 
am: 77a9f6f

* commit '77a9f6f2bd8e72d1c161a4eab4c43c8c1854e7f2':
  Changes SetupRedactionInterstitial to be an optional step
 2016-03-28 22:41:28 +00:00
mariagpuyol
9a992391ad Merge "Add flags to emergency info intent" into nyc-dev am: cd1dd62 
am: 9860d64

* commit '9860d64025913552d3de2da5a4ea88476f77f935':
  Add flags to emergency info intent
 2016-03-28 22:41:27 +00:00
Sandeep Gutta
0952882ee8 Merge "Telephony(MSIM): Fix Cellular Data Preference" into nyc-dev am: fb40fa4 
am: 4daefb4

* commit '4daefb4a4a7c8d525e47bb3c3fe4bf90f1e46de4':
  Telephony(MSIM): Fix Cellular Data Preference
 2016-03-28 22:41:23 +00:00
Joe Onorato
55e1fc7dbc Merge "Adapt to procstats classes which moved." into nyc-dev am: 25b5d98 
am: 3873f8e

* commit '3873f8e7cce4ec38f76b0dd70b36a18b6598c83a':
  Adapt to procstats classes which moved.
 2016-03-28 22:41:21 +00:00
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
Udam Saini
77a9f6f2bd Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev 
am: 7e7f82a

* commit '7e7f82acf5e0ac9cfbef6016c53a3faf5d2a722d':
  Changes SetupRedactionInterstitial to be an optional step
 2016-03-28 22:33:41 +00:00
mariagpuyol
9860d64025 Merge "Add flags to emergency info intent" into nyc-dev 
am: cd1dd62

* commit 'cd1dd62420cacb5e234b86f24aaba277ad7e9095':
  Add flags to emergency info intent
 2016-03-28 22:33:40 +00:00
Sandeep Gutta
4daefb4a4a Merge "Telephony(MSIM): Fix Cellular Data Preference" into nyc-dev 
am: fb40fa4

* commit 'fb40fa4aad2360bc9ec102e1d55ecbb3f1139591':
  Telephony(MSIM): Fix Cellular Data Preference
 2016-03-28 22:33:38 +00:00
Joe Onorato
3873f8e7cc Merge "Adapt to procstats classes which moved." into nyc-dev 
am: 25b5d98

* commit '25b5d98a74cb09d02b8149eb1cb60803c4562185':
  Adapt to procstats classes which moved.
 2016-03-28 22:33:36 +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
Udam Saini
7e7f82acf5 Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev 2016-03-28 22:06:59 +00:00
Maria Garcia Puyol
cd1dd62420 Merge "Add flags to emergency info intent" into nyc-dev 2016-03-28 21:56:59 +00:00
mariagpuyol
bd5c83f8b9 Add flags to emergency info intent 
Bug:27859534
Change-Id: I3ff0aea7b0115a22c0a4a853d8fc83a7ae7adc20
 2016-03-28 14:49:38 -07:00
Robb Glasser
fb40fa4aad Merge "Telephony(MSIM): Fix Cellular Data Preference" into nyc-dev 2016-03-28 21:06:40 +00:00
Sandeep Gutta
c4d7823c85 Telephony(MSIM): Fix Cellular Data Preference 
While voice call is active, if cellular data preference
updated via updateCellularDataValues(), the cellular data
preference option getting enabled.
To fix this consider the call state while updating
cellular data preference in updateCellularDataValues().

bug:27635796

Change-Id: I5306f021e8bdeecc845d50a3b55b9c07d1b2c837
 2016-03-28 14:05:46 -07:00
Joe Onorato
25b5d98a74 Merge "Adapt to procstats classes which moved." into nyc-dev 2016-03-28 20:52:38 +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