PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,768 Commits 1 Branch 0 Tags
d525470d4b7a290b7a55ee244d47f8e486cfe72c
Commit Graph

8768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Brenner
7f9b56818e am 553074f0: Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev 
* commit '553074f0fc2aa46f44797b72f1457146697645b6':
  Return RESULT_OK when wifi connection established
 2012-10-10 10:33:42 -07:00
Amith Yamasani
fee5c228c7 am 7f2824b9: Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev 
* commit '7f2824b924775e78192fb12c342b38558cf304b5':
  Go back to top of list when Settings is relaunched
 2012-10-10 10:33:41 -07:00
Russell Brenner
553074f0fc Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev 2012-10-10 10:31:59 -07:00
Amith Yamasani
7f2824b924 Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev 2012-10-10 10:31:59 -07:00
The Android Open Source Project
e27230bcc0 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: Ife169d168234a820ca8b769bb06fcd01be6c36a9
 2012-10-10 09:45:51 -07:00
The Android Automerger
40aa4b6c00 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 08:58:47 -07:00
The Android Automerger
1fde70549d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:49 -07:00
Amith Yamasani
ef6172304b Go back to top of list when Settings is relaunched 
Also fixes slight movements when coming back from Add account.

Bug: 7312513
Bug: 7318452
Change-Id: I5b07262de52e6bdf98e75fff98a032afd74fc0e5
 2012-10-09 16:57:25 -07:00
Irfan Sheriff
f3153e3b23 am 196f1bd0: am a92f380f: Merge "Have poor network avoidance turned off by default" into jb-mr1-dev 
* commit '196f1bd0d03255d25c907390d907f9114e3d4749':
  Have poor network avoidance turned off by default
 2012-10-09 16:35:52 -07:00
Irfan Sheriff
196f1bd0d0 am a92f380f: Merge "Have poor network avoidance turned off by default" into jb-mr1-dev 
* commit 'a92f380f866be566d2f47ffa14ade81e6551ca56':
  Have poor network avoidance turned off by default
 2012-10-09 16:33:51 -07:00
Irfan Sheriff
a92f380f86 Merge "Have poor network avoidance turned off by default" into jb-mr1-dev 2012-10-09 16:32:25 -07:00
Irfan Sheriff
ba50175b1c Have poor network avoidance turned off by default 
Bug: 7318044
Change-Id: I1c86ffd2dae168a3eb35f08cd09096a7f28de2a9
 2012-10-09 16:18:36 -07:00
Russell Brenner
3067fbce2e Return RESULT_OK when wifi connection established 
Two new exit points were not setting a return result. Since the
default result for an activity is RESULT_CANCEL, Setup Wizard was
continuing as if no connection was made.

Bug: 7298234
Change-Id: I44085f38ed021b7d417f9794b3341747f00300e9
 2012-10-09 16:17:12 -07:00
alanv
f4f1b8002a Fix accessibility gesture summary text. 
Bug: 7309663
Change-Id: I669e26d0ffafe73f0fc9296c4ba91c7c08a89ae0
 2012-10-09 11:05:45 -07:00
The Android Open Source Project
e0ad4582ba Reconcile with jb-mr1-release - do not merge 
Change-Id: I15288380319ae85b0f1cf03ab6b83913bf2525dd
 2012-10-09 07:30:44 -07:00
The Android Automerger
28eee7ea10 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 06:59:52 -07:00
Baligh Uddin
f5f09b9d89 am 11e3cdc0: am 2fc94035: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '11e3cdc02131e5ac67b50c1868ed1c0fd3a31a29':
  Import translations. DO NOT MERGE
 2012-10-08 21:59:25 -07:00
Baligh Uddin
4210c2234d am 2d56d320: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '2d56d3204b0457aecb740e8f7c64908496ac027b':
  Import translations. DO NOT MERGE
 2012-10-08 21:58:00 -07:00
Baligh Uddin
11e3cdc021 am 2fc94035: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2fc940351f907e3bea533363bd4a103be65c3855':
  Import translations. DO NOT MERGE
 2012-10-08 21:57:43 -07:00
Baligh Uddin
2d56d3204b Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-08 21:56:21 -07:00
Baligh Uddin
2fc940351f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 21:56:00 -07:00
Baligh Uddin
b7fcea533a Import translations. DO NOT MERGE 
Change-Id: Id0bdf68adcdbafb85d848aacc2ceccc5f619fba3
Auto-generated-cl: translation import
 2012-10-08 19:29:33 -07:00
Baligh Uddin
a56c899411 Import translations. DO NOT MERGE 
Change-Id: Id639ce95426ed53b9ef62c0c59866cc43faf5c39
Auto-generated-cl: translation import
 2012-10-08 19:26:32 -07:00
Svetoslav Ganov
e002c0f088 am f04ac7ee: am a1e406b5: Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev 
* commit 'f04ac7eed178ebc47fc672774804b72005325642':
  Accessibility settings should update after gesture to enable accessibility.
 2012-10-08 16:39:52 -07:00
Svetoslav Ganov
f04ac7eed1 am a1e406b5: Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev 
* commit 'a1e406b58ece0ee7fc3bc5f0ee39c81a61216e74':
  Accessibility settings should update after gesture to enable accessibility.
 2012-10-08 16:38:00 -07:00
Svetoslav Ganov
a1e406b58e Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev 2012-10-08 16:35:52 -07:00
Svetoslav Ganov
1f81c0542e Accessibility settings should update after gesture to enable accessibility. 
1. We have added a global gesture to enable accessibility which is long press
   on power follower by a long press with two fingers. If this gesture is
   performed when accessibility settings are on the screen, accessibility and
   the screen-reader are enabled while the UI does not reflect that and the
   user may try to enable the already enabled screen-reader which will show
   two irrelevant warning dialogs - one for enabling the screen-reader and
   one for enabling explore by touch (assuming the screen-reader requests it).
   This change adds a simple content observer for the relevant accessibility
   settings which upon a change calls the functions to refresh the settings UI.

bug:7309127

Change-Id: I45851d7789e24e9e0a5bc5aaac39db9a12b60e0c
 2012-10-08 16:03:34 -07:00
Vikram Aggarwal
563e450630 am 902ad875: am 86508085: Remove further logging 
* commit '902ad8759cd22d9e1c90e75aa068a6d5cb9f9532':
  Remove further logging
 2012-10-08 13:35:18 -07:00
Vikram Aggarwal
902ad8759c am 86508085: Remove further logging 
* commit '86508085ea181f2d514569a5cf4fe0633d90b843':
  Remove further logging
 2012-10-08 13:32:52 -07:00
Vikram Aggarwal
86508085ea Remove further logging 
Bug: 7302014 CryptKeeper logs PII data

Change-Id: Ifb18c428c70e97f28ceeced2fa0aa6e9247a5372
 2012-10-08 12:59:54 -07:00
Jake Hamby
58f594284e am 837bb033: am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev 
* commit '837bb033200ccd988586af7a0b6032ee9d6b9673':
  Allow disconnected BT profiles to be unchecked in Settings.
 2012-10-08 12:18:10 -07:00
Jake Hamby
837bb03320 am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev 
* commit '283dce21b4902b1d0fa77c26f37f885203647d3a':
  Allow disconnected BT profiles to be unchecked in Settings.
 2012-10-08 12:15:46 -07:00
Jake Hamby
283dce21b4 Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev 2012-10-08 12:13:14 -07:00
Vikram Aggarwal
f36ebae7a2 am 075dfeaa: am c3ebad20: Remove verbose logging 
* commit '075dfeaaac139a20cf24890b3d6e4c395124621e':
  Remove verbose logging
 2012-10-08 10:06:05 -07:00
Vikram Aggarwal
075dfeaaac am c3ebad20: Remove verbose logging 
* commit 'c3ebad20f24299a680caa4ab70e22e9042df405e':
  Remove verbose logging
 2012-10-08 10:04:04 -07:00
Vikram Aggarwal
c3ebad20f2 Remove verbose logging 
Bug: 7302014 CryptKeeper logs PII data

Change-Id: I4dec3a827a5b6880b1c0995b8adebf34315c4773
 2012-10-08 09:13:07 -07:00
Baligh Uddin
42466cddc3 am e5351aab: am df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'e5351aab40c39f44d28bb6bc0213b67ef3adb9d2':
  Import translations. DO NOT MERGE
 2012-10-08 07:55:56 -07:00
Baligh Uddin
cd8234e606 am 36391cc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '36391cc61a013e6932513c100a2128a668ac4e27':
  Import translations. DO NOT MERGE
 2012-10-08 07:55:55 -07:00
Baligh Uddin
e5351aab40 am df54b396: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'df54b396941adb14107ce54a61b78f2a9378ec09':
  Import translations. DO NOT MERGE
 2012-10-08 07:55:08 -07:00
Baligh Uddin
36391cc61a Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-08 07:54:28 -07:00
Baligh Uddin
df54b39694 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 07:53:46 -07:00
The Android Automerger
15bebe0da0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 16:05:35 -07:00
Amith Yamasani
0f136cfd4f am 40cbecb8: am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev 
* commit '40cbecb8c3081c778c2a83d80b71981f2f4bb169':
  Fix layout for decryption password entry.
 2012-10-07 14:06:03 -07:00
Amith Yamasani
40cbecb8c3 am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev 
* commit '29707a501c6f61108e479a6129e89791dc5a1f36':
  Fix layout for decryption password entry.
 2012-10-07 14:04:10 -07:00
Amith Yamasani
29707a501c Merge "Fix layout for decryption password entry." into jb-mr1-dev 2012-10-07 14:02:26 -07:00
Svetoslav Ganov
5c9283fbf8 am 450a7ad6: am 7e54c544: Clean up \'accessibility shortcut\' screen. 
* commit '450a7ad6a35c25d1307c90e364590b32ea44d2fa':
  Clean up 'accessibility shortcut' screen.
 2012-10-07 12:05:13 -07:00
Svetoslav Ganov
450a7ad6a3 am 7e54c544: Clean up \'accessibility shortcut\' screen. 
* commit '7e54c544aa3b16245486cf3787e79cab5bbdb651':
  Clean up 'accessibility shortcut' screen.
 2012-10-07 12:03:45 -07:00
Svetoslav Ganov
7e54c544aa Clean up 'accessibility shortcut' screen. 
1. Last polishes to the accessibility shortcut screen.

bug:7298927

Change-Id: I8109f215c63eeaa6ea4bf589aa4af897d09c5e03
 2012-10-07 11:48:57 -07:00
The Android Automerger
65eedd181c merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 06:59:55 -07:00
Amith Yamasani
d2e414c2b6 Fix layout for decryption password entry. 
Use the same layout for landscape and portrait, which vertically centers
the password entry field. Works fine for portrait.

Also removed some vestigial keyboard view in the layout.

Bug: 7298970
Change-Id: I499468dda5e6eb46815fd0bed786d14c892cc830
 2012-10-07 06:34:47 -07:00