106619 Commits

Author SHA1 Message Date
Wink Saville
df43ba82e6 am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit 'e3badc10112b76db583736767849b2f82ae737fd':
  When a SIM is changed check mobile provisioning.
2013-07-19 13:33:19 -07:00
Deepanshu Gupta
a2f41b23b6 am bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit 'bf8be2eefb1f5172582f688cbc090ec04d6908f1':
  Add orientation to configuration for layoutlib.
2013-07-19 13:33:17 -07:00
Roman Nurik
0f33e44fbc am 0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '0987ff8768512c3d519a5d5bbe5c4eb6b54548dc':
  Add Flo to device art generator.
2013-07-19 13:33:05 -07:00
Jeff Brown
2445880c5c am ba8a5413: Fix missing lock in power manager.
* commit 'ba8a54136d184d48fbed4f7b27734f645e4e8ad0':
  Fix missing lock in power manager.
2013-07-19 13:32:48 -07:00
Craig Mautner
a64325f6e7 am 7c6be10d: Remove iterators (DO NOT MERGE)
* commit '7c6be10d314413bb7afbed41017343320319915d':
  Remove iterators (DO NOT MERGE)
2013-07-19 13:32:40 -07:00
Joe Fernandez
ab00d352ff am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '658374d56577a4f8864ba3c7ed8f2e425d13d997':
  docs: Android SDK 22.0.4 Release Notes
2013-07-19 13:05:12 -07:00
Joe Fernandez
658374d565 am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '2685febd0d51bac4da755756b5348eb95c57ef73':
  docs: Android SDK 22.0.4 Release Notes
2013-07-19 13:02:24 -07:00
Joe Fernandez
2685febd0d am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '6f75a73c04ebd5f0ae10e6e89618f492d842ed96':
  docs: Android SDK 22.0.4 Release Notes
2013-07-19 12:59:11 -07:00
Joe Fernandez
6f75a73c04 Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 2013-07-19 19:55:48 +00:00
Joe Fernandez
5b7e6a335e docs: Android SDK 22.0.4 Release Notes
Change-Id: Ia140f81dce8352860149cf709e1ed0be46c052a0
2013-07-19 11:47:00 -07:00
Robert Greenwalt
8c87b29793 Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev 2013-07-19 17:10:38 +00:00
Scott Main
ca3b4e9b7e remove significant motion
Change-Id: I764d7253d9eb4aa9f7e94f5628a29f648fd9811b
2013-07-18 16:10:37 -07:00
Scott Main
1be763494e Merge "more details about account access in restricted profiles" into jb-mr2-dev 2013-07-18 22:46:12 +00:00
Scott Main
d3ed45f841 am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '991487c635ea0cd9ccfaae8e030325c2e8be7a3f':
  fix typo in code sample
2013-07-18 15:22:16 -07:00
Scott Main
991487c635 am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '9a1f106d9ef33a3ea22d7b34d736586d4fae0447':
  fix typo in code sample
2013-07-18 15:19:39 -07:00
Scott Main
9a1f106d9e am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '34a1fa43899dc2b0b2f249262b69c922949ab626':
  fix typo in code sample
2013-07-18 15:16:46 -07:00
Scott Main
34a1fa4389 Merge "fix typo in code sample" into jb-mr1.1-ub-dev 2013-07-18 22:13:56 +00:00
Scott Main
f128275bdc more details about account access in restricted profiles
Change-Id: I2710c3e8736748ca3080ee88f076255a6639b1e3
2013-07-18 15:09:03 -07:00
Robert Greenwalt
c13368bfd1 Make CS.isTetheringSupported dynamic
It used to be set at boot, but that was too quick to pick up carrier
specific resources.  With this change even if you switch sims subequent
checks get the new values.

bug:9865616
Change-Id: I8c270c6b02fc6bdd3c3d76ceea58172df25e058d
2013-07-18 14:24:42 -07:00
Robert Greenwalt
a34a64d2b1 Add gservices updater for carrier provisioning url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-18 11:24:56 -07:00
Jean-Michel Trivi
4fbe5af45e Cleaner Tejat notification in Audio Package 11
Add a reworked version of "Tejat", at 48kHz.
 The original asset is "/data/sounds//notifications/wav/Deneb.wav".
Use this new version in Audio Package 11 under its original name.

Bug 9900161

Change-Id: I4d7c73715db4e52f5c89aeca726f8b314e0895d5
2013-07-18 11:24:55 -07:00
Elliott Hughes
e964387466 am 0bad5370: Merge "Handle missing and invalid numeric values in XmlUtils."
* commit '0bad537093ed5b493e4c2af778cf802a2cf2c15f':
  Handle missing and invalid numeric values in XmlUtils.
2013-07-18 10:41:41 -07:00
Elliott Hughes
0bad537093 Merge "Handle missing and invalid numeric values in XmlUtils." 2013-07-18 17:38:57 +00:00
Scott Main
d25cc954ee fix typo in code sample
Change-Id: Ic2e36d321f8bc3c414f8cef82319ea376eaa296e
2013-07-18 10:18:57 -07:00
Elliott Hughes
03a152d7e7 am 15cb526e: Merge "Fix import after okhttp update."
* commit '15cb526ece1420b1ae2061e20fd0982d82b41aae':
  Fix import after okhttp update.
2013-07-18 09:36:48 -07:00
Elliott Hughes
15cb526ece Merge "Fix import after okhttp update." 2013-07-18 16:33:41 +00:00
Narayan Kamath
c0bb16673e Fix import after okhttp update.
OkResponseCache moved packages in change
62321.

Change-Id: I2c08c4586405e767d1931ebc5f185c7916850fa1
2013-07-18 13:42:50 +01:00
Dirk Dougherty
e0380d8fe6 resolved conflics for merge of 54201120 to jb-mr2-dev
Change-Id: If1675be05e403c33b320608333cb28ce2d9b68aa
2013-07-17 18:44:03 -07:00
Dirk Dougherty
5420112070 am 7eae1ef0: am c7e4be8a: Doc change: Add Colopl video to carousel and spotlight.
* commit '7eae1ef0d972911d8225de6aeebf33b806ec7037':
  Doc change: Add Colopl video to carousel and spotlight.
2013-07-17 18:19:38 -07:00
Dirk Dougherty
7eae1ef0d9 am c7e4be8a: Doc change: Add Colopl video to carousel and spotlight.
* commit 'c7e4be8abdc1ce11cb0197de0e393cf39fb38c9e':
  Doc change: Add Colopl video to carousel and spotlight.
2013-07-17 18:16:36 -07:00
Dirk Dougherty
c7e4be8abd Doc change: Add Colopl video to carousel and spotlight.
Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
2013-07-17 18:00:35 -07:00
Robert Greenwalt
e874bd351f Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev 2013-07-17 23:46:25 +00:00
Jean-Michel Trivi
bbc9a62a71 Cleaner Tejat notification in Audio Package 11
Add a reworked version of "Tejat", at 48kHz.
 The original asset is "/data/sounds//notifications/wav/Deneb.wav".
Use this new version in Audio Package 11 under its original name.

Bug 9900161

Change-Id: I4d7c73715db4e52f5c89aeca726f8b314e0895d5
2013-07-17 15:38:57 -07:00
Wink Saville
d8fe7fb881 When a SIM is changed check mobile provisioning.
A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.

Bug: 9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21
2013-07-17 14:59:20 -07:00
Jeff Brown
e6771c41e8 Fix missing lock in power manager.
The display wake lock and other internal state could become
out of sync if we happened to execute the power manager's update
function concurrently due to the missing lock.

This bug can be trigged due to display state changes or proximity
sensor updated.  Although it would be extremely rare, we have
some evidence of this happening on at least a few devices resulting
in rapid power drain with the screen off or a crash.

Bug: 9880044
Change-Id: I3c674ce429621a50cbb36c3a01883d5f388205b2
(cherry picked from commit d91e417b06388694db213257b4df6b4dd78e0d49)
2013-07-17 14:59:19 -07:00
Robert Greenwalt
e182bfe398 Add gservices updater for carrier provisioning url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-17 14:05:33 -07:00
Wink Saville
e3badc1011 Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev 2013-07-17 18:43:30 +00:00
Deepanshu Gupta
bf8be2eefb Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev 2013-07-17 18:38:42 +00:00
Roman Nurik
0987ff8768 Merge "Add Flo to device art generator." into jb-mr2-dev 2013-07-17 16:17:15 +00:00
Wink Saville
fde1ac9bec When a SIM is changed check mobile provisioning.
A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.

Bug: 9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21
2013-07-16 17:16:37 -07:00
Adam Powell
42658ed518 am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"
* commit '30ad720304790b07112b87f973a7e6ed5e1e6ee5':
  Consider mScrollX when drawing the checkMarkDrawable
2013-07-16 17:06:36 -07:00
Adam Powell
30ad720304 Merge "Consider mScrollX when drawing the checkMarkDrawable" 2013-07-17 00:04:28 +00:00
Jeff Brown
ba8a54136d Fix missing lock in power manager.
The display wake lock and other internal state could become
out of sync if we happened to execute the power manager's update
function concurrently due to the missing lock.

This bug can be trigged due to display state changes or proximity
sensor updated.  Although it would be extremely rare, we have
some evidence of this happening on at least a few devices resulting
in rapid power drain with the screen off or a crash.

Bug: 9880044
Change-Id: I3c674ce429621a50cbb36c3a01883d5f388205b2
(cherry picked from commit d91e417b06388694db213257b4df6b4dd78e0d49)
2013-07-16 22:29:57 +00:00
Craig Mautner
5892fc5d8a Remove iterators (DO NOT MERGE)
Remove DisplayContentsIterator and AllWindowsIterator. These were cute
but they take up valuable resources. Iterate over ArrayList members
in their place.

Change-Id: Ie0c537608532cfb36f34d976cc6eacd21bad98cd
2013-07-16 15:26:07 -07:00
Roman Nurik
5c38799b54 Add Flo to device art generator.
Change-Id: I69e5d3ff3685c250d3c44bc616aec515ebc4835e
2013-07-16 14:32:12 -07:00
Craig Mautner
7c6be10d31 Remove iterators (DO NOT MERGE)
Remove DisplayContentsIterator and AllWindowsIterator. These were cute
but they take up valuable resources. Iterate over ArrayList members
in their place.

Change-Id: Ie0c537608532cfb36f34d976cc6eacd21bad98cd
2013-07-16 13:07:48 -07:00
The Android Open Source Project
59734490f6 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
2013-07-15 09:32:49 -07:00
The Android Automerger
d67c55b8d0 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:19:11 -07:00
Cyril Mottier
5f5882ffa8 Remove useless/repetitive code
fixScale(float) method has been extracted from the code but the original
code has been kept in place. Because of this, the animation scale is 
"fixed" twice which is not necessary. This patch, simply call 
fixScale(float) once and stores the result of it in the scale variable.

Change-Id: I50aeacbc2c13ebbf447506ae4309d50c0e313837
2013-07-15 15:38:10 +02:00
Deepanshu Gupta
d97d60c0fa Add orientation to configuration for layoutlib.
Update the configuration with the device orientation before rendering.

Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
2013-07-12 15:54:08 -07:00