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
Clara Bayarri
3cb2511166 Remove fullstop at end of phrases 
Requested by UX

Bug: 27913794
Change-Id: Ieb6ace1236787128825e39c310331603f574a32b
 2016-04-01 12:39:35 +01:00
Clara Bayarri
8505258c31 Merge "Change Work Challenge background image" into nyc-dev am: 63096e9 
am: dfae146

* commit 'dfae1467ea6304da96f8505c683e9cc205c1e7dd':
  Change Work Challenge background image

Change-Id: Ibef0bc4a8164b0f496ee1e2b77b1307d23931701
 2016-04-01 11:31:23 +00:00
Clara Bayarri
dfae1467ea Merge "Change Work Challenge background image" into nyc-dev 
am: 63096e9

* commit '63096e965c1ff95b8b7eed53388aa00014500381':
  Change Work Challenge background image

Change-Id: Ib2b87c666fe73da24de6f375c74505f4b3498e21
 2016-04-01 11:27:42 +00:00
Clara Bayarri
63096e965c Merge "Change Work Challenge background image" into nyc-dev 2016-04-01 11:18:24 +00:00
Rachel Zhang
0050ac0bb7 Add suggestion carousel view and dependencies to settings 
Bug: 27752219
Change-Id: Idc14227990c902c04de5bfb6649efb6da64c9168
 2016-03-31 14:12:26 -07:00
Robin Lee
a8bf579e34 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev am: 4d29ab3 
am: e79fed2

* commit 'e79fed2839bbb70c1df111947208e00833057154':
  DISALLOW_CONFIG_CREDENTIALS blocks user credentials

Change-Id: I53a5b108a62f679e731164a8ac21f121ad21cabf
 2016-03-31 18:59:00 +00:00
Robin Lee
e79fed2839 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev 
am: 4d29ab3

* commit '4d29ab31455ae7c7eef91871230e34b3ecc452e1':
  DISALLOW_CONFIG_CREDENTIALS blocks user credentials

Change-Id: I20a82efa39f5116ba3919198418873e794fa5240
 2016-03-31 18:55:32 +00:00
Robin Lee
4d29ab3145 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev 2016-03-31 18:44:21 +00:00
Victor Chang
fc20972456 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev am: b1d7142 
am: 5cffb81

* commit '5cffb81f567009e589e2bbc8ccd3dcae15147f13':
  Show notification when failing to turn on always-on vpn

Change-Id: I2446bb50b8981800e400faf4a04f291b416afd58
 2016-03-31 17:46:38 +00:00
Robin Lee
c421db78f0 DISALLOW_CONFIG_CREDENTIALS blocks user credentials 
All settings preferences related to credentials of any kind should be
stopped by this user restriction.

Bug: 26879958
Change-Id: I983c6e58081bd4022bb006942499cba4b74954e7
 2016-03-31 18:45:43 +01:00
Victor Chang
5cffb81f56 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev 
am: b1d7142

* commit 'b1d7142cb21de23ec9c1dddb824405bf252bffed':
  Show notification when failing to turn on always-on vpn

Change-Id: I76c5ad7c545294edfeb533148ba85cdcdc41dc58
 2016-03-31 17:44:34 +00:00
Victor Chang
b1d7142cb2 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev 2016-03-31 17:04:53 +00:00
Jason Monk
ae130a27c5 Merge "Fix categeries being read out on settings dashboard" into nyc-dev am: 69446e8 
am: d09508b

* commit 'd09508b8fc2c6fd917ab2f69e1014fa96edf2e1d':
  Fix categeries being read out on settings dashboard

Change-Id: I3ffd285de257ed9171a5b0d9f11f61305f22f4bf
 2016-03-31 15:50:46 +00:00
Jason Monk
d09508b8fc Merge "Fix categeries being read out on settings dashboard" into nyc-dev 
am: 69446e8

* commit '69446e80ab95f7d01b7612a02ae35e75d9b5c609':
  Fix categeries being read out on settings dashboard

Change-Id: Ifd3c3ad560969b58557acd86a98eb299d65a4385
 2016-03-31 15:43:28 +00:00
Victor Chang
1b8855b211 Show notification when failing to turn on always-on vpn 
- Notification icon is Settings icon
- VpnName is obtained as the same way as AppPreference
- Post notification as the current user with PendingIntent to VpnSettings to parent user
- Auto-cancel when user taps on the notification
- This implementation posts notification only when the failure happens sychronously
  (Assume ConnectivityService only unset always-on package immediately after calling setAlwaysOnVpnPackageForUser)

Bug:27374485
Change-Id: I0aee38498c8cc300dd8eb9687adcae5f9dc4f8af
 2016-03-31 16:40:22 +01:00
Jason Monk
69446e80ab Merge "Fix categeries being read out on settings dashboard" into nyc-dev 2016-03-31 14:36:45 +00:00
Jason Monk
9c868652ba Fix categeries being read out on settings dashboard 
Change-Id: Ica0eec62a532fa40b57553e8e3d9fba1cba3bd4e
Fixes: 26125682
 2016-03-31 10:35:03 -04:00
Bill Yi
645c198f3e Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-31 13:23:37 +00:00
Bill Yi
120845909f Merge "Import translations. DO NOT MERGE" 2016-03-31 13:22:49 +00:00
Yohei Yukawa
a255b96253 Merge changes Ieea9a13a,Id2ae6151 into nyc-dev am: 5ffbf2e 
am: b5164e0

* commit 'b5164e04a3b64af95fa3bbfd17d51e26b0a12247':
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".

Change-Id: I8bd9ab786944093f6047f38ee4b3611b5c4211b6
 2016-03-31 06:24:27 +00:00
Yohei Yukawa
b5164e04a3 Merge changes Ieea9a13a,Id2ae6151 into nyc-dev 
am: 5ffbf2e

* commit '5ffbf2e39d8ce5bb4f1256564fe060534541c710':
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".

Change-Id: Ideeeb1062a62ed77a7d178c80469effa0c3ade7c
 2016-03-31 06:21:39 +00:00
Yohei Yukawa
5ffbf2e39d Merge changes Ieea9a13a,Id2ae6151 into nyc-dev 
* changes:
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".
 2016-03-31 06:13:54 +00:00
Bill Yi
6153baa067 Import translations. DO NOT MERGE 
Change-Id: I942bbb8156f204723bf2b421702ecf6a1ddbd7cf
Auto-generated-cl: translation import
 2016-03-30 22:29:47 -07:00
Bill Yi
da7576261b Import translations. DO NOT MERGE 
Change-Id: Ic4e77e1979b46669b31f54f2bf86f31c5f6efb67
Auto-generated-cl: translation import
 2016-03-30 21:41:30 -07:00
Daichi Hirono
4bd1684321 Merge "Change the dialog text in USB device tyep chooser." into nyc-dev am: 9856531 
am: 03f89ff

* commit '03f89ff4fabd7b93d3ad7ed4df04ed88363a12cc':
  Change the dialog text in USB device tyep chooser.

Change-Id: I1a84b9946436824abd71519cd192e6262da453da
 2016-03-31 00:40:42 +00:00
Daichi Hirono
03f89ff4fa Merge "Change the dialog text in USB device tyep chooser." into nyc-dev 
am: 9856531

* commit '9856531b450b6bdc73f0d8f4416661c10d4560ec':
  Change the dialog text in USB device tyep chooser.

Change-Id: Ided54b1ce7d00dcdf028b1d0724eae117a0f4f64
 2016-03-31 00:36:16 +00:00
Daichi Hirono
9856531b45 Merge "Change the dialog text in USB device tyep chooser." into nyc-dev 2016-03-30 23:59:05 +00:00
Mihai Nita
8adce9368b Merge "Fix missing dot in the remove language confirmation message" into nyc-dev am: 627d0af 
am: 7df8853

* commit '7df885353afd6dbe8133c4f65678301ac705bf56':
  Fix missing dot in the remove language confirmation message

Change-Id: Ia729047f2606de48cab8f71696db50867f5d63f5
 2016-03-30 22:52:42 +00:00
Mihai Nita
7df885353a Merge "Fix missing dot in the remove language confirmation message" into nyc-dev 
am: 627d0af

* commit '627d0af541b1cc008c69db5f68a402914bd21971':
  Fix missing dot in the remove language confirmation message

Change-Id: I2bb5ca2e567adb04bb8f66a067cb71fe33c46b97
 2016-03-30 22:48:29 +00:00
Mihai Niță
627d0af541 Merge "Fix missing dot in the remove language confirmation message" into nyc-dev 2016-03-30 22:37:53 +00:00
Mihai Nita
632a311c35 Fix missing dot in the remove language confirmation message 
Bug: 27709559
Change-Id: Ie0f4ecf01578a1f6317b058dfed288dcbfa28d92
 2016-03-30 14:55:30 -07:00
Noah Wang
a0c429a1b6 Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev am: 74df3ec 
am: 3859720

* commit '38597204cb0a77fb05a1b4d51386db10842d8520':
  Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82

Change-Id: I6d180d1d44799046fadbbde7f2f4a743bf1762cc
 2016-03-30 21:53:05 +00:00
Noah Wang
38597204cb Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev 
am: 74df3ec

* commit '74df3ec00247ea18ccf43c466e26dfe1a4622162':
  Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82

Change-Id: Ieb2a3374987ae69f8305aa0b03a94f907d4a4061
 2016-03-30 21:48:50 +00:00
Noah Wang
74df3ec002 Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev 2016-03-30 21:41:42 +00:00
Udam Saini
85eebb52a8 Adds a multi line preference class. 
Some preferences (namely inside the encryption interstitial) can flow
passed a single line when the font size is set to largest. We should
allow for this to extend to another line instead of using ellipsis.

bug:27875272
Change-Id: I2697ae37bfe39a4890298f82cf80fc70b93881df
 2016-03-30 14:39:42 -07:00
Noah Wang
abf6312b8d Make preview screens in font/display size settings scrollable 
Bug: 27274145
Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82
 2016-03-30 14:32:32 -07:00
Amith Yamasani
4cb667f036 Merge "Don\'t prompt twice to uninstall updates" into nyc-dev am: 8df0415 
am: 251b5a9

* commit '251b5a9a63f7b8144f9b04dc3bc595a0599c5fc3':
  Don't prompt twice to uninstall updates

Change-Id: I869bf5c84fadb15c8365dcc1b3252bebb795adc2
 2016-03-30 20:57:19 +00:00
Amith Yamasani
251b5a9a63 Merge "Don\'t prompt twice to uninstall updates" into nyc-dev 
am: 8df0415

* commit '8df04151d0461ce1520043eb74943f67f9a74aa8':
  Don't prompt twice to uninstall updates

Change-Id: I35169cfa6a2936638309b23a76c5bcd636df6dc9
 2016-03-30 20:50:43 +00:00
Amith Yamasani
8df04151d0 Merge "Don't prompt twice to uninstall updates" into nyc-dev 2016-03-30 20:43:03 +00:00
Noah Wang
f6df3bcc58 Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev am: 1308bd8 
am: 825b050

* commit '825b0506ff116f850ca81758700281da2b248b8f':
  Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035

Change-Id: I4ef8fea79b756cc902415c456b6c850c18f4eb15
 2016-03-30 20:10:47 +00:00
Noah Wang
277081a3f5 Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev am: bcf590c 
am: 88bb01d

* commit '88bb01d96f0a955a8366a7610363f959e2f71d8d':
  Set minimum height for preview screen of font/display size settings Bug: 27699996

Change-Id: I57d61b0fffc8e4425e9d2348917d5aa385e1546b
 2016-03-30 20:10:46 +00:00
Noah Wang
825b0506ff Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev 
am: 1308bd8

* commit '1308bd8bb1f1223c57a867246542ec22d7f9ef53':
  Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035

Change-Id: I73c5c49f685670b7a5f91c46dde0ac693f1d5fa2
 2016-03-30 20:06:33 +00:00
Noah Wang
88bb01d96f Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev 
am: bcf590c

* commit 'bcf590c88ad07865f20e5b1500f3815c03a32cb9':
  Set minimum height for preview screen of font/display size settings Bug: 27699996

Change-Id: I2875bbb371f8426aac82b13c8be871476cc43200
 2016-03-30 20:06:33 +00:00
Noah Wang
1308bd8bb1 Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev 2016-03-30 20:03:38 +00:00
Noah Wang
bcf590c88a Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev 2016-03-30 20:03:13 +00:00
Jason Monk
d39dee89cb Merge "Fix keywords for default home app" into nyc-dev am: c6aa18b 
am: 22e2ee8

* commit '22e2ee8638a057b5fe6e1683b4b3d3e02fd60210':
  Fix keywords for default home app

Change-Id: I7e1efd4a23a8c1b9db50ab254e792b184d17acfb
 2016-03-30 19:28:16 +00:00
Jason Monk
22e2ee8638 Merge "Fix keywords for default home app" into nyc-dev 
am: c6aa18b

* commit 'c6aa18bcd96ba5085153ad46bcf187dfe3c009f5':
  Fix keywords for default home app

Change-Id: I5dcdafcba6be8549d8ee874b131d99532959adbb
 2016-03-30 19:21:44 +00:00
Jason Monk
c6aa18bcd9 Merge "Fix keywords for default home app" into nyc-dev 2016-03-30 19:11:18 +00:00
Jason Monk
d2c753f0fb Fix keywords for default home app 
Change-Id: I38851f70d34168f906cf9b7223772bb3442852db
Fixes: 27826745
 2016-03-30 15:09:20 -04:00
Yohei Yukawa
611410a8c4 Update title to "Add or edit virtual keyboards". 
Per comment from UX, we replace "Add virtual keyboard" with
"Add or edit virtual keyboards" because the user is able to not only
enable but also disable virtual keyboards.

Bug: 27543291
Change-Id: Id2ae61519152bbe622aa5915f728a4cbbc49e078
 2016-03-30 11:40:30 -07:00