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

26087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
7c2095c048 Import translations. DO NOT MERGE am: 5f96b25 -s ours 
am: 670a9c7  -s ours

* commit '670a9c7b9820fa7c087a9006c3e5d7ced78b405a':
  Import translations. DO NOT MERGE
 2016-03-19 03:24:34 +00:00
Geoff Mendal
670a9c7b98 Import translations. DO NOT MERGE 
am: 5f96b25  -s ours

* commit '5f96b25dae8092ed5173ae89948515f1c2848f6f':
  Import translations. DO NOT MERGE
 2016-03-19 03:21:56 +00:00
Geoff Mendal
5f96b25dae Import translations. DO NOT MERGE 
Change-Id: I2683d49e5f8a7beaa6eb6ee88265cda4fae9a2ca
Auto-generated-cl: translation import
 2016-03-19 04:17:38 +01:00
Anna Galusza
533b955766 Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791" into nyc-dev am: e9b5d59 
am: 77e429b

* commit '77e429b27e24ff825053e48422b40b99aa9e73bd':
  Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791
 2016-03-18 21:44:24 +00:00
Anna Galusza
77e429b27e Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791" into nyc-dev 
am: e9b5d59

* commit 'e9b5d5980bb6b6fab60c1224375201dc31fafc8b':
  Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791
 2016-03-18 21:41:30 +00:00
Anna Galusza
e9b5d5980b Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791" into nyc-dev 2016-03-18 21:32:52 +00:00
Tony Mak
a7b25f9e71 Merge "Should read specific user\'s password restriction" into nyc-dev am: 2bfbcfa 
am: d1af8c2

* commit 'd1af8c2d6ac6ea858e67022ff76a0f938bfc5ad4':
  Should read specific user's password restriction
 2016-03-18 18:57:00 +00:00
Tony Mak
ac3471c7b9 Clear mHasResult if the result is dispatched am: b27d5b2 
am: b03e5ec

* commit 'b03e5ece2d4e27bccc681404ed755d7ce4908559':
  Clear mHasResult if the result is dispatched
 2016-03-18 18:57:00 +00:00
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
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
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
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