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

26260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricky Wai
b8e660b62f Fix location settings crash when work profile is disabled 
am: 3bd4771

* commit '3bd4771ccb6f05c30cf7de6b2092f4f580821b56':
  Fix location settings crash when work profile is disabled
 2016-03-18 14:26:26 +00:00
Ricky Wai
89d419eb37 Merge "Do not connect to KeyChainService when user is not started" into nyc-dev 
am: ff99bae

* commit 'ff99bae74452e62249da336744637d8517448e5c':
  Do not connect to KeyChainService when user is not started
 2016-03-18 14:26:26 +00:00
Philip P. Moltmann
47a9d4f70c Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev 2016-03-18 14:26:25 +00:00
Ricky Wai
3bd4771ccb Fix location settings crash when work profile is disabled 
Bug: 27402597
Change-Id: Iab5f999b67e9f81977142648f90cf31acb8b5f69
 2016-03-18 14:18:45 +00:00
Ricky Wai
ff99bae744 Merge "Do not connect to KeyChainService when user is not started" into nyc-dev 2016-03-18 14:16:27 +00:00
Ricky Wai
78fb3d3e42 Do not connect to KeyChainService when user is not started 
Bug: 27418671
Change-Id: Id1bca405e8b0ebea79726f623aaa0c59bce0331c
 2016-03-18 14:15:11 +00:00
Tony Mak
b7f1edd279 Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible 
The problem is because ConfirmDeviceCredentialActivity is not created
again when the new intent is fired. Add no history flag to kill it once
it is not visible. We have the exclude from recent flag anyway, so
finishing it should be fine.

Bug: 27564634
Change-Id: I2e22f3d7a108f8fbad5f27894b1a92f19d25bcda
 2016-03-18 13:56:08 +00:00
Maria Garcia Puyol
da497f26d7 Revert "Dialog for emergency info" 
This reverts commit ae49edbdfd.

Change-Id: I01a4b5966b380d967588bd0411e80d6bcd431fd1
 2016-03-17 22:52:44 +00:00
Sudheer Shanka
e2b2c3ffe4 Add more policy transparency for wifi settings. 
Show policy transparency dialog if user tries to modify a
wifi configuration locked by device owner.

Bug: 27375948
Change-Id: I504082282f57bc5de9f097e962d195ecd2cc9da4
 2016-03-17 15:35:15 -07:00
Jeff Sharkey
3cc2cd0c47 Merge "Follow framework refactoring." into nyc-dev am: 297ce9a 
am: 2758b99

* commit '2758b99e9d1ea7cec97e7c92ddc668ec5e4b0d84':
  Follow framework refactoring.
 2016-03-17 22:18:16 +00:00
Jeff Sharkey
2758b99e9d Merge "Follow framework refactoring." into nyc-dev 
am: 297ce9a

* commit '297ce9aaf396ab35f28d6c84ad0b3f040494aaf9':
  Follow framework refactoring.
 2016-03-17 22:14:09 +00:00
Jeff Sharkey
297ce9aaf3 Merge "Follow framework refactoring." into nyc-dev 2016-03-17 22:00:22 +00:00
Sudheer Shanka
2b6e283da7 Merge "Fix string typo." into nyc-dev am: d0145cc 
am: feed83f

* commit 'feed83f7a38524aedbbb959e5362ee611ce67500':
  Fix string typo.
 2016-03-17 21:52:22 +00:00
Sudheer Shanka
feed83f7a3 Merge "Fix string typo." into nyc-dev 
am: d0145cc

* commit 'd0145cc87a0eb2210022793f9d8aaf7f0462fcf9':
  Fix string typo.
 2016-03-17 21:49:50 +00:00
Xiaohui Chen
0e53e9a8ae Merge "fix build for ag/887244" into nyc-dev am: e7359ee 
am: a4da112

* commit 'a4da11246febcf2710c4abe9b788cad0c37249f4':
  fix build for ag/887244
 2016-03-17 21:45:07 +00:00
Xiaohui Chen
a4da11246f Merge "fix build for ag/887244" into nyc-dev 
am: e7359ee

* commit 'e7359eee4c3dad9a5acf98ff61c9801dd13d2e8c':
  fix build for ag/887244
 2016-03-17 21:42:23 +00:00
Sudheer Shanka
d0145cc87a Merge "Fix string typo." into nyc-dev 2016-03-17 21:41:43 +00:00
Mahaver Chopra
e7359eee4c Merge "fix build for ag/887244" into nyc-dev 2016-03-17 21:37:20 +00:00
Anna Galusza
0dfec6f5e1 Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev am: a6b76bc 
am: a7df8a7

* commit 'a7df8a7c1bfd14a3b7672fe36e2b391d1014146f':
  Add divider below summary text on A11y SUW hub. Bug: 27066012
 2016-03-17 21:30:39 +00:00
Anna Galusza
a7df8a7c1b Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev 
am: a6b76bc

* commit 'a6b76bc4071c2946d0e809e72552cb1909b264ae':
  Add divider below summary text on A11y SUW hub. Bug: 27066012
 2016-03-17 21:27:42 +00:00
Anna Galusza
a6b76bc407 Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev 2016-03-17 21:20:34 +00:00
Anna Galusza
6a2a53e94d Add divider below summary text on A11y SUW hub. 
Bug: 27066012

Change-Id: Ic545a50ec2a0b5b7a40152ea818bd15673c629d2
 2016-03-17 14:20:02 -07:00
Xiaohui Chen
e4649dde7f fix build for ag/887244 
Change-Id: Iaa57eff6d1c9117d3ed55420712e7c6db6d2aa88
 2016-03-17 20:41:03 +00:00
Sudheer Shanka
9a958bae30 Fix string typo. 
Bug: 27627894
Change-Id: I6039acd69363a3827e42e5efda23123af6dfd1c1
 2016-03-17 13:18:32 -07:00
Udam Saini
0be44a2ccf Merge "Sets the divider style to either for fingerprint." into nyc-dev am: 4c173cb 
am: 2607f55

* commit '2607f5516cd6d8fcdc458cc65bb9ccc1a86ded02':
  Sets the divider style to either for fingerprint.
 2016-03-17 20:09:06 +00:00
Udam Saini
2607f5516c Merge "Sets the divider style to either for fingerprint." into nyc-dev 
am: 4c173cb

* commit '4c173cb46effd9d932ebdfb9c1c634edb5bee19d':
  Sets the divider style to either for fingerprint.
 2016-03-17 20:06:47 +00:00
Udam Saini
4c173cb46e Merge "Sets the divider style to either for fingerprint." into nyc-dev 2016-03-17 19:59:53 +00:00
Julia Reynolds
9aa54154f9 Merge "Fix build" into nyc-dev am: 7c80241 
am: f9c21c2

* commit 'f9c21c28a3928bb28ebd46eb0e2cf288b4ac4e05':
  Fix build
 2016-03-17 19:32:36 +00:00
Mahaver Chopra
21936f5554 Merge "Title text and input bar should be white" into nyc-dev am: bef02df 
am: 36e4e7a

* commit '36e4e7ac10ede26bfb9949b6e04851d428f67337':
  Title text and input bar should be white
 2016-03-17 19:32:36 +00:00
Mahaver Chopra
e5dfbf09d0 Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev am: 78a4bcd 
am: 0ed1e25

* commit '0ed1e25a2218322fe6672c0752fed30cf80d0483':
  Work Profile Security Challenge: Finalised strings
 2016-03-17 19:32:36 +00:00
Julia Reynolds
d55c517506 Merge "Fix crash adding an account." into nyc-dev am: f6fb21c 
am: 1e148a3

* commit '1e148a30941c8011c0ad2a78aad0c0e0f2182e22':
  Fix crash adding an account.
 2016-03-17 19:32:36 +00:00
Jason Monk
40e167e57d Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev am: e580f94 
am: 8dd1b68

* commit '8dd1b68b6ff4f18cdf0c0e4a010e3add69aed85b':
  Fix battery history detail up
  Fix clickability of conditionals
  Try to recycle prefs in battery summary
  Don't use animations for security settings
  Fix Settings home lifecycle
 2016-03-17 19:32:35 +00:00
Robin Lee
5d7ce782c7 vpn: check fragment is visible before adding prefs am: 37b179f 
am: 64de61e

* commit '64de61e683e2ffa77242d14ce5c681e38adc51ee':
  vpn: check fragment is visible before adding prefs
 2016-03-17 19:32:35 +00:00
Daichi Hirono
d74eaca751 Merge "Use CheckableLinearLayout for Use USB for dialog\'s item." into nyc-dev am: 23f4261 
am: 9ed9d94

* commit '9ed9d94ab50f03f6f3500689a78707c8d567c3a4':
  Use CheckableLinearLayout for Use USB for dialog's item.
 2016-03-17 19:32:35 +00:00
Yohei Yukawa
da838e59e6 Stop using a deprecated constructor of InputMethodSettings. am: 143a686 
am: 9452632

* commit '9452632d23b95654cb942f391f06a32132943e27':
  Stop using a deprecated constructor of InputMethodSettings.
 2016-03-17 19:32:35 +00:00
Meng Wang
a154a5d864 Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev am: 2ccf1fd 
am: 96f2194

* commit '96f21944801c7a38c6d75ca8927f13eb1560b27e':
  Show ICCID in SIM status, if CarrierConfigManager allows.
 2016-03-17 19:32:35 +00:00
Robin Lee
46eb69ac79 Merge "Show "no vpns added" for empty vpn screen" into nyc-dev am: d0979a5 
am: 8af9a74

* commit '8af9a7452948be260ac6fcb7f0230b0f347a6aee':
  Show "no vpns added" for empty vpn screen
 2016-03-17 19:32:35 +00:00
Christopher Tate
dafe12ac4a Merge "Don\'t crash if the backup transport supplies bogus intents" into nyc-dev am: 8b90b39 
am: ecd0f41

* commit 'ecd0f417efdda8a4ff18f60733be3813285c3dff':
  Don't crash if the backup transport supplies bogus intents
 2016-03-17 19:32:35 +00:00
Abodunrinwa Toki
af700ec6e0 Work challenge background: Fix top padding 
Bug: 27693796
Change-Id: Iafda9dfed2b87c3618c155d4434d5895547f6fe0
 2016-03-17 18:48:05 +00:00
Julia Reynolds
f9c21c28a3 Merge "Fix build" into nyc-dev 
am: 7c80241

* commit '7c802419fd99445442cb7499757dbcadda18fee0':
  Fix build
 2016-03-17 18:19:23 +00:00
Mahaver Chopra
36e4e7ac10 Merge "Title text and input bar should be white" into nyc-dev 
am: bef02df

* commit 'bef02df556fd4ea09c416025b67e6769b25a6c4a':
  Title text and input bar should be white
 2016-03-17 18:19:23 +00:00
Mahaver Chopra
0ed1e25a22 Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev 
am: 78a4bcd

* commit '78a4bcd4196450d245adebec15aaae2be2778493':
  Work Profile Security Challenge: Finalised strings
 2016-03-17 18:19:23 +00:00
Julia Reynolds
1e148a3094 Merge "Fix crash adding an account." into nyc-dev 
am: f6fb21c

* commit 'f6fb21c44d1b138c28bdd057c7b83e35f62a432b':
  Fix crash adding an account.
 2016-03-17 18:19:23 +00:00
Jason Monk
8dd1b68b6f Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev 
am: e580f94

* commit 'e580f940795da75b920753c75fd4ec43a8db8957':
  Fix battery history detail up
  Fix clickability of conditionals
  Try to recycle prefs in battery summary
  Don't use animations for security settings
  Fix Settings home lifecycle
 2016-03-17 18:19:23 +00:00
Robin Lee
64de61e683 vpn: check fragment is visible before adding prefs 
am: 37b179f

* commit '37b179fa8cdde8e00a745cbf030bcb1836e921c4':
  vpn: check fragment is visible before adding prefs
 2016-03-17 18:19:23 +00:00
Daichi Hirono
9ed9d94ab5 Merge "Use CheckableLinearLayout for Use USB for dialog\'s item." into nyc-dev 
am: 23f4261

* commit '23f4261e3da25d61db73ba8404da9608ba19ccb0':
  Use CheckableLinearLayout for Use USB for dialog's item.
 2016-03-17 18:19:23 +00:00
Yohei Yukawa
9452632d23 Stop using a deprecated constructor of InputMethodSettings. 
am: 143a686

* commit '143a6869476a4be5962d4bba3b222d078f46b9a0':
  Stop using a deprecated constructor of InputMethodSettings.
 2016-03-17 18:19:23 +00:00
Meng Wang
96f2194480 Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev 
am: 2ccf1fd

* commit '2ccf1fd7c90b75f1cbf9a4639af926d16d50ca2e':
  Show ICCID in SIM status, if CarrierConfigManager allows.
 2016-03-17 18:19:23 +00:00
Robin Lee
8af9a74529 Merge "Show "no vpns added" for empty vpn screen" into nyc-dev 
am: d0979a5

* commit 'd0979a540b158485a7766e3466589f6cf171d2a7':
  Show "no vpns added" for empty vpn screen
 2016-03-17 18:19:23 +00:00
Christopher Tate
ecd0f417ef Merge "Don\'t crash if the backup transport supplies bogus intents" into nyc-dev 
am: 8b90b39

* commit '8b90b39c5e222abecd57cc89ccfbca36f52fc38f':
  Don't crash if the backup transport supplies bogus intents
 2016-03-17 18:19:23 +00:00