PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,101 Commits 1 Branch 0 Tags
262148ecbd004c07556e13e143c66b51b679b332
Commit Graph

9347 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Abodunrinwa Toki
af700ec6e0 Work challenge background: Fix top padding 
Bug: 27693796
Change-Id: Iafda9dfed2b87c3618c155d4434d5895547f6fe0
 2016-03-17 18:48:05 +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
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
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
Mahaver Chopra
bef02df556 Merge "Title text and input bar should be white" into nyc-dev 2016-03-17 17:49:34 +00:00
Mahaver Chopra
78a4bcd419 Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev 2016-03-17 17:48:35 +00:00
Daichi Hirono
23f4261e3d Merge "Use CheckableLinearLayout for Use USB for dialog's item." into nyc-dev 2016-03-17 10:05:49 +00:00
Daichi Hirono
9300eb1b14 Use CheckableLinearLayout for Use USB for dialog's item. 
The root of "Use USB for" dialog's item is CheckableLinearLayout, which
defers the check state to direct children. However previously we had
CheckedTextView not just under CheckableLinearLayout. The structure
looks like:

Root CheckableLinearLayout -> LinearLayout -> CheckedTextView

The CL replaces the second child LinearLayout with CheckableLinearLayout
so that we can defer the state to CheckedTextView.

BUG=27708922

Change-Id: If0491235eac0a82bcb07e31856aa6b9535930fb2
 2016-03-17 15:57:36 +09:00
Sudheer Shanka
f1e78d35dc Add disabled by policy empty views to more screens. 
Bug: 27588316
Bug: 27588671
Bug: 27588740
Change-Id: Id614067d76e936e9c3c585fdaed304bfbc88dc74
 2016-03-16 22:33:37 -07:00
Meng Wang
2ccf1fd7c9 Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev 2016-03-16 23:24:40 +00:00
Robin Lee
d0979a540b Merge "Show "no vpns added" for empty vpn screen" into nyc-dev 2016-03-16 21:30:54 +00:00
Robin Lee
eb034eb65e Show "no vpns added" for empty vpn screen 
Removed the left-alignment on restricted empty views which was
inherited from Bluetooth settings but inconsistent with normal
settings fragments.

Bug: 22685111
Change-Id: I3a36c47d523392b8925031d4cac2ab3ef681e360
 2016-03-16 20:28:52 +00:00
Mahaver Chopra
c63ef946d4 Title text and input bar should be white 
Bug: 27147209

Change-Id: I428ae98ef60db22d50305df39d8d16e63bd5e14f
 2016-03-16 17:42:24 +00:00
Mahaver Chopra
8b06553a27 Work Profile Security Challenge: Finalised strings 
Bug: 25601630

Change-Id: I388fba7dc08196faed35f2e990d558d22a6bbaa4
 2016-03-16 17:28:58 +00:00
Julia Reynolds
6af2af0fd7 Merge "String and accessibility changes." into nyc-dev am: bfde3fd 
am: 9adb7bd

* commit '9adb7bd370f3a93dee950531cfa62affc930b1e4':
  String and accessibility changes.
 2016-03-16 17:18:35 +00:00
Julia Reynolds
9adb7bd370 Merge "String and accessibility changes." into nyc-dev 
am: bfde3fd

* commit 'bfde3fd0852364e957e1f98279ff19272df21894':
  String and accessibility changes.
 2016-03-16 17:14:12 +00:00