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

26180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ceba2863b5 Merge "Fix bluetooth device forgetting" into nyc-dev am: b56d3a6 
am: 87e213b

* commit '87e213b8dfc95e7aef880142aa58061606049975':
  Fix bluetooth device forgetting
 2016-03-18 18:22:03 +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
Anna Galusza
416f72b36c Stops black screen from being displayed on changing Vision Settings in SUW. 
Bug: 27328791

Change-Id: Ied247c3a31dfc50c0113667e63aea4a0c771f7bc
 2016-03-18 10:18:36 -07:00
mariagpuyol
9363dd0a9a Merge "Remove emergency info subtitle" into nyc-dev am: db15d8e 
am: 251e7dc

* commit '251e7dc99667f7bf4760988113f0260e9fd96b67':
  Remove emergency info subtitle
 2016-03-18 15:46:36 +00: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
Abodunrinwa Toki
37ece2770d Merge "Work challenge background: Fix top padding" into nyc-dev am: 4873230 
am: 153ce15

* commit '153ce15c311a1daf9ddf03f4c1ae9b393e12c6c7':
  Work challenge background: Fix top padding
 2016-03-18 15:41:40 +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
125f36e7d4 Merge "Revert "Dialog for emergency info"" into nyc-dev am: c35b08b 
am: 2aca50b

* commit '2aca50b6579a57603275e4a65843617ee7e9c855':
  Revert "Dialog for emergency info"
 2016-03-18 15:12:11 +00: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
2e45889912 Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev am: 47a9d4f 
am: f9f4429

* commit 'f9f4429f80f168422509b9c1b6f9126780fdd34e':
  Correctly compose activity name of add-printer and print-settings activity
 2016-03-18 14:37:41 +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
6ced6b79f3 Fix location settings crash when work profile is disabled am: 3bd4771 
am: b8e660b

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

* commit '89d419eb37d7b64fabd94189b3059699a117af1e':
  Do not connect to KeyChainService when user is not started
 2016-03-18 14:30:52 +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
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