PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,538 Commits 1 Branch 0 Tags
5b5846b29a3be40ce9fccf066aa7c2ca87d89fe0
Commit Graph

16538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurice Lam
b4f5e0bd61 am 2ffb10d2: am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit '2ffb10d28bd1945004bd29390803a81ce5bf3338':
  [WifiSetup] Update connection state for auto-finish
 2014-09-16 19:44:14 +00:00
Maurice Lam
2ffb10d28b am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit 'fd4e0f2567c97c71615d8defc3b12ed51ce77c05':
  [WifiSetup] Update connection state for auto-finish
 2014-09-16 19:36:47 +00:00
Maurice Lam
fd4e0f2567 am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit '27d74fa288c195aa5e1190da5599965472f1aded':
  [WifiSetup] Update connection state for auto-finish
 2014-09-16 18:47:07 +00:00
Maurice Lam
27d74fa288 Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 2014-09-16 18:35:39 +00:00
Baligh Uddin
072f390b58 am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'fbb0218a117df5537f6ef2835a673ef485e1cdb1':
  Import translations. DO NOT MERGE
 2014-09-16 18:22:37 +00:00
Maurice Lam
610fdf3343 [WifiSetup] Update connection state for auto-finish 
In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.

Bug: 17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3
 2014-09-16 11:05:28 -07:00
Baligh Uddin
fbb0218a11 am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '1741abb95c2a30cd10ba829aca345b3d919f3ef6':
  Import translations. DO NOT MERGE
 2014-09-16 18:03:21 +00:00
Baligh Uddin
1741abb95c am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '09a11d5bf4c42a7cd2eac4469933109a29f5bb68':
  Import translations. DO NOT MERGE
 2014-09-16 15:26:42 +00:00
Baligh Uddin
09a11d5bf4 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:16:37 +00:00
PauloftheWest
79c32a04b5 am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit 'd1cd913a6e1dc35da4d5e0c1fc4b48a0e382d486':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-16 09:07:08 +00:00
Edward Jee
1386bd9873 am 000dd0a6: am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
* commit '000dd0a6b24a8c383a2051201699bd2c93bc4159':
  Migrates PBAP and MAP access permission data from Settings to Bluetooth.
 2014-09-16 09:07:07 +00:00
Edward Jee
170be5c8c8 am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 09:07:06 +00:00
PauloftheWest
88f7fa0b9e am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '8dee66d1248af1aa28b32d11b1b3160ab3a79437':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 09:07:05 +00:00
Dianne Hackborn
1e6b685828 am 2acec676: am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit '2acec6768fc67516eff484f6d4f8de607a597a60':
  Little more on issue #17495264: tweak when we ignore initial times.
 2014-09-16 09:07:04 +00:00
Dianne Hackborn
0f4c5f15a0 am ff966f2a: am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit 'ff966f2a82044bed1d9d791be9aa0c30c8bb26cc':
  Fix issue #17495264: Battery history graph is bad
 2014-09-16 09:07:03 +00:00
Maurice Lam
e1300a2c9b am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window 
* commit 'ea8db10ac8fc3aafd7834c401aacf7245b244936':
  [WifiSetup] Disable app starting window
 2014-09-16 09:07:02 +00:00
PauloftheWest
d1cd913a6e am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit '9007cf6369eee6179082de8c769da6cad4906831':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-16 08:52:57 +00:00
Edward Jee
000dd0a6b2 am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
* commit 'a99ef8871e204a04bc2b6436eede2078f8001b98':
  Migrates PBAP and MAP access permission data from Settings to Bluetooth.
 2014-09-16 08:52:57 +00:00
Edward Jee
32c56ed434 am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '50b6eec908fa76dfe426016d621cda3b013846b1':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 08:52:55 +00:00
PauloftheWest
8dee66d124 am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '720af58039c31bbf9f239600a898202b971987f5':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 08:52:54 +00:00
Dianne Hackborn
2acec6768f am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit 'bf4ecab3ebf691dec8c2734f3dce9a547ea32ad5':
  Little more on issue #17495264: tweak when we ignore initial times.
 2014-09-16 08:52:53 +00:00
Dianne Hackborn
ff966f2a82 am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit '829b9975b682fcc2c2404fa1ec7397ee5d4cfcae':
  Fix issue #17495264: Battery history graph is bad
 2014-09-16 08:52:52 +00:00
Maurice Lam
ea8db10ac8 am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window 
* commit '0d09c6c190436ffc28dd9c04af1a1e7aa203463c':
  [WifiSetup] Disable app starting window
 2014-09-16 08:52:51 +00:00
PauloftheWest
9007cf6369 am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit 'ec21e62a78d98dfb22faeb8bd27ac07061ae83a3':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-16 08:32:12 +00:00
Edward Jee
a99ef8871e am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
* commit 'ac8b5b7fd6b6774d22d39bb9a4becca1908915c7':
  Migrates PBAP and MAP access permission data from Settings to Bluetooth.
 2014-09-16 08:32:11 +00:00
Edward Jee
50b6eec908 am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit 'b0954c1d1e02958fd357cae11613f4539fbe270a':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 08:32:10 +00:00
PauloftheWest
720af58039 am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '0ca0c8ad20e5c630c62bc83e53b8d552a35a3e90':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 08:32:09 +00:00
Dianne Hackborn
bf4ecab3eb am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit '94aae9afd18c17848aed68addd19d93c937c7555':
  Little more on issue #17495264: tweak when we ignore initial times.
 2014-09-16 08:32:08 +00:00
Dianne Hackborn
829b9975b6 am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit 'ecffbc91b15ec558be27fd171a64ad5db9e2b7d1':
  Fix issue #17495264: Battery history graph is bad
 2014-09-16 08:32:07 +00:00
Maurice Lam
0d09c6c190 am 795511ec: [WifiSetup] Disable app starting window 
* commit '795511ec9c952041afb158d43dd22960443b503f':
  [WifiSetup] Disable app starting window
 2014-09-16 08:32:06 +00:00
PauloftheWest
9b6f42b309 am f1fc7219: am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit 'f1fc7219298b5c8dd0bf5c695f3f3942289a05df':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-16 08:30:51 +00:00
PauloftheWest
ec21e62a78 Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 2014-09-16 02:13:29 +00:00
Edward Jee
ac8b5b7fd6 Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.

However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.

Bug: 17158953
Change-Id: I44fde350ea35027df0de77feec1ea19c65f2f1c6
 2014-09-16 01:25:47 +00:00
Edward Jee
b0954c1d1e Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 2014-09-16 01:19:07 +00:00
PauloftheWest
fed937f07a am 75b8535f: am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev 
* commit '75b8535f7d7329e3b3bf2743987abae850795845':
 2014-09-15 23:55:15 +00:00
Zoltan Szatmary-Ban
d35829bcb3 am 34e537ed: am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev 
* commit '34e537ed277415530c4a811bfcd9a27a3f17bd00':
 2014-09-15 23:55:14 +00:00
Zoltan Szatmary-Ban
be146343e4 am 4c035b8f: am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 
* commit '4c035b8fe4618322d0332b92e6bc4c6e1d8f8cfb':
 2014-09-15 23:55:13 +00:00
Alexandra Gherghina
131d34aecd am c24310c9: am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 
* commit 'c24310c9638c972f7757b1f2356383730129fac6':
 2014-09-15 23:55:07 +00:00
PauloftheWest
44581c7ffd am b448ea3a: am 7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev 
* commit 'b448ea3a338fa1c7149816d06c11cb0f7431e6bb':
 2014-09-15 23:55:06 +00:00
Fabrice Di Meglio
1695f40e52 am 842feb89: am 52a48226: Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev 
* commit '842feb896192353083c7d0d0e8be422dc9124a76':
 2014-09-15 23:55:05 +00:00
Fabrice Di Meglio
c1c10754a6 am 9786d300: am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev 
* commit '9786d300a1933d0d5716bc6aa6c9b56b6261bafb':
 2014-09-15 23:55:04 +00:00
Wink Saville
c2c89bf82f am a535fcb5: am 418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit 'a535fcb5b3a3329d40214f9cf215c49b6b4719ad':
 2014-09-15 23:55:03 +00:00
Fabrice Di Meglio
f6713c2a17 am bcd1ff97: am b5caa647: Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev 
* commit 'bcd1ff97448f9b9c0dd31f20ab7f3f8108e36b8d':
 2014-09-15 23:55:02 +00:00
Dan Sandler
bb533452be am 2f64d506: am b58b5127: Fix links to notification settings activities. 
* commit '2f64d506e0823a67d9985f25232ef4c17ac14082':
 2014-09-15 23:55:01 +00:00
Vinit Deshpande
b89d110980 am 05725beb: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '05725beb3565d1eecc3c59995f3c3642d85b5556':
 2014-09-15 23:55:00 +00:00
Amith Yamasani
25661d68fd am 12997ecd: am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev 
* commit '12997ecd97f0a1c4bbcd187e5009be133af5a790':
 2014-09-15 23:54:59 +00:00
PauloftheWest
4a20069dc0 am 43454701: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit '43454701c670451dc92bf0ac9240366623c37577':
 2014-09-15 23:54:58 +00:00
Jason Monk
710b8857a8 am c8d9504e: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev 
* commit 'c8d9504eea4f144ec99ad1ee3d5ca5ada2ca7792':
 2014-09-15 23:54:57 +00:00
Paul Lawrence
f88a60f09e am 8826a64a: am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev 
* commit '8826a64a6cd4a44b55033557e5b4867bcf131e35':
 2014-09-15 23:54:56 +00:00
Maurice Lam
2b193bc952 am 8efe9278: am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev 
* commit '8efe92789ec32f7bf6f890d1196a152902212322':
 2014-09-15 23:54:55 +00:00