PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,304 Commits 1 Branch 0 Tags
a0b700d8d523a69457c7da314ae68c38d59014e8
Commit Graph

27304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Chang
a0b700d8d5 Merge "Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989 am: 6e7c3db5a1" into nyc-mr1-dev-plus-aosp 
am: 69b034362f

* commit '69b034362f87d390d41c1dcaeb252795468ac184':

Change-Id: If4d099973d8f9de6957057bed66381547f2b3f29
 2016-04-22 11:20:17 +00:00
Victor Chang
38360c7752 Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989 am: 794eb82166 
am: 1471de9f51

* commit '1471de9f5107072371297a821a521a43a6140be5':
  Disable trust button when no screenlock is set

Change-Id: I521be18bfac3be4128b34049ea4f5dd6c56511e3
 2016-04-22 11:20:16 +00:00
Android Build Merger (Role)
69b034362f Merge "Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989 am: 6e7c3db5a1" into nyc-mr1-dev-plus-aosp 2016-04-22 11:18:08 +00:00
Victor Chang
12a56e4758 Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989 
am: 6e7c3db5a1

* commit '6e7c3db5a1ad0084fb086a4728ba1ddadb3d8ee9':
  Disable trust button when no screenlock is set

Change-Id: I9170170fbb668ee70bb3ddeb640f06662d843098
 2016-04-22 11:17:59 +00:00
Victor Chang
1471de9f51 Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989 
am: 794eb82166

* commit '794eb82166b048db95749154cf1b60e6fd62954f':
  Disable trust button when no screenlock is set

Change-Id: I36d25ffe4b1b854f5b57a89244b9f099d3b87e9e
 2016-04-22 11:17:58 +00:00
Victor Chang
794eb82166 Merge "Disable trust button when no screenlock is set" into nyc-dev 
am: 8f5c694989

* commit '8f5c6949894ac0ccafa7371b4bb872abbfe41de9':
  Disable trust button when no screenlock is set

Change-Id: I30426f91728ea924a9e02c08111c76a100607910
 2016-04-22 11:15:45 +00:00
Victor Chang
6e7c3db5a1 Merge "Disable trust button when no screenlock is set" into nyc-dev 
am: 8f5c694989

* commit '8f5c6949894ac0ccafa7371b4bb872abbfe41de9':
  Disable trust button when no screenlock is set

Change-Id: Ia77ade5bb72dbb3de77a12ca4a6f921b4eb851d8
 2016-04-22 11:15:44 +00:00
Victor Chang
8f5c694989 Merge "Disable trust button when no screenlock is set" into nyc-dev 2016-04-22 11:02:42 +00:00
Tony Mak
31ae032e99 Merge "New UI to hint user about strong auth" into nyc-dev am: b3146b0071 am: 4c724a3e48 
am: 721392fdc8

* commit '721392fdc82be9d850ae0c749a19ea9df6690eb2':

Change-Id: I01115a9e7cb73d5fab35bf2f1a81950f68ad618d
 2016-04-22 09:44:34 +00:00
Tony Mak
abe8cd67e4 Merge "New UI to hint user about strong auth" into nyc-dev am: b3146b0071 am: 968691d94d 
am: a0b492a3c8

* commit 'a0b492a3c8003cbdc0118f9f45349ea536939efe':
  New UI to hint user about strong auth

Change-Id: Id97b4b9c0c14e6d4cd0b0d2df6018adb9bab8b3c
 2016-04-22 09:44:33 +00:00
Tony Mak
721392fdc8 Merge "New UI to hint user about strong auth" into nyc-dev am: b3146b0071 
am: 4c724a3e48

* commit '4c724a3e484e46004caee359c4fd4153f1aa5e84':

Change-Id: I49c9b4aef6264187a2c12d1e970451e7303ffdf6
 2016-04-22 09:42:59 +00:00
Tony Mak
a0b492a3c8 Merge "New UI to hint user about strong auth" into nyc-dev am: b3146b0071 
am: 968691d94d

* commit '968691d94d3bde08362b0a9a1265aa8458b7f295':
  New UI to hint user about strong auth

Change-Id: I1508805e84366b26c54f6aea724c73003501ec01
 2016-04-22 09:42:06 +00:00
Tony Mak
968691d94d Merge "New UI to hint user about strong auth" into nyc-dev 
am: b3146b0071

* commit 'b3146b007137f0a552025ed76e8619ad9d44c4f1':
  New UI to hint user about strong auth

Change-Id: I44f3a81ff5e2326aabd02072af8c899adc5cdf95
 2016-04-22 09:39:59 +00:00
Tony Mak
4c724a3e48 Merge "New UI to hint user about strong auth" into nyc-dev 
am: b3146b0071

* commit 'b3146b007137f0a552025ed76e8619ad9d44c4f1':
  New UI to hint user about strong auth

Change-Id: Ibd11eeff11e7fdb6bffd7fcfd80b751935174421
 2016-04-22 09:39:55 +00:00
Tony Mak
b3146b0071 Merge "New UI to hint user about strong auth" into nyc-dev 2016-04-22 09:31:37 +00:00
Maurice Lam
8f1dbc1ace Merge "Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 am: 2ad9f41310" into nyc-mr1-dev-plus-aosp 
am: 0da23fd0cb

* commit '0da23fd0cbec84f72ece710667284a78b19c7ed8':

Change-Id: Ia179be6060710d1b84f831498d9d441e366a370c
 2016-04-21 22:28:49 +00:00
Maurice Lam
da19cc42f7 Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 am: b5e80b1c56 
am: a752547483

* commit 'a752547483243ca7dee041faa8f373dd676ce48f':
  [Fingerprint] Update strings

Change-Id: I2c471b8f6eaa457063b4b9ed87e74cc6f7967f42
 2016-04-21 22:28:48 +00:00
Android Build Merger (Role)
0da23fd0cb Merge "Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 am: 2ad9f41310" into nyc-mr1-dev-plus-aosp 2016-04-21 22:26:52 +00:00
Maurice Lam
9e71bea21a Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 
am: 2ad9f41310

* commit '2ad9f41310754cc61d2c8ab55674ccdaefb904bf':
  [Fingerprint] Update strings

Change-Id: I3ac0227fc6cfc061c031fe7cfb11f26d6e025cca
 2016-04-21 22:26:45 +00:00
Maurice Lam
a752547483 Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 
am: b5e80b1c56

* commit 'b5e80b1c5609e9b0c27d19504426a4f978f8c4f2':
  [Fingerprint] Update strings

Change-Id: I778275d60ea567a899406c9467c7196228388991
 2016-04-21 22:26:38 +00:00
Maurice Lam
b5e80b1c56 Merge "[Fingerprint] Update strings" into nyc-dev 
am: 498ec55ba3

* commit '498ec55ba3cc06515d9f19e4990771ce36734206':
  [Fingerprint] Update strings

Change-Id: I99bcc81112e55e8c1d6802ce7537d49c8aa1b081
 2016-04-21 22:24:28 +00:00
Maurice Lam
2ad9f41310 Merge "[Fingerprint] Update strings" into nyc-dev 
am: 498ec55ba3

* commit '498ec55ba3cc06515d9f19e4990771ce36734206':
  [Fingerprint] Update strings

Change-Id: I9f57efcaea6d856589f0cb1cce37db34f156a7f6
 2016-04-21 22:24:13 +00:00
Maurice Lam
498ec55ba3 Merge "[Fingerprint] Update strings" into nyc-dev 2016-04-21 22:06:04 +00:00
Mihai Nita
e356b03606 Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5 am: 8225f4eeb1 
am: d3be403652

* commit 'd3be403652e78568d2b984269bf364497f775cd7':

Change-Id: I7f091d30461695ba99fe92509c8b2d9d8f6164c1
 2016-04-21 20:25:51 +00:00
Mihai Nita
a920a31196 Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5 am: 093817bd23 
am: 59368baca7

* commit '59368baca700e813f3a35334925b2168f3a3c8f7':
  Settings: change the TTS text to use the current locale

Change-Id: I13f0f019e784f2832af597371d1b1acf11e63bac
 2016-04-21 20:25:50 +00:00
Amit Mahajan
75bbf7bcaa Merge "Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: 33c6972453" into nyc-mr1-dev-plus-aosp 
am: 80219b3060

* commit '80219b30608859ab2cb88ea81082d6f662a1045c':

Change-Id: I0d1a702b337039e58dbc5ff01a9608e1a99acf32
 2016-04-21 20:25:50 +00:00
yifan.bai
d9dc35c0a1 Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: c91589bddf 
am: db6cedcfe7

* commit 'db6cedcfe7643d17e8dc71e1ba81a9bad4676810':
  Fix ApnSettings crash issue.

Change-Id: I0bc65723fab3a9d7d47f0a123e599f54eb3a717c
 2016-04-21 20:25:49 +00:00
Robin Lee
0ac236461a Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c am: 69f12b6e6f 
am: eaad6d7fcc

* commit 'eaad6d7fcc4e4382db58f2c76df29af0dcdc5cda':

Change-Id: Ifecc4290f23f6035c411a94e249145d79147acf8
 2016-04-21 20:25:48 +00:00
Robin Lee
02ba0a13a3 Merge "resolve merge conflicts of 04c7dc2 to master" 2016-04-21 20:16:06 +00:00
Mihai Niță
d3be403652 Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5 
am: 8225f4eeb1

* commit '8225f4eeb1bd8d5c3102d70a60ec0db9b729068d':

Change-Id: I7631bd9250506f40e292c72d17aa5b05a59885fb
 2016-04-21 20:07:33 +00:00
Mihai Niță
59368baca7 Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5 
am: 093817bd23

* commit '093817bd237dd757db150689a8acdc5d75feeecc':
  Settings: change the TTS text to use the current locale

Change-Id: I962d11edeb49d1caa814a9f96248d0094a4223be
 2016-04-21 20:05:36 +00:00
Mihai Nita
8225f4eeb1 Merge "Settings: change the TTS text to use the current locale" into nyc-dev 
am: b1cdea67a5

* commit 'b1cdea67a5e2dda1ece17df4b98f20e7eeaa8a46':
  Settings: change the TTS text to use the current locale

Change-Id: I3dbff4d2ab2b2cb34ab0adf765a75f0bafd33aa8
 2016-04-21 20:03:15 +00:00
Mihai Nita
093817bd23 Merge "Settings: change the TTS text to use the current locale" into nyc-dev 
am: b1cdea67a5

* commit 'b1cdea67a5e2dda1ece17df4b98f20e7eeaa8a46':
  Settings: change the TTS text to use the current locale

Change-Id: I1f7098ef1541f9ce89b2fdf2e701cd87166ba777
 2016-04-21 20:03:14 +00:00
Mihai Niță
b1cdea67a5 Merge "Settings: change the TTS text to use the current locale" into nyc-dev 2016-04-21 19:55:42 +00:00
Android Build Merger (Role)
80219b3060 Merge "Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: 33c6972453" into nyc-mr1-dev-plus-aosp 2016-04-21 19:51:51 +00:00
Amit Mahajan
ce19d8d97f Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e 
am: 33c6972453

* commit '33c69724536847fbd0272f48e359565a8772a405':
  Fix ApnSettings crash issue.

Change-Id: Ic03b9c03495c5c6999b375c8eb4c485ad9ea2cd5
 2016-04-21 19:51:44 +00:00
Amit Mahajan
db6cedcfe7 Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e 
am: c91589bddf

* commit 'c91589bddf7b170cca768584c0b607bf9bd3951d':
  Fix ApnSettings crash issue.

Change-Id: I0f5aee07478f05b2442d1dd8ab8c478a2da17786
 2016-04-21 19:51:42 +00:00
yifan.bai
c91589bddf Merge "Fix ApnSettings crash issue." into nyc-dev 
am: afdcb6a78e

* commit 'afdcb6a78ebc1c5c685e0b24fbf6bb5c23434b95':
  Fix ApnSettings crash issue.

Change-Id: I00942a1d1cc6d1da14cfe31f32fd813796c20fa2
 2016-04-21 19:49:29 +00:00
yifan.bai
33c6972453 Merge "Fix ApnSettings crash issue." into nyc-dev 
am: afdcb6a78e

* commit 'afdcb6a78ebc1c5c685e0b24fbf6bb5c23434b95':
  Fix ApnSettings crash issue.

Change-Id: I01da009772e6689a62fca6686900039ec4201fb5
 2016-04-21 19:49:28 +00:00
Andrew Sapperstein
18b6b04772 Merge "Delete ToastController." 2016-04-21 19:45:53 +00:00
Amit Mahajan
afdcb6a78e Merge "Fix ApnSettings crash issue." into nyc-dev 2016-04-21 19:41:13 +00:00
Robin Lee
99301e06fa resolve merge conflicts of 04c7dc2 to master 
Change-Id: I65d9aa34af7d9138b8b0b5ee76dc0de800d88d26
 2016-04-21 20:39:13 +01:00
yifan.bai
27b908f6d1 Fix ApnSettings crash issue. 
Steps:
1. Add a new APN;
2. Click 'Reset to default';
3. During reset, click the new APN;
4. Crash happened.
Solution:
Disable menu items when reseting default APN.

Bug: 28314239
Change-Id: I8df439d066e58039e9f91a9be642127eb7298159
 2016-04-21 19:23:25 +00:00
Robin Lee
eaad6d7fcc Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c 
am: 69f12b6e6f

* commit '69f12b6e6f405ea0f8205efe11cddc5bb25c54dc':

Change-Id: Id1f0ba90111b8f233a1444d8b97e1ab7c3f6eb2d
 2016-04-21 19:22:35 +00:00
Robin Lee
04c7dc2424 Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c 
am: 4a588faeb8

* commit '4a588faeb8597fcfe49e1eac90307fb3fbdab244':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I398e1c8ee75c0cec6a569cc469996a5867d8975c
 2016-04-21 19:20:05 +00:00
Robin Lee
4a588faeb8 Merge changes Ibac27ee1,I336aeefd into nyc-dev 
am: e2ae135d3c

* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I5d447989c9a149314bf0fcde0e4f1f77b868f40e
 2016-04-21 19:17:51 +00:00
Robin Lee
69f12b6e6f Merge changes Ibac27ee1,I336aeefd into nyc-dev 
am: e2ae135d3c

* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I93ffd1d56ca9ff4d8e9c8e16fc897e2368ae1260
 2016-04-21 19:17:50 +00:00
Robin Lee
e2ae135d3c Merge changes Ibac27ee1,I336aeefd into nyc-dev 
* changes:
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs
 2016-04-21 19:13:49 +00:00
Fan Zhang
b31f7562ff Merge "Open Help forum in browser when click \'Forum\' button." into nyc-mr1-dev am: dd2797d3ef 
am: ac42fbcfec

* commit 'ac42fbcfec708562060fd9befa729825fe400948':
  Open Help forum in browser when click 'Forum' button.

Change-Id: If2efcafb649f105a0ac9f95e7d466c552f3a5149
 2016-04-21 18:50:34 +00:00
Fan Zhang
ac42fbcfec Merge "Open Help forum in browser when click \'Forum\' button." into nyc-mr1-dev 
am: dd2797d3ef

* commit 'dd2797d3eff2ab2bb0b42efba4319c6a1249a4c4':
  Open Help forum in browser when click 'Forum' button.

Change-Id: I287fe83878876329eb95a2384c5e47b3f55635bc
 2016-04-21 18:48:16 +00:00