PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,795 Commits 1 Branch 0 Tags
d1af8c2d6ac6ea858e67022ff76a0f938bfc5ad4
Commit Graph

25795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tony Mak
d1af8c2d6a Merge "Should read specific user\'s password restriction" into nyc-dev 
am: 2bfbcfa

* commit '2bfbcfae13afd00b7e7e28031a9bda5f7de753f8':
  Should read specific user's password restriction
 2016-03-18 18:54:45 +00:00
Tony Mak
b03e5ece2d Clear mHasResult if the result is dispatched 
am: b27d5b2

* commit 'b27d5b2007020e9911aaab57161bced168d3b99c':
  Clear mHasResult if the result is dispatched
 2016-03-18 18:54:45 +00:00
Tony Mak
2bfbcfae13 Merge "Should read specific user's password restriction" into nyc-dev 2016-03-18 18:51:58 +00:00
Tony Mak
b27d5b2007 Clear mHasResult if the result is dispatched 
The bug is because we dispatch the result again in setListener.
We should reset mHasResult if the result is dispatched already.
This bug is actually not work-challenge specific, I can reproduce it
in the setting to change screen lock.

Bug: 27242673
Change-Id: I29d2769a16c53d7103dafe1811bc808d634a8d85
 2016-03-18 18:44:57 +00:00
Jason Monk
87e213b8df Merge "Fix bluetooth device forgetting" into nyc-dev 
am: b56d3a6

* commit 'b56d3a6c33f9d548247cbf8ed4894a3f4227b0e5':
  Fix bluetooth device forgetting
 2016-03-18 18:19:47 +00:00
Jason Monk
b56d3a6c33 Merge "Fix bluetooth device forgetting" into nyc-dev 2016-03-18 18:13:47 +00:00
Jason Monk
38d8fc0f86 Fix bluetooth device forgetting 
Bug: 27476922
Change-Id: I8c5b7076a04185371311fb4ff1c1ba0df0df19dc
 2016-03-18 14:11:25 -04:00
mariagpuyol
251e7dc996 Merge "Remove emergency info subtitle" into nyc-dev 
am: db15d8e

* commit 'db15d8e21b54d9a0e57c2e5dca756cc306ee78ff':
  Remove emergency info subtitle
 2016-03-18 15:43:57 +00:00
Maria Garcia Puyol
db15d8e21b Merge "Remove emergency info subtitle" into nyc-dev 2016-03-18 15:37:59 +00:00
Abodunrinwa Toki
153ce15c31 Merge "Work challenge background: Fix top padding" into nyc-dev 
am: 4873230

* commit '487323032638e733d9cec4608838b7727b99232f':
  Work challenge background: Fix top padding
 2016-03-18 15:37:08 +00:00
Abodunrinwa Toki
4873230326 Merge "Work challenge background: Fix top padding" into nyc-dev 2016-03-18 15:30:01 +00:00
mariagpuyol
1f8665f58a Remove emergency info subtitle 
Bug:27621394
Change-Id: I9f2dfd1fd4926cb454cc8e4b7e3f100aa724aa76
 2016-03-18 08:13:49 -07:00
Maria Garcia Puyol
2aca50b657 Merge "Revert "Dialog for emergency info"" into nyc-dev 
am: c35b08b

* commit 'c35b08b4b3de8daebbc6974715dbc4a0d4a91c1e':
  Revert "Dialog for emergency info"
 2016-03-18 15:09:53 +00:00
Maria Garcia Puyol
c35b08b4b3 Merge "Revert "Dialog for emergency info"" into nyc-dev 2016-03-18 15:06:02 +00:00
Tony Mak
25c3c54c03 Should read specific user's password restriction 
Bug: 27330307
Bug: 27543548

Change-Id: I385d190bdd8138f7189c657498f6a55bf84668ea
 2016-03-18 14:49:52 +00:00
Philip P. Moltmann
f9f4429f80 Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev 
am: 47a9d4f

* commit '47a9d4f70c21cb8b19af5699fb9522668dc0fb6a':
  Correctly compose activity name of add-printer and print-settings activity
 2016-03-18 14:32:43 +00:00
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
Maria Garcia Puyol
da497f26d7 Revert "Dialog for emergency info" 
This reverts commit ae49edbdfd.

Change-Id: I01a4b5966b380d967588bd0411e80d6bcd431fd1
 2016-03-17 22:52:44 +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
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
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
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
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
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
Julia Reynolds
7c802419fd Merge "Fix build" into nyc-dev 2016-03-17 18:07:48 +00:00
Julia Reynolds
40a82187c5 Fix build 
Bug: 27709695
Change-Id: I2020a33aa0a305e025d7d004df4b23838bb42992
 2016-03-17 13:58:15 -04:00