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

16698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PauloftheWest
dbfc2fe1b3 am 9fef5db8: am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 
* commit '9fef5db88e9f67bcf54e5c1668b7475f948fb948':
 2014-09-15 23:54:54 +00:00
Fabrice Di Meglio
72c7d7052c am 8bde623e: am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 
* commit '8bde623e6574467e0417837ce98aee28674d9de2':
 2014-09-15 23:54:53 +00:00
Dan Sandler
2a1249225f am c8c5091f: am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 
* commit 'c8c5091f2612f2e74eb678727da7fb1e80210de3':
 2014-09-15 23:54:53 +00:00
PauloftheWest
84acfc617e am a8d4b005: am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev 
* commit 'a8d4b00508c6cfc975a47d956f2c460ef375c8cc':
 2014-09-15 23:54:52 +00:00
Baligh Uddin
7ddba4418b am 25728d22: (-s ours) am 48d3f0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '25728d220a3fa5cc40d20e436ca72f24a85a365c':
 2014-09-15 23:54:50 +00:00
Baligh Uddin
487e923551 am d7697f0f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'd7697f0f113536d65a811e8def4a2a2c4eae827a':
  Import translations. DO NOT MERGE
 2014-09-15 23:54:48 +00:00
Wink Saville
ea569f4817 am 98365869: ksd to lmp-sprout-dev 
* commit '983658696be22aa55dc5b37c666cedb8826ded83':
  ksd to lmp-sprout-dev
 2014-09-15 23:54:47 +00:00
PauloftheWest
8ad6c3fe55 Alignment updates for Wi-Fi Settings dialog. 
Bug: 17489021
Change-Id: Id394dbe67625cd33745ccbe0f58921fcc38115ec
 2014-09-15 16:49:31 -07:00
Edward Jee
a539716a94 Do not show phonebook access permission dialog if pairing dialog has already been shown. 
Bug: 16964116, 13886947, 16345619

Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
 2014-09-15 14:33:13 -07:00
PauloftheWest
0ca0c8ad20 Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 2014-09-15 21:25:13 +00:00
Dianne Hackborn
94aae9afd1 Little more on issue #17495264: tweak when we ignore initial times. 
Change-Id: I7053eb64d7d2281984baef9606334c2df4783cc5
 2014-09-15 14:00:37 -07:00
Dianne Hackborn
ecffbc91b1 Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 2014-09-15 20:51:46 +00:00
PauloftheWest
f1fc721929 am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit '2423366021337a4fff71defdd1c6484df10c0e3b':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-15 19:31:20 +00:00
PauloftheWest
2423366021 am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit '13fbd848d4d39e81bb79231f1d6f63722a7b36f6':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-15 19:05:48 +00:00
Maurice Lam
795511ec9c [WifiSetup] Disable app starting window 
Disable the app starting window when start WifiSetupActivity so that
there will not be a blank black screen the first time this activity
is started.

Bug: 17457465
Change-Id: I4fa019a603a088d458fa9bcf126364fbb49b1b1f
 2014-09-15 11:40:34 -07:00
Sander Alewijnse
e625a57a28 Update targetSdkVersion check. 
Bug:16509819
Change-Id: Ibc0afd234eaa13c1862c8e8dd60d68940aa559f5
 2014-09-15 18:55:56 +01:00
PauloftheWest
f4b548c0f5 Removed all references to "Google Wi-Fi Assistant" from Settings. 
+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card.  Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.

Bug: 17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
 2014-09-15 09:31:56 -07:00
PauloftheWest
13fbd848d4 Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 2014-09-15 14:35:46 +00:00
Baligh Uddin
9ad0d03486 Import translations. DO NOT MERGE 
Change-Id: I8afcd11572e8785a6ded163f1fb9d267730fa9a1
Auto-generated-cl: translation import
 2014-09-14 23:05:45 -07:00
Dianne Hackborn
2b54a9fa57 Fix issue #17495264: Battery history graph is bad 
Deal better with wall clock time changes in the battery history.

Change-Id: I9d63edafc37bbf663e328a08ba09300be2142594
 2014-09-14 19:17:17 -07:00
Prem Kumar
ea7b2a8d88 am 1097e836: am 2ce54402: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit '1097e836e4c1e9a32f1349abce0f9afffecde5cd':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:30:27 +00:00
Prem Kumar
1097e836e4 am 2ce54402: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit '2ce5440203684e064102ba3e7ce9bccec4a76610':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:15:04 +00:00
Prem Kumar
2ce5440203 am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit 'c0deb7dac00b4fcbc64866042788e3247474538e':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:00:25 +00:00
Prem Kumar
c0deb7dac0 Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 2014-09-14 23:51:21 +00:00
John Spurlock
ca7f0b395c am 3ea47dd0: am 89147d72: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 
* commit '3ea47dd0631592aaa6c2a89e5e8abb10bd5175eb':
  Settings: Use new PowerManager call to set low power mode.
 2014-09-14 20:21:37 +00:00
John Spurlock
3ea47dd063 am 89147d72: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 
* commit '89147d726b0f3c4e69f3028c8043f71c14bc6f81':
  Settings: Use new PowerManager call to set low power mode.
 2014-09-14 20:09:40 +00:00
John Spurlock
89147d726b am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 
* commit '2e205e9b4b16133b29efba91e67bee8f20a51a88':
  Settings: Use new PowerManager call to set low power mode.
 2014-09-14 19:51:01 +00:00
John Spurlock
2e205e9b4b Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 2014-09-14 19:36:20 +00:00
John Spurlock
41e8351448 Settings: Use new PowerManager call to set low power mode. 
Bind the master switch to the power manager state instead
of directly to the single setting.

Depends on frameworks/base change:
  Ic030504c9cad9868a7137abbe837b170da37852b

Bug:17460535
Change-Id: I8c68735308f58fdc07d4f64e765e84286918be7a
 2014-09-14 11:23:01 -04:00
Tyler Gunn
c950b8f404 am 09504093: am d03caf70: am 3e71b197: Renaming Telecomm to Telecom. 
* commit '09504093500b6b931cdc87fd696574b64b8d852a':
  Renaming Telecomm to Telecom.
 2014-09-13 18:19:37 +00:00
Tyler Gunn
0950409350 am d03caf70: am 3e71b197: Renaming Telecomm to Telecom. 
* commit 'd03caf70865f50f74db2613f9d0c68ee50e22190':
  Renaming Telecomm to Telecom.
 2014-09-13 18:03:11 +00:00
Tyler Gunn
d03caf7086 am 3e71b197: Renaming Telecomm to Telecom. 
* commit '3e71b197f7f85c5045a083ecc532954958807be6':
  Renaming Telecomm to Telecom.
 2014-09-13 17:47:28 +00:00
Tyler Gunn
3e71b197f7 Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb
 2014-09-12 20:22:25 -07:00
Paul Lawrence
7dc56e1801 am fd2a3036: am dbb4a6b7: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 
* commit 'fd2a303616523ba3eae5105298bfd5addebb617f':
  Prevent PIN/Passwword disappearing during boot
 2014-09-13 02:27:46 +00:00
Kenny Guy
072f951cf6 am 31095ca6: am f57f94e9: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev 
* commit '31095ca6e573d5df86e153e6464faa28ae907a75':
  Fix crash when showing accounts.
 2014-09-13 02:22:20 +00:00
Paul Lawrence
fd2a303616 am dbb4a6b7: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 
* commit 'dbb4a6b704e8feaba5f31623c66ee30fef8af680':
  Prevent PIN/Passwword disappearing during boot
 2014-09-12 23:22:13 +00:00
Paul Lawrence
dbb4a6b704 am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 
* commit 'c64c9808b9ba74063f0a59e3b7b11e4c3d15680a':
  Prevent PIN/Passwword disappearing during boot
 2014-09-12 22:05:22 +00:00
Paul Lawrence
c64c9808b9 Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 2014-09-12 21:44:48 +00:00
Kenny Guy
31095ca6e5 am f57f94e9: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev 
* commit 'f57f94e973b9fba78d08301568b109d983d0b425':
  Fix crash when showing accounts.
 2014-09-12 20:02:39 +00:00
Kenny Guy
f57f94e973 am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev 
* commit 'db9e3f682fd251a9c996141af73b285974dd9d1c':
  Fix crash when showing accounts.
 2014-09-12 19:37:38 +00:00
Paul Lawrence
5ab67c5648 Prevent PIN/Passwword disappearing during boot 
During startup, when the telephony service starts, a configChange is sent
to the CryptKeeper activity, causing it to lose its data.

Ignore this change since it is immaterial to what we display.

Bug: 17421115

Change-Id: I83f867f3de5d90ff1050e3906da142d99fd6c276
 2014-09-12 12:35:18 -07:00
Alexandra Gherghina
b5c7c79a0a am 02d41b91: am 0bf3dc02: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev 
* commit '02d41b916c24eb458b7ce695d0663cbe6c49a4b8':
  Switch to using system-wide default user icons
 2014-09-12 19:29:07 +00:00
PauloftheWest
dbdbdda17e am 5bebfebe: am 7f7aa9dc: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev 
* commit '5bebfebee715ea60fc30f82f2be220ab13adb04e':
  Fixed multiple Bluetooth Settings crashes.
 2014-09-12 19:29:06 +00:00
Dianne Hackborn
a766826b9b am a1b53ad6: am 901df0c3: am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev 
* commit 'a1b53ad6c40039b9d313ae9127cbb35f1287ff34':
  Fix some things in settings: manage apps, battery, procstats
 2014-09-12 19:27:16 +00:00